diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-16 22:11:18 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-16 22:11:18 +0000 |
| commit | b4b3bbba824a8d7e713f90b47de4acf36a6b43b9 (patch) | |
| tree | 0007d25b499ac6d83204c313765f73351718b2d9 /libjava/classpath | |
| parent | 1eaedae67937a002e43db2b990e711157c4038ce (diff) | |
| download | gcc-b4b3bbba824a8d7e713f90b47de4acf36a6b43b9.tar.gz | |
Regenerate configure files for libtool.m4 change
boehm-gc/
* configure: Regenerated.
gcc/
* configure: Regenerated.
libatomic/
* configure: Regenerated.
libffi/
* configure: Regenerated.
libgfortran/
* configure: Regenerated.
libgomp/
* configure: Regenerated.
libitm/
* configure: Regenerated.
libjava/classpath/
* configure: Regenerated.
libjava/
* configure: Regenerated.
libmudflap/
* configure: Regenerated.
libobjc/
* configure: Regenerated.
libquadmath/
* configure: Regenerated.
libssp/
* configure: Regenerated.
libstdc++-v3/
* configure: Regenerated.
lto-plugin/
* configure: Regenerated.
zlib/
* configure: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187616 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 4 | ||||
| -rwxr-xr-x | libjava/classpath/configure | 21 |
2 files changed, 18 insertions, 7 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index eae363d067f..53d206bdcc9 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. + 2012-01-01 Jakub Jelinek <jakub@redhat.com> * gnu/java/rmi/registry/RegistryImpl.java (version): Update diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 5874086aa0c..21d0d5f755e 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -7592,7 +7592,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" @@ -11811,7 +11818,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11814 "configure" +#line 11821 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11917,7 +11924,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11920 "configure" +#line 11927 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23878,7 +23885,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 23881 "configure" */ +/* #line 23888 "configure" */ package java.lang; public class Object @@ -23971,7 +23978,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 23974: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 23981: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -23999,7 +24006,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 24002 "configure" */ +/* [#]line 24009 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -24207,7 +24214,7 @@ if test "x${use_glibj_zip}" = xfalse || \ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 24210 "configure" */ + /* #line 24217 "configure" */ public class Test { public static void main(String args) |