diff options
| author | Roland McGrath <mcgrathr@chromium.org> | 2011-09-19 12:48:15 -0700 |
|---|---|---|
| committer | Roland McGrath <mcgrathr@chromium.org> | 2011-09-19 12:48:15 -0700 |
| commit | bc7e1c3667b577ad418f7520df2a7dbccea04ee9 (patch) | |
| tree | e2004b2e54189c02ab324fb97976e9b4910e0dcf | |
| parent | 1c3b002bbb2935a526ef38b32d0c7375b7ee3b54 (diff) | |
| download | glibc-bc7e1c3667b577ad418f7520df2a7dbccea04ee9.tar.gz glibc-bc7e1c3667b577ad418f7520df2a7dbccea04ee9.tar.xz glibc-bc7e1c3667b577ad418f7520df2a7dbccea04ee9.zip | |
Get rid of tls.make include file.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makerules | 4 | ||||
| -rw-r--r-- | tls.make.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 0b723f4a5e..30d18226ee 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 c75927b669..cf5fb388de 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 4627aa37e0..0000000000 --- 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 @@@ |