diff options
| author | Pavel Chupin <pavel.v.chupin@intel.com> | 2012-11-27 14:09:50 +0400 |
|---|---|---|
| committer | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-04-18 16:50:12 +0400 |
| commit | 9e1f9b3eacb51a67e675cd1195c472215fb16373 (patch) | |
| tree | af3f97ee1874e13a5fe5ba61058aba045bbad279 /gcc-4.7/libitm | |
| parent | 5d65342898686feb3faceb3beb10529501d67b48 (diff) | |
| download | toolchain_gcc-9e1f9b3eacb51a67e675cd1195c472215fb16373.tar.gz toolchain_gcc-9e1f9b3eacb51a67e675cd1195c472215fb16373.tar.bz2 toolchain_gcc-9e1f9b3eacb51a67e675cd1195c472215fb16373.zip | |
[4.7] x32: Backport x32 support into 4.7
This patch contains all gcc changes required to build x32 compiler.
They are backported from 4.8/trunk.
Change-Id: I923f639c1f0cee5812b0f555a39bab0bd0723865
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Diffstat (limited to 'gcc-4.7/libitm')
| -rw-r--r-- | gcc-4.7/libitm/ChangeLog.x32 | 8 | ||||
| -rw-r--r-- | gcc-4.7/libitm/configure | 13 | ||||
| -rw-r--r-- | gcc-4.7/libitm/configure.tgt | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/gcc-4.7/libitm/ChangeLog.x32 b/gcc-4.7/libitm/ChangeLog.x32 new file mode 100644 index 000000000..36444bbce --- /dev/null +++ b/gcc-4.7/libitm/ChangeLog.x32 @@ -0,0 +1,8 @@ +2012-03-31 H.J. Lu <hongjiu.lu@intel.com> + + PR bootstrap/52812 + * configure.tgt (i[456]86-*-linux*): Handle -mx32 like -m64. + +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. diff --git a/gcc-4.7/libitm/configure b/gcc-4.7/libitm/configure index 47c7b0cd4..fc6a46d02 100644 --- a/gcc-4.7/libitm/configure +++ b/gcc-4.7/libitm/configure @@ -7285,7 +7285,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -11770,7 +11777,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11773 "configure" +#line 11780 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11876,7 +11883,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11879 "configure" +#line 11886 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc-4.7/libitm/configure.tgt b/gcc-4.7/libitm/configure.tgt index b68c86b05..333bdff7d 100644 --- a/gcc-4.7/libitm/configure.tgt +++ b/gcc-4.7/libitm/configure.tgt @@ -53,7 +53,7 @@ case "${target_cpu}" in i[3456]86) case " ${CC} ${CFLAGS} " in - *" -m64 "*) + *" -m64 "*|*" -mx32 "*) ;; *) if test -z "$with_arch"; then |