[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r9764 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/alpha/bits/ sysdeps/unix/sysv/linux/alpha/nptl/
- To: commits@xxxxxxxxxx
- Subject: [commits] r9764 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/alpha/bits/ sysdeps/unix/sysv/linux/alpha/nptl/
- From: eglibc@xxxxxxxxxx
- Date: Sat, 30 Jan 2010 08:03:24 -0000
Author: eglibc
Date: Sat Jan 30 00:03:23 2010
New Revision: 9764
Log:
Import glibc-ports-mainline for 2010-01-30
Modified:
fsf/trunk/ports/ChangeLog.alpha
fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
Modified: fsf/trunk/ports/ChangeLog.alpha
==============================================================================
--- fsf/trunk/ports/ChangeLog.alpha (original)
+++ fsf/trunk/ports/ChangeLog.alpha Sat Jan 30 00:03:23 2010
@@ -1,3 +1,31 @@
+2010-01-12 Matt Turner <mattst88@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Fix double-inclusion
+ problem.
+
+2010-01-12 Matt Turner <mattst88@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Define
+ SA_RESTART, SA_NODEFER and SA_RESETHAND if __USE_XOPEN2K8.
+
+2010-01-12 Matt Turner <mattst88@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Define O_DIRECTORY,
+ O_NOFOLLOW, O_CLOEXEC, F_DUPFD_CLOEXEC, F_SETOWN, and F_GETOWN for
+ XPG7.
+ * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Enable using from
+ fcntl.h.
+
+2010-01-12 Matt Turner <mattst88@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Redefine O_SYNC and
+ O_DSYNC to match 2.6.33+ kernels.
+
+2009-12-02 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c: Fix typo in
+ include timer_gettime.c -> timer_settime.c.
+
2009-11-23 Matt Turner <mattst88@xxxxxxxxx>
* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Use struct timespec
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h Sat Jan 30 00:03:23 2010
@@ -1,5 +1,5 @@
/* O_*, F_*, FD_* bit values for Linux.
- Copyright (C) 1995-2000,2004,2005,2006,2007 Free Software Foundation, Inc.
+ Copyright (C) 1995-2000,2004,2005,2006,2007,2010 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
@@ -41,16 +41,18 @@
#define O_NONBLOCK 00004
#define O_APPEND 00010
#define O_NDELAY O_NONBLOCK
-#define O_SYNC 040000
+#define O_SYNC 020040000
#define O_FSYNC O_SYNC
#define O_ASYNC 020000 /* fcntl, for BSD compatibility */
-#ifdef __USE_GNU
+#ifdef __USE_XOPEN2K8
# define O_DIRECTORY 0100000 /* Must be a directory. */
# define O_NOFOLLOW 0200000 /* Do not follow links. */
+# define O_CLOEXEC 010000000 /* Set close_on_exec. */
+#endif
+#ifdef __USE_GNU
# define O_DIRECT 02000000 /* Direct disk access. */
# define O_NOATIME 04000000 /* Do not set atime. */
-# define O_CLOEXEC 010000000 /* Set close_on_exec. */
#endif
#ifdef __USE_LARGEFILE64
@@ -62,7 +64,7 @@
We define the symbols here but let them do the same as O_SYNC since
this is a superset. */
#if defined __USE_POSIX199309 || defined __USE_UNIX98
-# define O_DSYNC O_SYNC /* Synchronize data. */
+# define O_DSYNC 040000 /* Synchronize data. */
# define O_RSYNC O_SYNC /* Synchronize read operations. */
#endif
@@ -79,7 +81,7 @@
#define F_SETLK64 F_SETLK /* Set record locking info (non-blocking). */
#define F_SETLKW64 F_SETLKW /* Set record locking info (blocking). */
-#if defined __USE_BSD || defined __USE_UNIX98
+#if defined __USE_BSD || defined __USE_UNIX98 || defiend __USE_XOPEN2K8
# define F_SETOWN 5 /* Get owner of socket (receiver of SIGIO). */
# define F_GETOWN 6 /* Set owner of socket (receiver of SIGIO). */
#endif
@@ -93,6 +95,8 @@
# define F_SETLEASE 1024 /* Set a lease. */
# define F_GETLEASE 1025 /* Enquire what lease is active. */
# define F_NOTIFY 1026 /* Request notfications on a directory. */
+#endif
+#ifdef __USE_XOPEN2K8
# define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with
close-on-exit set. */
#endif
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h Sat Jan 30 00:03:23 2010
@@ -1,5 +1,5 @@
/* The proper definitions for Linux/Alpha sigaction.
- Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 2000, 2010 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
@@ -54,6 +54,8 @@
three arguments instead of one. */
#if defined __USE_UNIX98 || defined __USE_MISC
# define SA_ONSTACK 0x00000001 /* Use signal stack by using `sa_restorer'. */
+#endif
+#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
# define SA_RESTART 0x00000002 /* Restart syscall on signal return. */
# define SA_NODEFER 0x00000008 /* Don't automatically block the signal
when its handler is being executed. */
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h Sat Jan 30 00:03:23 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2001,2004
+/* Copyright (C) 1996,1997,1998,1999,2000,2001,2004,2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -17,9 +17,12 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifndef _SYS_STAT_H
+#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_KERNEL 0
@@ -155,3 +158,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/alpha/nptl/timer_settime.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c Sat Jan 30 00:03:23 2010
@@ -1,1 +1,1 @@
-#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c>