Skip to content

Commit 52a350a

Browse files
committed
Merge branch 'PHP-8.5'
2 parents f8bdf59 + 3be6a14 commit 52a350a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmake/cmake/toolchains/template.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ set(PHP_ZEND_CHECK_STACK_LIMIT_EXITCODE 0)
4242
# Set the exit code of the preserve_none check.
4343
set(PHP_ZEND_HAVE_PRESERVE_NONE_EXITCODE 0)
4444

45-
# Set the exit code of the check if syscall to create shadow stack exists.
46-
set(PHP_ZEND_SHADOW_STACK_SYSCALL_EXITCODE 1)
47-
4845
# Set the exit code and the output of the ZEND_MM check.
4946
# See CheckMMAlignment.cmake.
5047
set(PHP_ZEND_MM_EXITCODE 0)
5148
set(PHP_ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
5249

50+
# Set the exit code of the check if syscall to create shadow stack exists.
51+
set(PHP_ZEND_SHADOW_STACK_SYSCALL_EXITCODE 1)
52+
5353
################################################################################
5454
# sapi/fpm
5555
################################################################################

0 commit comments

Comments
 (0)