Skip to content

Fix GH-20767: build failure with preserve_none attribute enabled on mac. #20777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
devnexen wants to merge 6 commits into from
Closed

Fix GH-20767: build failure with preserve_none attribute enabled on mac. #20777

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbc2260
Fix GH-20767: build failure with preserve_none attribute enabled on mac.
devnexen Dec 25, 2025
9327fb3
enabling for the rest
devnexen Dec 25, 2025
404f602
apply suggestion
devnexen Dec 25, 2025
43c03c4
apply arnaud suggestion
devnexen Dec 26, 2025
f74024f
trying @petk suggestion
devnexen Dec 27, 2025
478dc34
review
devnexen Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion Zend/Zend.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,35 @@ AC_CHECK_FUNC([sigsetjmp],,
[AC_MSG_FAILURE([Required sigsetjmp not found.])],
[#include <setjmp.h>])])


ZEND_CHECK_STACK_DIRECTION
ZEND_CHECK_FLOAT_PRECISION
ZEND_DLSYM_CHECK
ZEND_CHECK_GLOBAL_REGISTER_VARIABLES
ZEND_CHECK_PRESERVE_NONE

case $host_os in
darwin*)
dnl versions prior to this lead to compilation failure
dnl Prefer __apple_build_version__ (reliable, numeric) when available.
dnl The known-good minimum corresponds to 17000404 (see PR discussion).
min_apple_build_version=17000404
apple_build_version=`echo | $CC -dM -E -x c - 2>/dev/null | sed -n 's/^#define __apple_build_version__ \([0-9][0-9]*\)$/\1/p'`

AS_IF([test -n "$apple_build_version"], [
AC_MSG_CHECKING([Apple clang __apple_build_version__ >= $min_apple_build_version])
AS_IF([test "$apple_build_version" -ge "$min_apple_build_version"], [
ZEND_CHECK_PRESERVE_NONE
])
], [
dnl Not Apple clang (could be Homebrew clang, GCC, etc.) -> keep enabled
ZEND_CHECK_PRESERVE_NONE
])
;;
*)
ZEND_CHECK_PRESERVE_NONE
;;
esac

ZEND_CHECK_CPUID_COUNT

AC_MSG_CHECKING([whether to enable thread safety])
Expand Down
3 changes: 3 additions & 0 deletions Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,10 +336,13 @@ char *alloca();
# define ZEND_PRESERVE_NONE __attribute__((preserve_none))
#endif


#if !defined(__apple_build_version__) || (defined(__apple_build_version__) && __apple_build_version__ >= 17000404)

@arnaud-lb arnaud-lb Dec 28, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: please indent the nested cpp directives (with a space after the #)

@devnexen devnexen Dec 31, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not get your suggestion @henderkes, it is not within a nested part is it ?

@henderkes henderkes Dec 31, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, didn't see the #endif just above. Ignore the suggestion then.

#if __has_attribute(musttail)
# define HAVE_MUSTTAIL
# define ZEND_MUSTTAIL __attribute__((musttail))
#endif
#endif

#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(__APPLE__) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)) || __has_attribute(noreturn)
# define HAVE_NORETURN
Expand Down