Skip to content

Fix linking with clang on 32-bit x86: don't use ifunc resolvers #24362

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

Open
marc-mabe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix linking with clang on 32-bit x86: don't use ifunc resolvers #24362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,9 +599,13 @@ extern "C++" {
#endif

/* Only use ifunc resolvers if we have __builtin_cpu_supports() and __builtin_cpu_init(),
* otherwise the use of zend_cpu_supports() may not be safe inside ifunc resolvers. */
* otherwise the use of zend_cpu_supports() may not be safe inside ifunc resolvers.
* Not with clang on 32-bit x86 either: it calls an ifunc defined in the same
* translation unit directly (R_386_PC32) instead of through the PLT, which the
* linker rejects for position-independent output ("unsupported non-PIC call to IFUNC"). */
#if defined(HAVE_FUNC_ATTRIBUTE_IFUNC) && defined(HAVE_FUNC_ATTRIBUTE_TARGET) && \
defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && defined(PHP_HAVE_BUILTIN_CPU_INIT)
defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && defined(PHP_HAVE_BUILTIN_CPU_INIT) && \
!(defined(__clang__) && defined(__i386__))
# define ZEND_INTRIN_HAVE_IFUNC_TARGET 1
#endif

Expand Down
Loading