Skip to content

Commit 637f1cc

Browse files
committed
Disable JIT on Apple Silicon + ZTS
See discussion in #13351. Closes GH-13396
1 parent 115c60e commit 637f1cc

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
- name: ./configure
171171
uses: ./.github/actions/configure-macos
172172
with:
173-
configurationParameters: --enable-debug --disable-zts
173+
configurationParameters: --enable-debug --enable-zts
174174
- name: make
175175
run: |-
176176
export PATH="$(brew --prefix)/opt/bison/bin:$PATH"

ext/opcache/config.m4

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,20 @@ if test "$PHP_OPCACHE" != "no"; then
4242
PHP_OPCACHE_JIT=no
4343
;;
4444
esac
45+
AC_MSG_WARN([Host: $host_vendor])
46+
AC_MSG_WARN([CPU: $host_cpu])
47+
AC_MSG_WARN([ZTS: $ZEND_ZTS])
48+
case "$host_vendor" in
49+
apple*)
50+
case "$host_cpu" in
51+
arm*)
52+
if test "$ZEND_ZTS" = "yes"; then
53+
AC_MSG_WARN([JIT not supported on Apple Silicon with ZTS])
54+
PHP_OPCACHE_JIT=no
55+
fi
56+
esac
57+
esac
58+
AC_MSG_ERROR([Done])
4559
fi
4660

4761
if test "$PHP_OPCACHE_JIT" = "yes" ; then

0 commit comments

Comments
 (0)