[commits] r9644 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/m68k/bits/ sysdeps/unix/sysv/linux/mips/bits/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jan 12 00:03:51 2010
New Revision: 9644

Log:
Import glibc-ports-mainline for 2010-01-12

Modified:
    fsf/trunk/ports/ChangeLog.m68k
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/sigaction.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/stat.h

Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Tue Jan 12 00:03:51 2010
@@ -1,3 +1,8 @@
+2010-01-11  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Fix double-inclusion
+	problem.
+
 2010-01-10  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Define O_DIRECTORY,

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Tue Jan 12 00:03:51 2010
@@ -1,3 +1,13 @@
+2010-01-11  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/stat.h: Fix double-inclusion
+	problem.
+
+2010-01-11  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Define
+	SA_RESTART, SA_NODEFER and SA_RESETHAND if __USE_XOPEN2K8.
+
 2010-01-10  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Define O_DIRECTORY,

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h Tue Jan 12 00:03:51 2010
@@ -20,6 +20,9 @@
 #if !defined _SYS_STAT_H && !defined _FCNTL_H
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
+
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H	1
 
 /* Versions of the `struct stat' data structure.  */
 #define _STAT_VER_LINUX_OLD	1
@@ -167,3 +170,5 @@
 # define UTIME_NOW	((1l << 30) - 1l)
 # define UTIME_OMIT	((1l << 30) - 2l)
 #endif
+
+#endif	/* bits/stat.h */

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/sigaction.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/sigaction.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/sigaction.h Tue Jan 12 00:03:51 2010
@@ -1,5 +1,5 @@
 /* The proper definitions for Linux/MIPS's sigaction.
-   Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2003
+   Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2003, 2010
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -64,6 +64,8 @@
 				    three arguments instead of one.  */
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK   0x08000000 /* Use signal stack by using `sa_restorer'. */
+#endif
+#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
 # define SA_RESETHAND 0x80000000 /* Reset to SIG_DFL on entry to handler.  */
 # define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
 # define SA_NODEFER   0x40000000 /* Don't automatically block the signal when

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/stat.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/stat.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/stat.h Tue Jan 12 00:03:51 2010
@@ -20,6 +20,9 @@
 #if !defined _SYS_STAT_H && !defined _FCNTL_H
 # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
 #endif
+
+#ifndef _BITS_STAT_H
+#define _BITS_STAT_H	1
 
 #include <sgidefs.h>
 
@@ -258,3 +261,5 @@
 # define UTIME_NOW	((1l << 30) - 1l)
 # define UTIME_OMIT	((1l << 30) - 2l)
 #endif
+
+#endif	/* bits/stat.h */