diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-28 00:48:28 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-28 00:48:28 +0300 |
| commit | a8b97086d7c5bd5df5243d11bb8b5e9406a2b6c2 (patch) | |
| tree | 7d5499a54099f39fb5d03addd54c6a27d44c9df3 /build | |
| parent | fc5f93166371d275b8982e14e0868b776c039d25 (diff) | |
| parent | b38ca3adeeee502d2fb1be9b8956c60a3d7c1f0e (diff) | |
| download | php-git-a8b97086d7c5bd5df5243d11bb8b5e9406a2b6c2.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
Diffstat (limited to 'build')
| -rw-r--r-- | build/libtool.m4 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build/libtool.m4 b/build/libtool.m4 index 4d948b9078..37dc159882 100644 --- a/build/libtool.m4 +++ b/build/libtool.m4 @@ -615,7 +615,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*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -629,7 +629,10 @@ 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*) @@ -648,7 +651,10 @@ 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*) |