Skip to content

Commit cd5c5c7

Browse files
committed
Fixed Windows build
1 parent 3b566cf commit cd5c5c7

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

ext/opcache/config.w32

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ if (PHP_OPCACHE != "no") {
4343
if (CHECK_HEADER_ADD_INCLUDE("ir/ir.h", "CFLAGS_OPCACHE", PHP_OPCACHE + ";ext\\opcache\\jit")) {
4444
var dasm_flags = (X64 ? "-D X64=1" : "") + (X64 ? " -D X64WIN=1" : "") + " -D WIN=1";
4545
var ir_target = (X64 ? "IR_TARGET_X64" : "IR_TARGET_X86");
46+
var ir_src = "ir_strtab.c ir_cfg.c ir_sccp.c ir_gcm.c ir_ra.c ir_save.c \
47+
ir_dump.c ir_check.c ir_patch.c";
4648

4749
DEFINE("IR_TARGET", ir_target);
4850
DEFINE("DASM_FLAGS", dasm_flags);
@@ -59,6 +61,7 @@ if (PHP_OPCACHE != "no") {
5961
if (CHECK_HEADER_ADD_INCLUDE("capstone\\capstone.h", "CFLAGS_OPCACHE", PHP_OPCACHE+ ";" + PHP_PHP_BUILD + "\\include") &&
6062
CHECK_LIB("capstone.lib", "opcache", PHP_OPCACHE)) {
6163
AC_DEFINE('HAVE_CAPSTONE', 1, 'capstone support enabled');
64+
ir_src += " ir_disasm.c";
6265
}
6366

6467
ADD_MAKEFILE_FRAGMENT(configure_module_dirname + "\\jit\\Makefile.frag.w32");
@@ -67,9 +70,11 @@ if (PHP_OPCACHE != "no") {
6770
"zend_jit.c zend_jit_vm_helpers.c",
6871
"opcache", "ext\\opcache\\jit");
6972
ADD_SOURCES(configure_module_dirname + "\\jit\\ir",
70-
"ir.c ir_strtab.c ir_cfg.c ir_sccp.c ir_gcm.c ir_ra.c ir_save.c \
71-
ir_dump.c ir_disasm.c ir_check.c ir_patch.c ir_emit.c",
72-
"opcache", "ext\\opcache\\jit\\ir");
73+
"ir.c", "opcache", "ext\\opcache\\jit\\ir");
74+
ADD_SOURCES(configure_module_dirname + "\\jit\\ir",
75+
"ir_emit.c", "opcache", "ext\\opcache\\jit\\ir");
76+
ADD_SOURCES(configure_module_dirname + "\\jit\\ir",
77+
ir_src, "opcache", "ext\\opcache\\jit\\ir");
7378
} else {
7479
WARNING("JIT not enabled, headers not found");
7580
}

ext/opcache/jit/ir

Submodule ir updated 1 file

0 commit comments

Comments
 (0)