Skip to content

Commit a8b9708

Browse files
committed
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>
2 parents fc5f931 + b38ca3a commit a8b9708

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

build/libtool.m4

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ ia64-*-hpux*)
615615
rm -rf conftest*
616616
;;
617617
618-
x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
618+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
619619
s390*-*linux*|sparc*-*linux*)
620620
# Find out which ABI we are using.
621621
echo 'int i;' > conftest.$ac_ext
@@ -629,7 +629,10 @@ s390*-*linux*|sparc*-*linux*)
629629
x86_64-*linux*)
630630
LD="${LD-ld} -m elf_i386"
631631
;;
632-
ppc64-*linux*|powerpc64-*linux*)
632+
powerpc64le-*linux*)
633+
LD="${LD-ld} -m elf32lppclinux"
634+
;;
635+
powerpc64-*linux*)
633636
LD="${LD-ld} -m elf32ppclinux"
634637
;;
635638
s390x-*linux*)
@@ -648,7 +651,10 @@ s390*-*linux*|sparc*-*linux*)
648651
x86_64-*linux*)
649652
LD="${LD-ld} -m elf_x86_64"
650653
;;
651-
ppc*-*linux*|powerpc*-*linux*)
654+
powerpcle-*linux*)
655+
LD="${LD-ld} -m elf64lppc"
656+
;;
657+
powerpc-*linux*)
652658
LD="${LD-ld} -m elf64ppc"
653659
;;
654660
s390*-*linux*)

config.guess

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,12 @@ EOF
982982
ppc:Linux:*:*)
983983
echo powerpc-unknown-linux-gnu
984984
exit ;;
985+
ppc64le:Linux:*:*)
986+
echo powerpc64le-unknown-linux-gnu
987+
exit ;;
988+
ppcle:Linux:*:*)
989+
echo powerpcle-unknown-linux-gnu
990+
exit ;;
985991
s390:Linux:*:* | s390x:Linux:*:*)
986992
echo ${UNAME_MACHINE}-ibm-linux
987993
exit ;;

0 commit comments

Comments
 (0)