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/libgfortran | |
| 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/libgfortran')
| -rw-r--r-- | gcc-4.7/libgfortran/ChangeLog.x32 | 3 | ||||
| -rwxr-xr-x | gcc-4.7/libgfortran/configure | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gcc-4.7/libgfortran/ChangeLog.x32 b/gcc-4.7/libgfortran/ChangeLog.x32 new file mode 100644 index 000000000..9a0c1eb87 --- /dev/null +++ b/gcc-4.7/libgfortran/ChangeLog.x32 @@ -0,0 +1,3 @@ +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. diff --git a/gcc-4.7/libgfortran/configure b/gcc-4.7/libgfortran/configure index 227f556fd..bd8e10b9a 100755 --- a/gcc-4.7/libgfortran/configure +++ b/gcc-4.7/libgfortran/configure @@ -8071,7 +8071,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" @@ -12318,7 +12325,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12321 "configure" +#line 12328 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12424,7 +12431,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12427 "configure" +#line 12434 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |