This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch aj/shared-linux-fcntl updated. glibc-2.16-ports-merge-522-ga8f443b
- From: aj at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 24 Oct 2012 12:34:48 -0000
- Subject: GNU C Library master sources branch aj/shared-linux-fcntl updated. glibc-2.16-ports-merge-522-ga8f443b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, aj/shared-linux-fcntl has been updated
via a8f443b285543223315d4ac3f7c72beb16db7166 (commit)
via 2d45f477f1864c1d2515d05290c8aee289ca410a (commit)
from 38dbec99f998ad42431ecb2112486a3389c4b00c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a8f443b285543223315d4ac3f7c72beb16db7166
commit a8f443b285543223315d4ac3f7c72beb16db7166
Author: Andreas Jaeger <aj@suse.de>
Date: Wed Oct 24 14:34:16 2012 +0200
Remove more values defined in <bits/fcntl-linux.h>
diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
index bf917a8..d22501c 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
@@ -31,12 +31,8 @@
#define O_NOCTTY 0x0800 /* not fcntl */
#define O_ASYNC 0x1000
-#define __O_NOFOLLOW 0x20000 /* Do not follow links. */
-
-#define __O_DIRECTORY 0x10000 /* Must be a directory. */
-#define __O_DIRECT 0x8000 /* Direct disk access hint. */
-#define __O_NOATIME 0x40000 /* Do not set atime. */
-#define __O_DSYNC 0x0010 /* Synchronize data. */
+#define __O_DIRECT 0x8000 /* Direct disk access hint. */
+#define __O_DSYNC 0x0010 /* Synchronize data. */
#if _MIPS_SIM == _ABI64
/* Not necessary, files are always with 64bit off_t. */
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2d45f477f1864c1d2515d05290c8aee289ca410a
commit 2d45f477f1864c1d2515d05290c8aee289ca410a
Author: Andreas Jaeger <aj@suse.de>
Date: Wed Oct 24 10:19:40 2012 +0200
Remove comments, add some conditionals
diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
index 5412991..bf917a8 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
@@ -31,20 +31,19 @@
#define O_NOCTTY 0x0800 /* not fcntl */
#define O_ASYNC 0x1000
-// XXX: Linux kernel headers use different value
#define __O_NOFOLLOW 0x20000 /* Do not follow links. */
-// XXX: Linux kernel headers use different value
#define __O_DIRECTORY 0x10000 /* Must be a directory. */
-# define __O_DIRECT 0x8000 /* Direct disk access hint. */
-
-// XXX: Linux kernel headers use different value
+#define __O_DIRECT 0x8000 /* Direct disk access hint. */
#define __O_NOATIME 0x40000 /* Do not set atime. */
-
-// XXX: Linux kernel headers use different value
#define __O_DSYNC 0x0010 /* Synchronize data. */
-#define __O_LARGEFILE 0x2000 /* Allow large file opens. */
+#if _MIPS_SIM == _ABI64
+/* Not necessary, files are always with 64bit off_t. */
+# define __O_LARGEFILE 0
+#else
+# define __O_LARGEFILE 0x2000 /* Allow large file opens. */
+#endif
#ifndef __USE_FILE_OFFSET64
# define F_GETLK 14 /* Get record locking info. */
@@ -56,17 +55,19 @@
# define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */
#endif
-// XXX: Double check, Linux kernel has ifndef __mips64
-// XXX: These should not be defined for __WORDSIZE == 64 - correct?
-#define F_GETLK64 33 /* Get record locking info. */
-#define F_SETLK64 34 /* Set record locking info (non-blocking). */
-#define F_SETLKW64 35 /* Set record locking info (blocking). */
-
-#if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
-# define F_SETOWN 24 /* Get owner (process receiving SIGIO). */
-# define F_GETOWN 23 /* Set owner (process receiving SIGIO). */
+#if _MIPS_SIM != _ABI64
+# define F_GETLK64 33 /* Get record locking info. */
+# define F_SETLK64 34 /* Set record locking info (non-blocking). */
+# define F_SETLKW64 35 /* Set record locking info (blocking). */
+#else
+# define F_GETLK64 14 /* Get record locking info. */
+# define F_SETLK64 6 /* Set record locking info (non-blocking).*/
+# define F_SETLKW64 7 /* Set record locking info (blocking). */
#endif
+#define __F_SETOWN 24 /* Get owner (process receiving SIGIO). */
+#define __F_GETOWN 23 /* Set owner (process receiving SIGIO). */
+
struct flock
{
short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
-----------------------------------------------------------------------
Summary of changes:
ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h | 41 ++++++++++------------
1 files changed, 19 insertions(+), 22 deletions(-)
hooks/post-receive
--
GNU C Library master sources