Always define __O_LARGEFILE

diff --git a/ChangeLog b/ChangeLog
index 4358a522483a6d0a9bf73ead5f05db977330ac54..c5f8f4d9f2701f3631df3fec684461880f6e0f67 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 3641a5282d3d6e0bbf2d578bfd67a7b5e0dc7902..6fcfc7ada8e77ceaff7dc3d0ee2207a1ff79facf 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 e37285d3ac0fd56a8d985fc41af4cad5a872d5a8..f259490ab4055296fca83e6976cb5f9c6b3b8080 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 6f53fbc0b5b1457d41e88e364f62756ba69c7432..ecf1baf8b9afb98f2e7d8e5cbb06db75a65ed321 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 b8496a9072edd31281db95887c20a2c97c97e874..0f4bf7649062167012f5cb7f6d589740672471d5 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.  */