diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 7511f701ec..90824aec95 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2013-09-04 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/x86_64/cancellation.S + [SHARED && DO_VERSIONING && !NO_HIDDEN]: Change conditional to + [SHARED && !NO_HIDDEN]. + 2013-09-03 Siddhesh Poyarekar <siddhesh@redhat.com> [BZ #15921] diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S index 2cc84c189b..b4e4dcf90c 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 -# if defined SHARED && defined DO_VERSIONING && !defined NO_HIDDEN +# if defined SHARED && !defined NO_HIDDEN # define __pthread_unwind __GI___pthread_unwind # endif #else |