Skip to content

Commit 00bfbd0

Browse files
committed
tailcall VM only for x64
1 parent 01d78ec commit 00bfbd0

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

Zend/tests/vm_kind_tailcall_clang_windows.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
2-
Tailcall VM is selected when compiled with Clang >= 19 on Windows
2+
Tailcall VM is selected when compiled with Clang >= 19 on Windows x64
33
--SKIPIF--
44
<?php
55
if (PHP_OS_FAMILY !== 'Windows') die('skip Windows only');
6+
if (php_uname('m') !== 'AMD64') die('skip x64 only');
67

78
ob_start();
89
phpinfo(INFO_GENERAL);

Zend/zend_vm_gen.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2497,7 +2497,7 @@ function gen_vm_opcodes_header(
24972497
$str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_HYBRID\n";
24982498
}
24992499
if ($GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_HYBRID" || $GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_CALL") {
2500-
$str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64))\n";
2500+
$str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__))\n";
25012501
$str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_TAILCALL\n";
25022502
$str .= "#else\n";
25032503
$str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_CALL\n";

Zend/zend_vm_opcodes.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

win32/build/confutils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3375,7 +3375,7 @@ function toolset_setup_common_cflags()
33753375
var vc_ver = probe_binary(PATH_PROG('cl', null));
33763376
ADD_FLAG("CFLAGS"," -fms-compatibility -fms-compatibility-version=" + vc_ver + " -fms-extensions");
33773377

3378-
if (CLANGVERS >= 1900 && (TARGET_ARCH === 'x64' || TARGET_ARCH === 'arm64')) {
3378+
if (CLANGVERS >= 1900 && TARGET_ARCH === 'x64') {
33793379
AC_DEFINE('HAVE_PRESERVE_NONE', 1, 'Whether the compiler supports __attribute__((preserve_none))');
33803380
}
33813381
}

0 commit comments

Comments
 (0)