[Commits] r23350 - in /fsf/trunk/libc: ./ nptl/ soft-fp/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Jun 23 00:01:57 2013
New Revision: 23350

Log:
Import glibc-mainline for 2013-06-23

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/pthread_setattr_default_np.c
    fsf/trunk/libc/soft-fp/op-4.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/libc_fatal.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Jun 23 00:01:57 2013
@@ -1,3 +1,11 @@
+2013-06-22  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/libc_fatal.c: Include <string.h>.
+
+	[BZ #15667]
+	* soft-fp/op-4.h (__FP_FRAC_ADD_3): Rename variables _c1 and _c2
+	to __FP_FRAC_ADD_3_c1 and __FP_FRAC_ADD_3_c2.
+
 2013-06-21  Maciej W. Rozycki  <macro@xxxxxxxxxxxxxxxx>
 
 	* elf/dl-dst.h (DL_DST_REQUIRED): Remove call to

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sun Jun 23 00:01:57 2013
@@ -21,7 +21,7 @@
   15416, 15418, 15419, 15423, 15424, 15426, 15429, 15431, 15432, 15441,
   15442, 15448, 15465, 15480, 15485, 15488, 15490, 15492, 15493, 15497,
   15506, 15529, 15536, 15553, 15577, 15583, 15618, 15627, 15631, 15654,
-  15655.
+  15655, 15667.
 
 * 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 Sun Jun 23 00:01:57 2013
@@ -1,3 +1,7 @@
+2013-06-22  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* pthread_getattr_default_np.c: Include <string.h>.
+
 2013-06-15  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
 
 	* Versions (libpthread): Add GLIBC_2.18.

Modified: fsf/trunk/libc/nptl/pthread_setattr_default_np.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_setattr_default_np.c (original)
+++ fsf/trunk/libc/nptl/pthread_setattr_default_np.c Sun Jun 23 00:01:57 2013
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <pthreadP.h>
 #include <assert.h>
+#include <string.h>
 
 int
 pthread_setattr_default_np (const pthread_attr_t *in)

Modified: fsf/trunk/libc/soft-fp/op-4.h
==============================================================================
--- fsf/trunk/libc/soft-fp/op-4.h (original)
+++ fsf/trunk/libc/soft-fp/op-4.h Sun Jun 23 00:01:57 2013
@@ -525,14 +525,14 @@
 #ifndef __FP_FRAC_ADD_3
 #define __FP_FRAC_ADD_3(r2,r1,r0,x2,x1,x0,y2,y1,y0)		\
   do {								\
-    _FP_W_TYPE _c1, _c2;					\
+    _FP_W_TYPE __FP_FRAC_ADD_3_c1, __FP_FRAC_ADD_3_c2;		\
     r0 = x0 + y0;						\
-    _c1 = r0 < x0;						\
+    __FP_FRAC_ADD_3_c1 = r0 < x0;				\
     r1 = x1 + y1;						\
-    _c2 = r1 < x1;						\
-    r1 += _c1;							\
-    _c2 |= r1 < _c1;						\
-    r2 = x2 + y2 + _c2;						\
+    __FP_FRAC_ADD_3_c2 = r1 < x1;				\
+    r1 += __FP_FRAC_ADD_3_c1;					\
+    __FP_FRAC_ADD_3_c2 |= r1 < __FP_FRAC_ADD_3_c1;		\
+    r2 = x2 + y2 + __FP_FRAC_ADD_3_c2;				\
   } while (0)
 #endif
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/libc_fatal.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/libc_fatal.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/libc_fatal.c Sun Jun 23 00:01:57 2013
@@ -20,6 +20,7 @@
 #include <execinfo.h>
 #include <fcntl.h>
 #include <not-cancel.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <sys/uio.h>
 

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