diff options
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S | 2 |
2 files changed, 9 insertions, 1 deletions
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 |