Skip to content

Fix compilation errors up until Clang 21.0 #22141

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
kocsismate wants to merge 3 commits into
base: master
Choose a base branch
from
+10 −3
Open

Fix compilation errors up until Clang 21.0 #22141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e6745b
Fix compilation errors up until Clang 21.0
kocsismate May 24, 2026
3afbcde
Try to suppress warning due to unknown compiler flags
kocsismate May 24, 2026
4367a0d
Fix for 32 bit
kocsismate May 24, 2026
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
11 changes: 9 additions & 2 deletions Zend/zend_cpuinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,10 @@ static zend_always_inline int zend_cpu_supports_avx512_vbmi(void) {
#endif

/* __builtin_cpu_supports has pclmul from gcc9 and clang 19 */
#if defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && (!defined(__GNUC__) || (defined(__clang__) && __clang_major__ >= 19) || (ZEND_GCC_VERSION >= 9000))
#if defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && (defined(__x86_64__) || defined(__i386__)) && \
( \
(!defined(__GNUC__) || (defined(__clang__) && __clang_major__ >= 19) || (ZEND_GCC_VERSION >= 9000)) \
)
ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_pclmul(void) {
#ifdef PHP_HAVE_BUILTIN_CPU_INIT
Expand All @@ -287,7 +290,11 @@ static inline int zend_cpu_supports_pclmul(void) {
#endif

/* __builtin_cpu_supports has cldemote from gcc11 and clang 19 */
#if defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && ((defined(__clang__) && (__clang_major__ >= 19)) || (!defined(__clang__) && defined(__GNUC__) && (ZEND_GCC_VERSION >= 11000)))
#if defined(PHP_HAVE_BUILTIN_CPU_SUPPORTS) && (defined(__x86_64__) || defined(__i386__)) && \
( \
(defined(__clang__) && (__clang_major__ >= 19)) || \
(!defined(__clang__) && defined(__GNUC__) && (ZEND_GCC_VERSION >= 11000)) \
)
#define HAVE_ZEND_CPU_SUPPORTS_CLDEMOTE 1
ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_cldemote(void) {
Expand Down
2 changes: 1 addition & 1 deletion ext/lexbor/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PHP_LEXBOR_CFLAGS="-I@ext_srcdir@/"
PHP_LEXBOR_CFLAGS="-Wno-unknown-warning-option -Wno-unterminated-string-initialization -I@ext_srcdir@/"
LEXBOR_DIR="lexbor"

AC_DEFINE([HAVE_LEXBOR], [1], [Define to 1 if the PHP extension 'lexbor' is available.])
Expand Down
Loading