Skip to content

Commit 7a8f180

Browse files
committed
Revert "Fixed bug #79255 (PHP cannot be compiled with enable JIT)"
This reverts commit de6984e. Reverting to unbreak 32-bit CI.
1 parent 7248341 commit 7a8f180

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

NEWS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ PHP NEWS
4242

4343
- JIT:
4444
. Fixed bug #77857 (Wrong result if executed with JIT). (Laruence)
45-
. Fixed bug #79255 (PHP cannot be compiled with enable JIT). (Laruence)
4645

4746
- LDAP:
4847
. Removed deprecated ldap_sort. (mcmic)

ext/opcache/config.m4

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,19 @@ if test "$PHP_OPCACHE" != "no"; then
4242
AC_DEFINE(HAVE_JIT, 1, [Define to enable JIT])
4343
ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_vm_helpers.c"
4444

45-
case $host_alias in
46-
*x86_64-*-darwin*)
47-
DASM_FLAGS="-D X64APPLE=1 -D X64=1"
48-
;;
49-
*x86_64*)
50-
DASM_FLAGS="-D X64=1"
51-
;;
52-
esac
45+
dnl Find out which ABI we are using.
46+
echo 'int i;' > conftest.$ac_ext
47+
if AC_TRY_EVAL(ac_compile); then
48+
case `/usr/bin/file conftest.o` in
49+
*"Mach-O 64-bit"*)
50+
DASM_FLAGS="-D X64APPLE=1 -D X64=1"
51+
;;
52+
*64-bit*)
53+
DASM_FLAGS="-D X64=1"
54+
;;
55+
esac
56+
fi
57+
rm -rf conftest*
5358

5459
if test "$enable_zts" = "yes"; then
5560
DASM_FLAGS="$DASM_FLAGS -D ZTS=1"

0 commit comments

Comments
 (0)