[Commits] r20232 - in /fsf/trunk/libc: ./ include/ include/sys/ socket/ stdio-common/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Aug 19 00:01:43 2012
New Revision: 20232

Log:
Import glibc-mainline for 2012-08-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/include/sys/socket.h
    fsf/trunk/libc/include/unistd.h
    fsf/trunk/libc/socket/have_sock_cloexec.c
    fsf/trunk/libc/stdio-common/_itoa.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/nice.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Aug 19 00:01:43 2012
@@ -1,3 +1,27 @@
+2012-08-18  Andreas Jaeger  <aj@xxxxxxx>
+
+	* stdio-common/_itoa.c (_itoa): Add missing DUMMY variable.
+
+2012-08-18  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* include/sys/socket.h (__have_sock_cloexec): Add attribute_hidden.
+	* include/unistd.h (__have_sock_cloexec): Likewise.
+	(__have_pipe2): Likewise.
+	(__have_dup3): Likewise.
+
+2012-08-18  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	[BZ #9685]
+	* include/unistd.h (__have_pipe2): Change define into an extern int.
+	(__have_dup3): Likewise.
+	* socket/have_sock_cloexec.c: Include fcntl.h.
+	(__have_pipe2): New variable.
+	(__have_dup3): Likewise.
+
+2012-08-17  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/nice.c: Adjust #include.
+
 2012-08-17  Marek Polacek  <polacek@xxxxxxxxxx>
 
 	* sysdeps/ieee754/ldbl-96/s_sincosl.c (__sincosl): Use __attribute__

Modified: fsf/trunk/libc/include/sys/socket.h
==============================================================================
--- fsf/trunk/libc/include/sys/socket.h (original)
+++ fsf/trunk/libc/include/sys/socket.h Sun Aug 19 00:01:43 2012
@@ -148,7 +148,7 @@
 #endif
 
 #ifdef SOCK_CLOEXEC
-extern int __have_sock_cloexec;
+extern int __have_sock_cloexec attribute_hidden;
 /* At lot of other functionality became available at the same time as
    SOCK_CLOEXEC.  Avoid defining separate variables for all of them
    unless it is really necessary.  */

Modified: fsf/trunk/libc/include/unistd.h
==============================================================================
--- fsf/trunk/libc/include/unistd.h (original)
+++ fsf/trunk/libc/include/unistd.h Sun Aug 19 00:01:43 2012
@@ -173,12 +173,9 @@
 /* Not cancelable variant.  */
 extern int __pause_nocancel (void) attribute_hidden;
 
-extern int __have_sock_cloexec;
-/* At lot of other functionality became available at the same time as
-   SOCK_CLOEXEC.  Avoid defining separate variables for all of them
-   unless it is really necessary.  */
-#define __have_pipe2 __have_sock_cloexec
-#define __have_dup3 __have_sock_cloexec
+extern int __have_sock_cloexec attribute_hidden;
+extern int __have_pipe2 attribute_hidden;
+extern int __have_dup3 attribute_hidden;
 
 extern int __getlogin_r_loginuid (char *name, size_t namesize)
      attribute_hidden;

Modified: fsf/trunk/libc/socket/have_sock_cloexec.c
==============================================================================
--- fsf/trunk/libc/socket/have_sock_cloexec.c (original)
+++ fsf/trunk/libc/socket/have_sock_cloexec.c Sun Aug 19 00:01:43 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -15,9 +15,18 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <fcntl.h>
 #include <sys/socket.h>
 #include <kernel-features.h>
 
 #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
 int __have_sock_cloexec;
 #endif
+
+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
+int __have_pipe2;
+#endif
+
+#if defined O_CLOEXEC && !defined __ASSUME_DUP3
+int __have_dup3;
+#endif

Modified: fsf/trunk/libc/stdio-common/_itoa.c
==============================================================================
--- fsf/trunk/libc/stdio-common/_itoa.c (original)
+++ fsf/trunk/libc/stdio-common/_itoa.c Sun Aug 19 00:01:43 2012
@@ -265,7 +265,7 @@
 	  while (value != 0)
 	    {
 	      mp_limb_t quo, rem, x;
-	      mp_limb_t __attribute__ ((unused));
+	      mp_limb_t dummy __attribute__ ((unused));
 
 	      umul_ppmm (x, dummy, value, base_multiplier);
 	      quo = (x + ((value - x) >> 1)) >> (brec->post_shift - 1);
@@ -277,7 +277,7 @@
 	  while (value != 0)
 	    {
 	      mp_limb_t quo, rem, x;
-	      mp_limb_t __attribute__ ((unused));
+	      mp_limb_t dummy __attribute__ ((unused));
 
 	      umul_ppmm (x, dummy, value, base_multiplier);
 	      quo = x >> brec->post_shift;

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/nice.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/nice.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/nice.c Sun Aug 19 00:01:43 2012
@@ -1,1 +1,1 @@
-#include <sysdeps/unix/nice.c>
+#include <sysdeps/posix/nice.c>

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