diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-21 10:43:55 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-21 10:43:55 +0000 |
| commit | bd11046c067c9b3bbae45b2723d7bae0ccc99da2 (patch) | |
| tree | 651676cbef1c8e70dd0202c2989b2ef58678fcd8 /libobjc | |
| parent | 0d8c07f78603884b20cb9fd6a07879d382565449 (diff) | |
| download | gcc-bd11046c067c9b3bbae45b2723d7bae0ccc99da2.tar.gz | |
2012-05-21 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 187704 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187706 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 4 | ||||
| -rwxr-xr-x | libobjc/configure | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 704981d9c13..3946e654ca1 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. + 2012-03-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.ac (enable_objc_gc): Remove alpha*-dec-osf* handling. diff --git a/libobjc/configure b/libobjc/configure index 2807d7394f9..5028c28fba0 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -6072,7 +6072,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" @@ -10587,7 +10594,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10590 "configure" +#line 10597 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10693,7 +10700,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10696 "configure" +#line 10703 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11464,7 +11471,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 11467 "configure" +#line 11474 "configure" @interface Frob @end @implementation Frob |