Always define __O_LARGEFILE

diff --git a/ChangeLog b/ChangeLog
index 4358a52..c5f8f4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-10-22  Andreas Jaeger  <aj@suse.de>
 
+       * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (__O_LARGEFILE):
+       Define always.
+       * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (__O_LARGEFILE): Likewise.
+
        * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
        bits/fcntl-linux.h.
 

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 3641a52..6fcfc7a 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,4 +1,7 @@
-2012-10-21  Andreas Jaeger  <aj@suse.de>
+2012-10-22  Andreas Jaeger  <aj@suse.de>
+
+       * ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h (__O_LARGEFILE):
+       Define always.
 
        * sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Remove all
        definitions and declarations that are provided by

diff --git a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
index e37285d..f259490 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
@@ -23,10 +23,7 @@
 #define __O_DIRECTORY   040000 /* Must be a directory.  */
 #define __O_NOFOLLOW   0100000 /* Do not follow links.  */
 #define __O_DIRECT     0200000 /* Direct disk access.  */
-
-#ifdef __USE_LARGEFILE64
-# define __O_LARGEFILE 0400000
-#endif
+#define __O_LARGEFILE  0400000
 
 struct flock
   {

diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index 6f53fbc..ecf1baf 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -22,13 +22,11 @@
 
 #include <bits/wordsize.h>
 
-#ifdef __USE_LARGEFILE64
-# if __WORDSIZE == 64
+#if __WORDSIZE == 64
 /* Not necessary, files are always with 64bit off_t.  */
-#  define __O_LARGEFILE        0
-# else
-#  define __O_LARGEFILE        0100000
-# endif
+# define __O_LARGEFILE 0
+#else
+# define __O_LARGEFILE 0100000
 #endif
 
 /* Values for the second argument to `fcntl'.  */

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index b8496a9..0f4bf76 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -39,14 +39,11 @@
 #define __O_DIRECT     0x100000 /* direct disk access hint */
 #define __O_NOATIME    0x200000 /* Do not set atime.  */
 #define __O_PATH       0x1000000 /* Resolve pathname but do not open file.  */
-#endif
 
-#ifdef __USE_LARGEFILE64
-# if __WORDSIZE == 64
-#  define __O_LARGEFILE        0
-# else
-#  define __O_LARGEFILE        0x40000
-# endif
+#if __WORDSIZE == 64
+# define __O_LARGEFILE 0
+#else
+# define __O_LARGEFILE 0x40000
 #endif
 
 #define __O_DSYNC      0x2000  /* Synchronize data.  */