diff options
author | Alan Modra <amodra@gcc.gnu.org> | 2013-09-20 19:17:52 +0930 |
---|---|---|
committer | Alan Modra <amodra@gcc.gnu.org> | 2013-09-20 19:17:52 +0930 |
commit | 3cbe17f7ded6cbdf171c9e7368b0c391501507f1 (patch) | |
tree | 5d7dac8cc93ea38e65be8eeadaec09c34bce21a3 /libjava/libltdl | |
parent | 1f46d137d00b0e733bb4ccd75a62a9e57f64abdd (diff) | |
download | gcc-3cbe17f7ded6cbdf171c9e7368b0c391501507f1.zip gcc-3cbe17f7ded6cbdf171c9e7368b0c391501507f1.tar.gz gcc-3cbe17f7ded6cbdf171c9e7368b0c391501507f1.tar.bz2 |
libtool.m4 (_LT_ENABLE_LOCK <ld -m flags>): Remove non-canonical ppc host match.
* libtool.m4 (_LT_ENABLE_LOCK <ld -m flags>): Remove non-canonical
ppc host match. Support little-endian powerpc linux hosts.
Regenerate configure throughout.
From-SVN: r202773
Diffstat (limited to 'libjava/libltdl')
-rw-r--r-- | libjava/libltdl/ChangeLog | 6 | ||||
-rw-r--r-- | libjava/libltdl/acinclude.m4 | 12 | ||||
-rwxr-xr-x | libjava/libltdl/configure | 32 |
3 files changed, 34 insertions, 16 deletions
diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog index df5ce43..c00e519 100644 --- a/libjava/libltdl/ChangeLog +++ b/libjava/libltdl/ChangeLog @@ -1,3 +1,9 @@ +2013-09-20 Alan Modra <amodra@gmail.com> + + * acinclude.m4 (_LT_ENABLE_LOCK <ld -m flags>): Remove non-canonical + ppc host match. Support little-endian powerpc linux hosts. + * configure: Regenerate. + 2011-11-21 Andreas Tobler <andreast@fgznet.ch> * acinclude.m4: Additional FreeBSD 10 fixes. diff --git a/libjava/libltdl/acinclude.m4 b/libjava/libltdl/acinclude.m4 index d77a1a3..f089119 100644 --- a/libjava/libltdl/acinclude.m4 +++ b/libjava/libltdl/acinclude.m4 @@ -519,7 +519,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then @@ -529,7 +529,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -545,7 +548,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*) diff --git a/libjava/libltdl/configure b/libjava/libltdl/configure index 35b89dc..146ca43 100755 --- a/libjava/libltdl/configure +++ b/libjava/libltdl/configure @@ -4806,7 +4806,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -4820,7 +4820,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -4836,7 +4839,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*) @@ -6456,11 +6462,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6459: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6465: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6463: \$? = $ac_status" >&5 + echo "$as_me:6469: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6718,11 +6724,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6721: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6727: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6725: \$? = $ac_status" >&5 + echo "$as_me:6731: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6780,11 +6786,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6783: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6789: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6787: \$? = $ac_status" >&5 + echo "$as_me:6793: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8099,7 +8105,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8102 "configure"' > conftest.$ac_ext + echo '#line 8108 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8652,7 +8658,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8655 "configure" +#line 8661 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8750,7 +8756,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8753 "configure" +#line 8759 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10591,7 +10597,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10594 "configure" +#line 10600 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |