aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-09-04 15:25:42 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-09-04 15:25:42 +0000
commit3f2e46a4948c846023275eb7a8c86ede0313cd2f (patch)
tree963a5dfe20f51d8cb5b8e2a6435c8fee9bb878f0 /nptl
parent44558701ff93118de40d5d5484e210149570f951 (diff)
downloadglibc-3f2e46a4948c846023275eb7a8c86ede0313cd2f.zip
glibc-3f2e46a4948c846023275eb7a8c86ede0313cd2f.tar.gz
glibc-3f2e46a4948c846023275eb7a8c86ede0313cd2f.tar.bz2
Remove --disable-versioning.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S2
2 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7511f70..90824ae 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 2cc84c1..b4e4dcf 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