From 66a33dbdce43bcee8ff9a2b3922138a20045bb1a Mon Sep 17 00:00:00 2001 From: Thomas Hurst Date: Fri, 22 Sep 2023 16:11:22 +0000 Subject: [PATCH] Fix GH-12273 - configure __builtin_cpu_init() check __builtin_cpu_init() is documented as having a void return type. It happens to return int on gcc, but is void on clang. Close GH-122274 --- NEWS | 3 +-- build/php.m4 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 13ec233a25e..1d99d020200 100644 --- a/NEWS +++ b/NEWS @@ -9,10 +9,9 @@ PHP NEWS warning). (Girgias) . Fixed bug GH-12215 (Module entry being overwritten causes type errors in ext/dom). (nielsdos) - -- Core: . Fixed bug GH-12207 (memory leak when class using trait with doc block). (rioderelfte) + . Fixed bug GH-12273 (__builtin_cpu_init check). (Freaky) - Filter: . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov) diff --git a/build/php.m4 b/build/php.m4 index 80b20410b18..53ba3942317 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -2713,7 +2713,7 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CPU_INIT], [ AC_MSG_CHECKING([for __builtin_cpu_init]) AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ - return __builtin_cpu_init()? 1 : 0; + __builtin_cpu_init(); ]])], [ have_builtin_cpu_init=1 AC_MSG_RESULT([yes])