GNU C Library master sources branch master updated. glibc-2.17-502-g9ac3b50

[siddhesh 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  9ac3b5047e6bbea03437d020fab9a728e123445b (commit)
      from  05e166c887612250d461b5fe7c0f0064cd1a0c41 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9ac3b5047e6bbea03437d020fab9a728e123445b

commit 9ac3b5047e6bbea03437d020fab9a728e123445b
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Thu Apr 4 19:43:56 2013 +0530

    Fix static build when configured with --disable-hidden-plt
    
    Fixes BZ #15337.
    
    Static builds fail with the following warning:
    
    /home/tools/glibc/glibc/nptl/../nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S:80:
    undefined reference to `__GI___pthread_unwind'
    
    When the source is configured with --disable-hidden-plt.  This is
    because the preprocessor conditional in cancellation.S only checks if
    the build is for SHARED, whereas hidden_def is defined appropriately
    only for a SHARED build that will have symbol versioning *and* hidden
    defs are enabled.  The last case is false here.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 3a1dde6..505f9af 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-04  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	[BZ #15337]
+	* sysdeps/unix/sysv/linux/x86_64/cancellation.S
+	[IS_IN_libpthread]
+	[SHARED && defined DO_VERSIONING && !defined NO_HIDDEN]: Mark
+	__pthread_unwind hidden.
+
 2013-03-28  Roland McGrath  <roland@hack.frob.com>
 
 	* pthread_create.c (start_thread) [!SHARED]:
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index b284572..2cc84c1 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
@@ -22,7 +22,7 @@
 #include "lowlevellock.h"
 
 #ifdef IS_IN_libpthread
-# ifdef SHARED
+# if defined SHARED && defined DO_VERSIONING && !defined NO_HIDDEN
 #  define __pthread_unwind __GI___pthread_unwind
 # endif
 #else

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

Summary of changes:
 nptl/ChangeLog                                     |    8 ++++++++
 nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)


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