[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r20784 - in /fsf/trunk/libc: ./ libio/ ports/ ports/sysdeps/arm/bits/ sysdeps/generic/ sysdeps/gnu/ sysdeps/mach/hurd/

To: commits@xxxxxxxxxx
Subject: [Commits] r20784 - in /fsf/trunk/libc: ./ libio/ ports/ ports/sysdeps/arm/bits/ sysdeps/generic/ sysdeps/gnu/ sysdeps/mach/hurd/
From: eglibc@xxxxxxxxxx
Date: Sat, 22 Sep 2012 00:01:46 -0000

Author: eglibc
Date: Sat Sep 22 00:01:45 2012
New Revision: 20784

Log:
Import glibc-mainline for 2012-09-22

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/libio/iopopen.c
    fsf/trunk/libc/libio/libio.h
    fsf/trunk/libc/libio/oldiopopen.c
    fsf/trunk/libc/ports/ChangeLog.arm
    fsf/trunk/libc/ports/sysdeps/arm/bits/atomic.h
    fsf/trunk/libc/sysdeps/generic/_G_config.h
    fsf/trunk/libc/sysdeps/gnu/_G_config.h
    fsf/trunk/libc/sysdeps/mach/hurd/_G_config.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Sep 22 00:01:45 2012
@@ -1,3 +1,14 @@
+2012-09-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libio/iopopen.c [_IO_HAVE_SYS_WAIT]: Make code unconditional.
+	[!_IO_HAVE_SYS_WAIT]: Remove conditional code.
+	* libio/libio.h (_IO_HAVE_SYS_WAIT): Remove.
+	* libio/oldiopopen.c [_IO_HAVE_SYS_WAIT]: Make code unconditional.
+	[!_IO_HAVE_SYS_WAIT]: Remove conditional code.
+	* sysdeps/generic/_G_config.h (_G_HAVE_SYS_WAIT): Remove.
+	* sysdeps/gnu/_G_config.h (_G_HAVE_SYS_WAIT): Likewise.
+	* sysdeps/mach/hurd/_G_config.h (_G_HAVE_SYS_WAIT): Likewise.
+
 2012-09-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* libio/libio.h [_G_NEED_STDARG_H]: Make code unconditional.

Modified: fsf/trunk/libc/libio/iopopen.c
==============================================================================
--- fsf/trunk/libc/libio/iopopen.c (original)
+++ fsf/trunk/libc/libio/iopopen.c Sat Sep 22 00:01:45 2012
@@ -29,7 +29,6 @@
 # define _POSIX_SOURCE
 #endif
 #include "libioP.h"
-#if _IO_HAVE_SYS_WAIT
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -50,8 +49,6 @@
 #endif
 extern _IO_pid_t _IO_fork (void) __THROW;
 #endif
-
-#endif /* _IO_HAVE_SYS_WAIT */
 
 #ifndef _IO_dup2
 #ifdef _LIBC
@@ -114,7 +111,6 @@
      const char *command;
      const char *mode;
 {
-#if _IO_HAVE_SYS_WAIT
   int read_or_write;
   int parent_end, child_end;
   int pipe_fds[2];
@@ -273,9 +269,6 @@
 
   _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
   return fp;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return NULL;
-#endif
 }
 
 _IO_FILE *
@@ -317,7 +310,6 @@
      _IO_FILE *fp;
 {
   /* This is not name-space clean. FIXME! */
-#if _IO_HAVE_SYS_WAIT
   int wstatus;
   _IO_proc_file **ptr = &proc_file_chain;
   _IO_pid_t wait_pid;
@@ -356,9 +348,6 @@
   if (wait_pid == -1)
     return -1;
   return wstatus;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return -1;
-#endif
 }
 
 static const struct _IO_jump_t _IO_proc_jumps = {

Modified: fsf/trunk/libc/libio/libio.h
==============================================================================
--- fsf/trunk/libc/libio/libio.h (original)
+++ fsf/trunk/libc/libio/libio.h Sat Sep 22 00:01:45 2012
@@ -41,7 +41,6 @@
 #define _IO_pid_t _G_pid_t
 #define _IO_uid_t _G_uid_t
 #define _IO_iconv_t _G_iconv_t
-#define _IO_HAVE_SYS_WAIT _G_HAVE_SYS_WAIT
 #define _IO_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE
 #define _IO_BUFSIZ _G_BUFSIZ
 #define _IO_va_list _G_va_list

Modified: fsf/trunk/libc/libio/oldiopopen.c
==============================================================================
--- fsf/trunk/libc/libio/oldiopopen.c (original)
+++ fsf/trunk/libc/libio/oldiopopen.c Sat Sep 22 00:01:45 2012
@@ -30,7 +30,6 @@
 # define _POSIX_SOURCE
 #endif
 #include "libioP.h"
-#if _IO_HAVE_SYS_WAIT
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -48,8 +47,6 @@
 #endif
 extern _IO_pid_t _IO_fork (void) __THROW;
 #endif
-
-#endif /* _IO_HAVE_SYS_WAIT */
 
 #include <shlib-compat.h>
 #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
@@ -123,7 +120,6 @@
      const char *command;
      const char *mode;
 {
-#if _IO_HAVE_SYS_WAIT
   volatile int read_or_write;
   volatile int parent_end, child_end;
   int pipe_fds[2];
@@ -194,9 +190,6 @@
 
   _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
   return fp;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return NULL;
-#endif
 }
 
 _IO_FILE *
@@ -240,7 +233,6 @@
      _IO_FILE *fp;
 {
   /* This is not name-space clean. FIXME! */
-#if _IO_HAVE_SYS_WAIT
   int wstatus;
   _IO_proc_file **ptr = &old_proc_file_chain;
   _IO_pid_t wait_pid;
@@ -279,9 +271,6 @@
   if (wait_pid == -1)
     return -1;
   return wstatus;
-#else /* !_IO_HAVE_SYS_WAIT */
-  return -1;
-#endif
 }
 
 const struct _IO_jump_t _IO_old_proc_jumps = {

Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Sat Sep 22 00:01:45 2012
@@ -1,3 +1,9 @@
+2012-09-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/bits/atomic.h [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]
+	(__arch_compare_and_exchange_val_32_acq): Correct order of
+	arguments of __arm_assisted_compare_and_exchange_val_32_acq.
+
 2012-09-12  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/arm/get-rounding-mode.h: New file.

Modified: fsf/trunk/libc/ports/sysdeps/arm/bits/atomic.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/bits/atomic.h (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/bits/atomic.h Sat Sep 22 00:01:45 2012
@@ -58,7 +58,7 @@
   __sync_val_compare_and_swap ((mem), (oldval), (newval))
 #else
 # define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
-  __arm_assisted_compare_and_exchange_val_32_acq ((mem), (oldval), (newval))
+  __arm_assisted_compare_and_exchange_val_32_acq ((mem), (newval), (oldval))
 #endif
 
 /* We don't support atomic operations on any non-word types.

Modified: fsf/trunk/libc/sysdeps/generic/_G_config.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/_G_config.h (original)
+++ fsf/trunk/libc/sysdeps/generic/_G_config.h Sat Sep 22 00:01:45 2012
@@ -52,7 +52,6 @@
 
 
 /* These library features are always available in the GNU C library.  */
-#define _G_HAVE_SYS_WAIT 1
 #define _G_va_list __gnuc_va_list
 
 #define _G_HAVE_MMAP 1

Modified: fsf/trunk/libc/sysdeps/gnu/_G_config.h
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/_G_config.h (original)
+++ fsf/trunk/libc/sysdeps/gnu/_G_config.h Sat Sep 22 00:01:45 2012
@@ -52,7 +52,6 @@
 
 
 /* These library features are always available in the GNU C library.  */
-#define _G_HAVE_SYS_WAIT 1
 #define _G_va_list __gnuc_va_list
 
 #define _G_HAVE_MMAP 1

Modified: fsf/trunk/libc/sysdeps/mach/hurd/_G_config.h
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/_G_config.h (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/_G_config.h Sat Sep 22 00:01:45 2012
@@ -52,7 +52,6 @@
 
 
 /* These library features are always available in the GNU C library.  */
-#define _G_HAVE_SYS_WAIT 1
 #define _G_va_list __gnuc_va_list
 
 #define _G_HAVE_MMAP 1

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

Prev by Date: [Commits] r20768 - in /fsf/trunk/libc: ./ libio/ ports/ ports/sysdeps/unix/sysv/linux/hppa/ ports/sysdeps/unix/sysv/linux/hppa/bits/ s...
Next by Date: [Commits] r20832 - in /fsf/trunk/libc: ./ malloc/ nptl/ nptl/sysdeps/x86_64/ ports/ ports/sysdeps/ia64/ ports/sysdeps/ia64/fpu/ ports/...
Previous by thread: [Commits] r20768 - in /fsf/trunk/libc: ./ libio/ ports/ ports/sysdeps/unix/sysv/linux/hppa/ ports/sysdeps/unix/sysv/linux/hppa/bits/ s...
Next by thread: [Commits] r20832 - in /fsf/trunk/libc: ./ malloc/ nptl/ nptl/sysdeps/x86_64/ ports/ ports/sysdeps/ia64/ ports/sysdeps/ia64/fpu/ ports/...
Index(es):
- Date
- Thread