Correct _XXX_ILP32_OFFBIG for x32

diff --git a/ChangeLog b/ChangeLog
index 1e8a85c1d10f434c23e0f9c56e6c734bb780f6c4..e9a7cb7007dbd6600b103df3b5180d7231aeeb3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #14200]
+       * sysdeps/unix/sysv/linux/x86/bits/environments.h
+       (_POSIX_V7_ILP32_OFF32): Defined as 1 only if __x86_64__ isn't
+       defined.
+       (_POSIX_V6_ILP32_OFF32): Likewise.
+       (_XBS5_ILP32_OFF32): Likewise.
+       (__ILP32_OFFBIG_CFLAGS): Defined as "-mx32" for x32.
+       (__ILP32_OFFBIG_LDFLAGS): Likewise.
+
 2013-01-10  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
        * sysdeps/ieee754/dbl-64/mpexp.c: Fix formatting.

diff --git a/NEWS b/NEWS
index 430c5d9d1ef197b34192233fd0eedec1a8b81a75..1cdc37a215cae565db50db8ac98d75ade6dbdc8f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.18
 
 * The following bugs are resolved with this release:
 
-  13951, 14317, 14964, 14981, 14982, 14985, 14994, 14996, 15003.
+  13951, 14200, 14317, 14964, 14981, 14982, 14985, 14994, 14996, 15003.
 
 \f
 Version 2.17

diff --git a/sysdeps/unix/sysv/linux/x86/bits/environments.h b/sysdeps/unix/sysv/linux/x86/bits/environments.h
index 0fe1e3f5fdeeefcc92f382b1d4a5e00d8b342837..27b37b30e7343debf3ed83cf5273ef53149bf920 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86/bits/environments.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/environments.h
@@ -64,15 +64,19 @@
 
 #else /* __WORDSIZE == 32 */
 
-/* By default we have 32-bit wide `int', `long int', pointers and `off_t'
-   and all platforms support LFS.  */
-# define _POSIX_V7_ILP32_OFF32 1
+/* We have 32-bit wide `int', `long int' and pointers and all platforms
+   support LFS.  -mx32 has 64-bit wide `off_t'.  */
 # define _POSIX_V7_ILP32_OFFBIG        1
-# define _POSIX_V6_ILP32_OFF32 1
-# define _POSIX_V6_ILP32_OFFBIG        1
-# define _XBS5_ILP32_OFF32     1
+# define _POSIX_V6_ILP32_OFFBIG 1
 # define _XBS5_ILP32_OFFBIG    1
 
+# ifndef __x86_64__
+/* -m32 has 32-bit wide `off_t'.  */
+#  define _POSIX_V7_ILP32_OFF32        1
+#  define _POSIX_V6_ILP32_OFF32        1
+#  define _XBS5_ILP32_OFF32    1
+# endif
+
 /* We optionally provide an environment with the above size but an 64-bit
    side `off_t'.  Therefore we don't define _POSIX_V7_ILP32_OFFBIG.  */
 
@@ -89,8 +93,13 @@
 #endif /* __WORDSIZE == 32 */
 
 #define __ILP32_OFF32_CFLAGS   "-m32"
-#define __ILP32_OFFBIG_CFLAGS  "-m32 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 #define __ILP32_OFF32_LDFLAGS  "-m32"
-#define __ILP32_OFFBIG_LDFLAGS "-m32"
+#if defined __x86_64__ && defined __ILP32__
+# define __ILP32_OFFBIG_CFLAGS "-mx32"
+# define __ILP32_OFFBIG_LDFLAGS        "-mx32"
+#else
+# define __ILP32_OFFBIG_CFLAGS "-m32 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+# define __ILP32_OFFBIG_LDFLAGS        "-m32"
+#endif
 #define __LP64_OFF64_CFLAGS    "-m64"
 #define __LP64_OFF64_LDFLAGS   "-m64"