Merge branch 'PHP-8.4'

* PHP-8.4: Fix GH-16839: Error on building Opcache JIT for Windows ARM64
php · Nov 18, 2024 · ff5b42b · ff5b42b
2 parents 6dec6a6 + e44b762
commit ff5b42b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32
@@ -1,5 +1,5 @@
 ARG_ENABLE("opcache", "whether to enable Zend OPcache support", "yes");
-ARG_ENABLE("opcache-jit", "whether to enable JIT", "yes");
+ARG_ENABLE("opcache-jit", "whether to enable JIT (not supported for ARM64)", "yes");
 
 
 if (PHP_OPCACHE != "no") {
@@ -22,7 +22,9 @@ if (PHP_OPCACHE != "no") {
 	ADD_EXTENSION_DEP('opcache', 'pcre');
 
 	if (PHP_OPCACHE_JIT == "yes") {
-		if (CHECK_HEADER_ADD_INCLUDE("ir/ir.h", "CFLAGS_OPCACHE", PHP_OPCACHE + ";ext\\opcache\\jit")) {
+		if (TARGET_ARCH == 'arm64') {
+			WARNING("JIT not enabled; not yet supported for ARM64");
+		} else if (CHECK_HEADER_ADD_INCLUDE("ir/ir.h", "CFLAGS_OPCACHE", PHP_OPCACHE + ";ext\\opcache\\jit")) {
 			var dasm_flags = (X64 ? "-D X64=1" : "") + (X64 ? " -D X64WIN=1" : "") + " -D WIN=1";
 			var ir_target = (X64 ? "IR_TARGET_X64" : "IR_TARGET_X86");
 			var ir_src = "ir_strtab.c ir_cfg.c ir_sccp.c ir_gcm.c ir_ra.c ir_save.c \