diff options
| author | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-20 09:47:52 +0000 |
|---|---|---|
| committer | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-20 09:47:52 +0000 |
| commit | 9613c0039f67f7ae0c1c82d3f25640268b48d11b (patch) | |
| tree | 5d7dac8cc93ea38e65be8eeadaec09c34bce21a3 /zlib | |
| parent | 68fc0d2a63e35d58f29afd1815409d961ce76578 (diff) | |
* libtool.m4 (_LT_ENABLE_LOCK <ld -m flags>): Remove non-canonical
ppc host match. Support little-endian powerpc linux hosts.
Regenerate configure throughout.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202773 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/ChangeLog.gcj | 4 | ||||
| -rwxr-xr-x | zlib/configure | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 13b62a4a129e..6025369262a3 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,7 @@ +2013-09-20 Alan Modra <amodra@gmail.com> + + * configure: Regenerate. + 2012-11-16 Matthias Klose <doko@ubuntu.com> * Imported zlib 1.2.7; merged local changes. diff --git a/zlib/configure b/zlib/configure index 8e4a93f2abe6..c71984f4c67d 100755 --- a/zlib/configure +++ b/zlib/configure @@ -5853,7 +5853,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5878,7 +5878,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -5897,7 +5900,10 @@ s390*-*linux*|s390*-*tpf*|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*|s390*-*tpf*) @@ -10394,7 +10400,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10397 "configure" +#line 10403 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10500,7 +10506,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10503 "configure" +#line 10509 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |