From 72526609413e8a8cd768ed4966c17b1a9db6c12c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jan 2024 10:01:25 +0100 Subject: [PATCH 1/3] Fix GH-13215 GCC 14 build --- Zend/zend_atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_atomic.h b/Zend/zend_atomic.h index 617cde0ec56..8aab3f11ada 100644 --- a/Zend/zend_atomic.h +++ b/Zend/zend_atomic.h @@ -23,7 +23,7 @@ ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x))) /* Builtins are used to avoid library linkage */ -#if __has_feature(c_atomic) +#if __has_feature(c_atomic) && defined(__clang__) #define HAVE_C11_ATOMICS 1 #elif ZEND_GCC_PREREQ(4, 7) #define HAVE_GNUC_ATOMICS 1 From 242f89283e2c423a6a3a307713b13135dfd0074a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jan 2024 10:59:00 +0100 Subject: [PATCH 2/3] NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 62702d87853..425455c5bcc 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ PHP NEWS . Fixed bug GH-12349 (linking failure on ARM with mold). (Jan Palus) . Fixed bug GH-13097 (Anonymous class reference in trigger_error / thrown Exception). (nielsdos) + . Fixed bug GH-13215 (GCC 14 build failure). (Remi) - Curl: . Fix missing error check in curl_multi_init(). (divinity76) From fae27cd8c43f8581c3c0cdbca9e0eda1ae6cb5d7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jan 2024 10:59:34 +0100 Subject: [PATCH 3/3] NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 1bdf3c5f346..743dc955568 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ PHP NEWS Exception). (nielsdos) . Fixed bug GH-13177 (PHP 8.3.2: final private constructor not allowed when used in trait). (nielsdos) + . Fixed bug GH-13215 (GCC 14 build failure). (Remi) - Curl: . Fix missing error check in curl_multi_init(). (divinity76)