This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: PING^2: [PATCH] Correct _{POSIX_V7|_POSIX_V6|XBS5}_ILP32_OFFBIGfor x32
On Wed, Jan 9, 2013 at 4:30 PM, Roland McGrath <roland@hack.frob.com> wrote:
> I see. Please do a refresh repost of the patch against current tip.
> But I think it's probably fine.
I am checking this updated patch against the current master.
Thanks.
--
H.J.
----
[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.
diff --git a/sysdeps/unix/sysv/linux/x86/bits/environments.h b/sysdeps/unix/sysv
/linux/x86/bits/environments.h
index 0fe1e3f..27b37b3 100644
--- 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"
--