Skip to content

Commit 3da4b3c

Browse files
committed
Attempt to fix Windows build
1 parent b15a943 commit 3da4b3c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "Optimizer/zend_call_graph.h"
4040
#include "Optimizer/zend_dump.h"
4141

42-
#if defined(__x86_64__) || defined(i386)
42+
#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
4343
#include "jit/zend_jit_x86.h"
4444
#elif defined (__aarch64__)
4545
#include "jit/zend_jit_arm64.h"
@@ -206,7 +206,7 @@ static bool zend_is_commutative(zend_uchar opcode)
206206
#define OP2_RANGE() OP_RANGE(ssa_op, op2)
207207
#define OP1_DATA_RANGE() OP_RANGE(ssa_op + 1, op1)
208208

209-
#if defined(__x86_64__) || defined(i386)
209+
#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
210210
#include "dynasm/dasm_x86.h"
211211
#elif defined(__aarch64__)
212212
#include "dynasm/dasm_arm64.h"
@@ -224,7 +224,7 @@ static bool zend_is_commutative(zend_uchar opcode)
224224
# include "jit/zend_jit_oprofile.c"
225225
#endif
226226

227-
#if defined(__x86_64__) || defined(i386)
227+
#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
228228
#include "jit/zend_jit_vtune.c"
229229
#include "jit/zend_jit_x86.c"
230230
#elif defined(__aarch64__)

ext/opcache/jit/zend_jit_disasm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static uint64_t zend_jit_disasm_branch_target(csh cs, const cs_insn *insn)
225225
{
226226
unsigned int i;
227227

228-
#if defined(__x86_64__) || defined(i386)
228+
#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
229229
if (cs_insn_group(cs, insn, X86_GRP_JUMP)) {
230230
for (i = 0; i < insn->detail->x86.op_count; i++) {
231231
if (insn->detail->x86.operands[i].type == X86_OP_IMM) {
@@ -319,7 +319,7 @@ static int zend_jit_disasm(const char *name,
319319
#endif
320320

321321
#ifdef HAVE_CAPSTONE
322-
# if defined(__x86_64__) || defined(_WIN64)
322+
# if defined(__x86_64__) || defined(_WIN64) || defined(ZEND_WIN32)
323323
if (cs_open(CS_ARCH_X86, CS_MODE_64, &cs) != CS_ERR_OK)
324324
return 0;
325325
cs_option(cs, CS_OPT_DETAIL, CS_OPT_ON);

ext/opcache/jit/zend_jit_vm_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "Optimizer/zend_func_info.h"
2929
#include "Optimizer/zend_call_graph.h"
3030
#include "zend_jit.h"
31-
#if defined(__x86_64__) || defined(i386)
31+
#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
3232
#include "zend_jit_x86.h"
3333
#elif defined(__aarch64__)
3434
#include "zend_jit_arm64.h"

0 commit comments

Comments
 (0)