From bc7e1c3667b577ad418f7520df2a7dbccea04ee9 Mon Sep 17 00:00:00 2001
From: Roland McGrath <mcgrathr@chromium.org>
Date: Mon, 19 Sep 2011 12:48:15 -0700
Subject: [PATCH] Get rid of tls.make include file.

---
 ChangeLog  | 6 ++++++
 Makerules  | 4 ----
 tls.make.c | 5 -----
 3 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 tls.make.c

diff --git a/ChangeLog b/ChangeLog
index 0b723f4..30d1822 100644
--- 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
index c75927b..cf5fb38 100644
--- 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
deleted file mode 100644
index 4627aa3..0000000
--- a/tls.make.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This produces a makefile fragment saying `use-thread = yes' or no.  */
-
-#include <tls.h>
-
-@@@ use-thread = yes @@@
-- 
2.7.4