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
+6 −3
Closed

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

Changes from all 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
9 changes: 6 additions & 3 deletions Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,12 @@ char *alloca();
# define ZEND_PRESERVE_NONE __attribute__((preserve_none))
#endif

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

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

@arnaud-lb arnaud-lb Dec 28, 2025

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 #)

Copy link
Member Author

@devnexen devnexen Dec 31, 2025

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 ?

Copy link
Contributor

@henderkes henderkes Dec 31, 2025

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)
Expand Down