[Commits] r24117 - in /fsf/trunk/libc: ./ manual/ nptl/ nptl/sysdeps/pthread/bits/ sysdeps/sh/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Sep 28 00:02:06 2013
New Revision: 24117

Log:
Import glibc-mainline for 2013-09-28

Added:
    fsf/trunk/libc/sysdeps/sh/stackguard-macros.h
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/manual/install.texi
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/pthread/bits/libc-lock.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Sep 28 00:02:06 2013
@@ -1,3 +1,12 @@
+2013-09-27  Allan McRae  <allan@xxxxxxxxxxxxx>
+
+	[BZ #15941]
+	* manual/install.texi (Installation) Fix node cross references.
+
+2013-09-27  Kaz Kojima  <kkojima@xxxxxxxxxxxxxx>
+
+	* sysdeps/sh/stackguard-macros.h: New file.
+
 2013-09-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
 
 	* sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Update.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Sep 28 00:02:06 2013
@@ -12,8 +12,8 @@
   13985, 14155, 14547, 14699, 15400, 15427, 15522, 15531, 15532, 15608,
   15609, 15610, 15640, 15681, 15736, 15748, 15749, 15754, 15797, 15844,
   15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890, 15892,
-  15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, 15939, 15963,
-  15966.
+  15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, 15939, 15941,
+  15963, 15966.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

Modified: fsf/trunk/libc/manual/install.texi
==============================================================================
--- fsf/trunk/libc/manual/install.texi (original)
+++ fsf/trunk/libc/manual/install.texi Sat Sep 28 00:02:06 2013
@@ -4,7 +4,7 @@
 @include macros.texi
 @include pkgvers.texi
 
-@node Installation, Maintenance, Library Summary, Top
+@node Installation
 @c %MENU% How to install the GNU C Library
 @appendix Installing @theglibc{}
 

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Sat Sep 28 00:02:06 2013
@@ -1,3 +1,11 @@
+2013-09-27  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* sysdeps/pthread/bits/libc-lock.h [_LIBC && (!NOT_IN_libc ||
+	IS_IN_libpthread)] (__libc_lock_fini_recursive): Use the mutex
+	member of the argument.
+	(__libc_lock_trylock_recursive): Likewise.
+	(__libc_lock_unlock_recursive): Likewise.
+
 2013-09-04  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/x86_64/cancellation.S

Modified: fsf/trunk/libc/nptl/sysdeps/pthread/bits/libc-lock.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/pthread/bits/libc-lock.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/pthread/bits/libc-lock.h Sat Sep 28 00:02:06 2013
@@ -87,7 +87,7 @@
 # define __libc_lock_fini_recursive(NAME) ((void) 0)
 #else
 # define __libc_lock_fini_recursive(NAME) \
-  __libc_maybe_call (__pthread_mutex_destroy, (&(NAME)), 0)
+  __libc_maybe_call (__pthread_mutex_destroy, (&(NAME).mutex), 0)
 #endif
 
 /* Lock the recursive named lock variable.  */
@@ -129,7 +129,7 @@
   })
 #else
 # define __libc_lock_trylock_recursive(NAME) \
-  __libc_maybe_call (__pthread_mutex_trylock, (&(NAME)), 0)
+  __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
 #endif
 
 /* Unlock the recursive named lock variable.  */
@@ -145,7 +145,7 @@
   } while (0)
 #else
 # define __libc_lock_unlock_recursive(NAME) \
-  __libc_maybe_call (__pthread_mutex_unlock, (&(NAME)), 0)
+  __libc_maybe_call (__pthread_mutex_unlock, (&(NAME).mutex), 0)
 #endif
 
 /* Note that for I/O cleanup handling we are using the old-style

Added: fsf/trunk/libc/sysdeps/sh/stackguard-macros.h
==============================================================================
--- fsf/trunk/libc/sysdeps/sh/stackguard-macros.h (added)
+++ fsf/trunk/libc/sysdeps/sh/stackguard-macros.h Sat Sep 28 00:02:06 2013
@@ -1,0 +1,6 @@
+#include <stdint.h>
+
+extern uintptr_t __stack_chk_guard;
+#define STACK_CHK_GUARD __stack_chk_guard
+
+#define POINTER_CHK_GUARD THREAD_GET_POINTER_GUARD()

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