Get rid of tls.make include file.

git-mirror · Sep 19, 2011 · bc7e1c3 · bc7e1c3
1 parent 1c3b002
commit bc7e1c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-19  Roland McGrath  <roland@hack.frob.com>
+
+	* Makerules: Don't include tls.make.
+	(config-tls): Always set to thread.
+	* tls.make.c: File removed.
+
 2011-09-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makeconfig (CPPFLAGS): Prepend $(CPPFLAGS-config).

diff --git a/Makerules b/Makerules
@@ -1260,11 +1260,7 @@ check-abi-warn = || echo '*** WARNING: $*.so failed ABI check'
 endif
 
 ifeq ($(firstword $(sysd-sorted-done) f)$(firstword $(generating) f),tf)
--include $(common-objpfx)tls.make
-config-tls := tls
-ifeq ($(use-thread),yes)
 config-tls := thread
-endif
 check-abi-config := \
   $(config-machine)-$(config-vendor)-$(config-os)/$(config-tls)
 endif

diff --git a/tls.make.c b/tls.make.c