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 /zlib | |
parent | re PR fortran/58099 ([F03] over-zealous procedure-pointer error checking) (diff) | |
download | gcc-3cbe17f7ded6cbdf171c9e7368b0c391501507f1.tar.gz gcc-3cbe17f7ded6cbdf171c9e7368b0c391501507f1.tar.bz2 gcc-3cbe17f7ded6cbdf171c9e7368b0c391501507f1.tar.xz |
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 '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 13b62a4a129..6025369262a 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj | |||
@@ -1,3 +1,7 @@ | |||
1 | 2013-09-20 Alan Modra <amodra@gmail.com> | ||
2 | |||
3 | * configure: Regenerate. | ||
4 | |||
1 | 2012-11-16 Matthias Klose <doko@ubuntu.com> | 5 | 2012-11-16 Matthias Klose <doko@ubuntu.com> |
2 | 6 | ||
3 | * Imported zlib 1.2.7; merged local changes. | 7 | * Imported zlib 1.2.7; merged local changes. |
diff --git a/zlib/configure b/zlib/configure index 8e4a93f2abe..c71984f4c67 100755 --- a/zlib/configure +++ b/zlib/configure | |||
@@ -5853,7 +5853,7 @@ ia64-*-hpux*) | |||
5853 | rm -rf conftest* | 5853 | rm -rf conftest* |
5854 | ;; | 5854 | ;; |
5855 | 5855 | ||
5856 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | 5856 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
5857 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | 5857 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
5858 | # Find out which ABI we are using. | 5858 | # Find out which ABI we are using. |
5859 | echo 'int i;' > conftest.$ac_ext | 5859 | echo 'int i;' > conftest.$ac_ext |
@@ -5878,7 +5878,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | |||
5878 | ;; | 5878 | ;; |
5879 | esac | 5879 | esac |
5880 | ;; | 5880 | ;; |
5881 | ppc64-*linux*|powerpc64-*linux*) | 5881 | powerpc64le-*linux*) |
5882 | LD="${LD-ld} -m elf32lppclinux" | ||
5883 | ;; | ||
5884 | powerpc64-*linux*) | ||
5882 | LD="${LD-ld} -m elf32ppclinux" | 5885 | LD="${LD-ld} -m elf32ppclinux" |
5883 | ;; | 5886 | ;; |
5884 | s390x-*linux*) | 5887 | s390x-*linux*) |
@@ -5897,7 +5900,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | |||
5897 | x86_64-*linux*) | 5900 | x86_64-*linux*) |
5898 | LD="${LD-ld} -m elf_x86_64" | 5901 | LD="${LD-ld} -m elf_x86_64" |
5899 | ;; | 5902 | ;; |
5900 | ppc*-*linux*|powerpc*-*linux*) | 5903 | powerpcle-*linux*) |
5904 | LD="${LD-ld} -m elf64lppc" | ||
5905 | ;; | ||
5906 | powerpc-*linux*) | ||
5901 | LD="${LD-ld} -m elf64ppc" | 5907 | LD="${LD-ld} -m elf64ppc" |
5902 | ;; | 5908 | ;; |
5903 | s390*-*linux*|s390*-*tpf*) | 5909 | s390*-*linux*|s390*-*tpf*) |
@@ -10394,7 +10400,7 @@ else | |||
10394 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 10400 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
10395 | lt_status=$lt_dlunknown | 10401 | lt_status=$lt_dlunknown |
10396 | cat > conftest.$ac_ext <<_LT_EOF | 10402 | cat > conftest.$ac_ext <<_LT_EOF |
10397 | #line 10397 "configure" | 10403 | #line 10403 "configure" |
10398 | #include "confdefs.h" | 10404 | #include "confdefs.h" |
10399 | 10405 | ||
10400 | #if HAVE_DLFCN_H | 10406 | #if HAVE_DLFCN_H |
@@ -10500,7 +10506,7 @@ else | |||
10500 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 10506 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
10501 | lt_status=$lt_dlunknown | 10507 | lt_status=$lt_dlunknown |
10502 | cat > conftest.$ac_ext <<_LT_EOF | 10508 | cat > conftest.$ac_ext <<_LT_EOF |
10503 | #line 10503 "configure" | 10509 | #line 10509 "configure" |
10504 | #include "confdefs.h" | 10510 | #include "confdefs.h" |
10505 | 10511 | ||
10506 | #if HAVE_DLFCN_H | 10512 | #if HAVE_DLFCN_H |