Author: ps-guest
Date: 2009-05-06 09:39:30 + (Wed, 06 May 2009)
New Revision: 3460
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2501 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===
--- glibc-package/trunk/debian/changelog2009-05-05 14:41:43 UTC (rev
3459)
+++ glibc-package/trunk/debian/changelog2009-05-06 09:39:30 UTC (rev
3460)
@@ -1,5 +1,8 @@
eglibc (2.9-12) unstable; urgency=low
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2501 (from glibc-bsd).
+
*
-- Aurelien Jarno aure...@debian.org Tue, 05 May 2009 15:40:40 +0200
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2009-05-05 14:41:43 UTC (rev 3459)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2009-05-06 09:39:30 UTC (rev 3460)
@@ -3125,7 +3125,7 @@
+
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/fcntl.h
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,151 @@
+/* O_*, F_*, FD_* bit values for FreeBSD.
+ Copyright (C) 1991-1992, 1997, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -3146,52 +3146,56 @@
+ 02111-1307 USA. */
+
+#ifndef _FCNTL_H
-+#error Never use bits/fcntl.h directly; include fcntl.h instead.
++# error Never use bits/fcntl.h directly; include fcntl.h instead.
+#endif
+
+#include sys/types.h
++#include bits/wordsize.h
++#ifdef __USE_GNU
++# include bits/uio.h
++#endif
+
-+/* File access modes for `open' and `fcntl'. */
-+#define O_RDONLY0 /* Open read-only. */
-+#define O_WRONLY1 /* Open write-only. */
-+#define O_RDWR 2 /* Open read/write. */
+
++/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
++ located on an ext2 file system */
++#define O_ACCMODE0003
++#define O_RDONLY 00
++#define O_WRONLY 01
++#define O_RDWR 02
++#define O_CREAT 01000 /* not fcntl */
++#define O_EXCL 04000 /* not fcntl */
++#define O_NOCTTY 010 /* not fcntl */
++#define O_TRUNC 02000 /* not fcntl */
++#define O_APPEND 010
++#define O_NONBLOCK 04
++#define O_NDELAY O_NONBLOCK
++#define O_SYNC 0200
++#define O_FSYNCO_SYNC
++#define O_ASYNC 0100
+
-+/* Bits OR'd into the second argument to open. */
-+#define O_CREAT 0x0200 /* Create file if it doesn't exist. */
-+#define O_EXCL 0x0800 /* Fail if file already exists. */
-+#define O_TRUNC 0x0400 /* Truncate file to zero length. */
-+#define O_NOCTTY0x8000 /* Don't assign a controlling terminal.
*/
-+#ifdef__USE_MISC
-+#define O_ASYNC 0x0040 /* Send SIGIO to owner when data is
ready. */
-+#define O_FSYNC 0x0080 /* Synchronous writes. */
-+#define O_SYNC O_FSYNC
-+#define O_SHLOCK0x0010 /* Open with shared file lock. */
-+#define O_EXLOCK0x0020 /* Open with shared exclusive lock. */
-+#define O_NOFOLLOW0x0100 /* Don't follow symlinks. */
-+#define O_DIRECT0x0001 /* Attempt to bypass buffer cache */
++#ifdef __USE_GNU
++# define O_DIRECT 020 /* Direct disk access. */
++enum { O_DIRECTORY = 0 }; /* Must be a directory. */
++enum { O_NOATIME = 0}; /* Do not set atime. */
++# define O_NOFOLLOW 0400 /* Do not follow links. */
+#endif
+
-+enum { O_DIRECTORY = 0 };
-+
-+/* File status flags for `open' and `fcntl'. */
-+#define O_APPEND0x0008 /* Writes append to the file. */
-+#define O_NONBLOCK 0x0004 /* Non-blocking I/O. */
-+
+#ifdef __USE_BSD
-+#define O_NDELAYO_NONBLOCK
++#define O_SHLOCK 020 /* Open with shared file lock. */
++#define O_EXLOCK 040 /* Open with shared exclusive lock. */
+#endif
+
-+/* Since 'off_t' is 64-bit, O_LARGEFILE is a no-op. */
-+#define O_LARGEFILE 0
-+
-+/* FreeBSD doesn't have smaller grained synchronicity control than per file.
-+ fdatasync() is equivalent to fsync(), so we define O_DSYNC == O_SYNC. */
++/* For now FreeBSD has synchronisity options for data and read operations.
++ 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_RSYNC O_SYNC /* Synchronize read operations. */
++# define O_RSYNC O_SYNC /* Synchronize read operations. */
