Fix #81202 powerpc64 build fails on fibers

php · Jun 26, 2021 · 39a54e2 · 39a54e2
1 parent db64aa3
commit 39a54e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -2,7 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.0alpha3
 
-
+- Core
+  . Fixed bug #81202 (powerpc64 build fails on fibers). (krakjoe)
 
 24 Jun 2021, PHP 8.1.0alpha2
 

diff --git a/configure.ac b/configure.ac
@@ -1200,8 +1200,8 @@ AS_CASE([$host_cpu],
   [x86*|amd*|i?86*|pentium], [fiber_cpu="i386"],
   [aarch64*|arm64*], [fiber_cpu="arm64"],
   [arm*], [fiber_cpu="arm32"],
-  [ppc64*], [fiber_cpu="ppc64"],
-  [powerpc*], [fiber_cpu="ppc32"],
+  [ppc64*|powerpc64*], [fiber_cpu="ppc64"],
+  [ppc*|powerpc*], [fiber_cpu="ppc32"],
   [s390x*], [fiber_cpu="s390x"],
   [mips64*], [fiber_cpu="mips64"],
   [mips*], [fiber_cpu="mips32"],
@@ -1219,7 +1219,7 @@ AS_CASE([$fiber_cpu],
   [arm64], [fiber_asm_file_prefix="arm64_aapcs"],
   [arm32], [fiber_asm_file_prefix="arm_aapcs"],
   [ppc64], [fiber_asm_file_prefix="ppc64_sysv"],
-  [ppc32], [fiber_asm_file_prefix="ppc_sysv"],
+  [ppc32], [fiber_asm_file_prefix="ppc32_sysv"],
   [s390x], [fiber_asm_file_prefix="s390x_sysv"],
   [mips64], [fiber_asm_file_prefix="mips64_n64"],
   [mips32], [fiber_asm_file_prefix="mips32_o32"],