[Commits] r22787 - in /fsf/trunk/libc: NEWS nptl/ChangeLog nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Apr  5 00:02:04 2013
New Revision: 22787

Log:
Import glibc-mainline for 2013-04-05

Modified:
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Fri Apr  5 00:02:04 2013
@@ -13,7 +13,7 @@
   14317, 14327, 14478, 14496, 14812, 14920, 14964, 14981, 14982, 14985,
   14994, 14996, 15003, 15006, 15020, 15023, 15036, 15054, 15055, 15062,
   15078, 15160, 15214, 15232, 15234, 15283, 15285, 15287, 15304, 15305,
-  15307, 15327, 15330.
+  15307, 15327, 15330, 15337.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri Apr  5 00:02:04 2013
@@ -1,3 +1,11 @@
+2013-04-04  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	[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@xxxxxxxxxxxxx>
 
 	* pthread_create.c (start_thread) [!SHARED]:

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S Fri Apr  5 00:02:04 2013
@@ -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

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits