php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Fix GH-20546: Zend preserve_none attribute config check on macOs issue.
This commit is contained in:
David Carlier
2025-11-22 23:11:12 +00:00
parent 509cb06dc2 1787765696
commit 56dd321ec7
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Zend/Zend.m4
View File

@@ -474,7 +474,7 @@ dnl expectations.
dnl
AC_DEFUN([ZEND_CHECK_PRESERVE_NONE], [dnl
AC_CACHE_CHECK([for preserve_none calling convention],
[php_cv_preverve_none],
[php_cv_preserve_none],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <stdint.h>
@@ -504,7 +504,11 @@ uintptr_t __attribute__((preserve_none)) test(void) {
"movq %2, %%r13\n"
"xorq %3, %%r13\n"
"xorq %%rax, %%rax\n"
#if defined(__APPLE__)
"call _fun\n"
#else
"call fun\n"
#endif
: "=a" (ret)
: "r" (const1), "r" (const2), "r" (key)
: "r12", "r13"
@@ -515,7 +519,11 @@ uintptr_t __attribute__((preserve_none)) test(void) {
"eor x20, %1, %3\n"
"eor x21, %2, %3\n"
"eor x0, x0, x0\n"
#if defined(__APPLE__)
"bl _fun\n"
#else
"bl fun\n"
#endif
"mov %0, x0\n"
: "=r" (ret)
: "r" (const1), "r" (const2), "r" (key)