This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Correct _{POSIX_V7|_POSIX_V6|XBS5}_ILP32_OFFBIG for x32
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Cc: Roland McGrath <roland at hack dot frob dot com>
- Date: Sat, 1 Dec 2012 08:37:01 -0800
- Subject: [PATCH] Correct _{POSIX_V7|_POSIX_V6|XBS5}_ILP32_OFFBIG for x32
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
This is a resubmission of
http://sourceware.org/ml/libc-alpha/2012-06/msg00168.html
There is no difference in i686 build and x32 build gets -mx32 for
_{POSIX_V7|_POSIX_V6|XBS5}_ILP32_OFFBIG. The results are
1. x32 build provides POSIX_V6_ILP32_OFFBIG,
POSIX_V7_ILP32_OFFBIG and XBS5_ILP32_OFFBIG.
2. i686 build provides POSIX_V6_ILP32_OFF32,
POSIX_V7_ILP32_OFF32, XBS5_ILP32_OFF32,
POSIX_V6_ILP32_OFFBIG, POSIX_V7_ILP32_OFFBIG
and XBS5_ILP32_OFFBIG.
If both x32 glibc and i686 glibc are installed, the installer should
arrange that the i686 version of POSIX_V6_ILP32_OFFBIG,
POSIX_V7_ILP32_OFFBIG and XBS5_ILP32_OFFBIG aren't install so that x32
version is used. OK to install?
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 793a04f..8ebc837 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"
--
1.7.6.5