diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-17 09:34:56 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-02-17 09:34:56 +0100 |
| commit | 7a8f180b19383eeeff320914530581ccfb636e40 (patch) | |
| tree | 5592497ad9866c901fcf85de33a70908eaf8c76c | |
| parent | 7248341ea6b1209f7aa9b9a978e1b35586ccf523 (diff) | |
| download | php-git-7a8f180b19383eeeff320914530581ccfb636e40.tar.gz | |
Revert "Fixed bug #79255 (PHP cannot be compiled with enable JIT)"
This reverts commit de6984edd5ce7fa2b2f365b5ae770507ef42022d.
Reverting to unbreak 32-bit CI.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/opcache/config.m4 | 21 |
2 files changed, 13 insertions, 9 deletions
@@ -42,7 +42,6 @@ PHP NEWS - JIT: . Fixed bug #77857 (Wrong result if executed with JIT). (Laruence) - . Fixed bug #79255 (PHP cannot be compiled with enable JIT). (Laruence) - LDAP: . Removed deprecated ldap_sort. (mcmic) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 4289b438d5..5e61575d48 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -42,14 +42,19 @@ if test "$PHP_OPCACHE" != "no"; then AC_DEFINE(HAVE_JIT, 1, [Define to enable JIT]) ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_vm_helpers.c" - case $host_alias in - *x86_64-*-darwin*) - DASM_FLAGS="-D X64APPLE=1 -D X64=1" - ;; - *x86_64*) - DASM_FLAGS="-D X64=1" - ;; - esac + dnl Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *"Mach-O 64-bit"*) + DASM_FLAGS="-D X64APPLE=1 -D X64=1" + ;; + *64-bit*) + DASM_FLAGS="-D X64=1" + ;; + esac + fi + rm -rf conftest* if test "$enable_zts" = "yes"; then DASM_FLAGS="$DASM_FLAGS -D ZTS=1" |