From 9ac3b5047e6bbea03437d020fab9a728e123445b Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 4 Apr 2013 19:43:56 +0530 Subject: 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. --- nptl/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'nptl/ChangeLog') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 3a1dde6f43..505f9af38c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +2013-04-04 Siddhesh Poyarekar + + [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 * pthread_create.c (start_thread) [!SHARED]: -- cgit 1.4.1