Skip to content

Commit ff5b42b

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix GH-16839: Error on building Opcache JIT for Windows ARM64
2 parents 6dec6a6 + e44b762 commit ff5b42b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ext/opcache/config.w32

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG_ENABLE("opcache", "whether to enable Zend OPcache support", "yes");
2-
ARG_ENABLE("opcache-jit", "whether to enable JIT", "yes");
2+
ARG_ENABLE("opcache-jit", "whether to enable JIT (not supported for ARM64)", "yes");
33

44

55
if (PHP_OPCACHE != "no") {
@@ -22,7 +22,9 @@ if (PHP_OPCACHE != "no") {
2222
ADD_EXTENSION_DEP('opcache', 'pcre');
2323

2424
if (PHP_OPCACHE_JIT == "yes") {
25-
if (CHECK_HEADER_ADD_INCLUDE("ir/ir.h", "CFLAGS_OPCACHE", PHP_OPCACHE + ";ext\\opcache\\jit")) {
25+
if (TARGET_ARCH == 'arm64') {
26+
WARNING("JIT not enabled; not yet supported for ARM64");
27+
} else if (CHECK_HEADER_ADD_INCLUDE("ir/ir.h", "CFLAGS_OPCACHE", PHP_OPCACHE + ";ext\\opcache\\jit")) {
2628
var dasm_flags = (X64 ? "-D X64=1" : "") + (X64 ? " -D X64WIN=1" : "") + " -D WIN=1";
2729
var ir_target = (X64 ? "IR_TARGET_X64" : "IR_TARGET_X86");
2830
var ir_src = "ir_strtab.c ir_cfg.c ir_sccp.c ir_gcm.c ir_ra.c ir_save.c \

0 commit comments

Comments
 (0)