GNU C Library master sources branch, master, updated. glibc-2.14-297-g52d4fef

[schwab at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6 (commit)
       via  995a80dfbcb443ead5aa22682c884ec5c827a2ea (commit)
      from  8682f8b0e4bd3531e82d65332838421e76682956 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6

commit 52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6
Author: Andreas Schwab <schwab@redhat.com>
Date:   Tue Sep 13 10:29:43 2011 +0200

    Fix pattern on $(ldd-rewrite-script) substitution

diff --git a/ChangeLog b/ChangeLog
index 6fd8c36..95b1fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-09-13  Andreas Schwab  <schwab@redhat.com>
 
+	* elf/Makefile (gen-ldd): Fix pattern.
+
 	* elf/rtld.c (dl_main): Only use USE___THREAD when defined.
 	(init_tls): Likewise.
 
diff --git a/elf/Makefile b/elf/Makefile
index a2d976e..f20f52d 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -483,7 +483,7 @@ endef
 else
 define gen-ldd
 LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< \
-| LC_ALL=C sed -f $(patsubst $(..)/,/,$(..)$(ldd-rewrite-script)) > $@.new
+| LC_ALL=C sed -f $(patsubst $(..)/%,/%,$(..)$(ldd-rewrite-script)) > $@.new
 endef
 endif
 

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=995a80dfbcb443ead5aa22682c884ec5c827a2ea

commit 995a80dfbcb443ead5aa22682c884ec5c827a2ea
Author: Andreas Schwab <schwab@redhat.com>
Date:   Tue Sep 13 10:20:44 2011 +0200

    Only use USE___THREAD when defined

diff --git a/ChangeLog b/ChangeLog
index da35ca4..6fd8c36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-13  Andreas Schwab  <schwab@redhat.com>
+
+	* elf/rtld.c (dl_main): Only use USE___THREAD when defined.
+	(init_tls): Likewise.
+
 2011-09-12  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c: New file.
diff --git a/elf/rtld.c b/elf/rtld.c
index b3959a3..764140d 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -779,7 +779,12 @@ cannot allocate TLS data structures for initial thread");
 
   /* And finally install it for the main thread.  If ld.so itself uses
      TLS we know the thread pointer was initialized earlier.  */
-  const char *lossage = TLS_INIT_TP (tcbp, USE___THREAD);
+  const char *lossage
+#ifdef USE___THREAD
+    = TLS_INIT_TP (tcbp, USE___THREAD);
+#else
+    = TLS_INIT_TP (tcbp, 0);
+#endif
   if (__builtin_expect (lossage != NULL, 0))
     _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage);
   tls_init_tp_called = true;
@@ -2310,7 +2315,12 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
      TLS we know the thread pointer was initialized earlier.  */
   if (! tls_init_tp_called)
     {
-      const char *lossage = TLS_INIT_TP (tcbp, USE___THREAD);
+      const char *lossage
+#ifdef USE___THREAD
+	= TLS_INIT_TP (tcbp, USE___THREAD);
+#else
+	= TLS_INIT_TP (tcbp, 0);
+#endif
       if (__builtin_expect (lossage != NULL, 0))
 	_dl_fatal_printf ("cannot set up thread-local storage: %s\n",
 			  lossage);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    7 +++++++
 elf/Makefile |    2 +-
 elf/rtld.c   |   14 ++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources