From c25f634c7cf18d259ba181751982c98011d0cbf7 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Thu, 4 Jul 2024 22:47:54 +0200
Subject: [PATCH] Autotools: Refactor PHP_BROKEN_GCC_STRLEN_OPT

- Synced CS
- Cache variable ac_cv_have_broken_gcc_strlen_opt renamed to
  php_cv_have_broken_gcc_strlen_opt
---
 build/php.m4 | 23 ++++++++++-------------
 configure.ac |  4 +---
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/build/php.m4 b/build/php.m4
index 96daf3dc0596f..926a0397072a7 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1288,9 +1288,10 @@ dnl
 dnl Early releases of GCC 8 shipped with a strlen() optimization bug, so they
 dnl didn't properly handle the `char val[1]` struct hack. See bug #76510.
 dnl
-AC_DEFUN([PHP_BROKEN_GCC_STRLEN_OPT], [
-  AC_CACHE_CHECK([for broken gcc optimize-strlen],ac_cv_have_broken_gcc_strlen_opt,[
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_DEFUN([PHP_BROKEN_GCC_STRLEN_OPT],
+[AC_CACHE_CHECK([for broken gcc optimize-strlen],
+  [php_cv_have_broken_gcc_strlen_opt],
+  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -1306,16 +1307,12 @@ int main(void)
   strcpy(s->c, "foo");
   return strlen(s->c+1) == 2;
 }
-]])],[
-  ac_cv_have_broken_gcc_strlen_opt=yes
-],[
-  ac_cv_have_broken_gcc_strlen_opt=no
-],[
-  ac_cv_have_broken_gcc_strlen_opt=no
-])])
-  if test "$ac_cv_have_broken_gcc_strlen_opt" = "yes"; then
-    CFLAGS="$CFLAGS -fno-optimize-strlen"
-  fi
+]])],
+  [php_cv_have_broken_gcc_strlen_opt=yes],
+  [php_cv_have_broken_gcc_strlen_opt=no],
+  [php_cv_have_broken_gcc_strlen_opt=no])])
+AS_VAR_IF([php_cv_have_broken_gcc_strlen_opt], [yes],
+  [AS_VAR_APPEND([CFLAGS], [" -fno-optimize-strlen"])])
 ])
 
 dnl
diff --git a/configure.ac b/configure.ac
index d539fa8200f59..08b996bd1632a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,9 +445,7 @@ AC_CHECK_HEADERS(m4_normalize([
 
 PHP_FOPENCOOKIE
 PHP_BROKEN_GETCWD
-if test "$GCC" = "yes"; then
-  PHP_BROKEN_GCC_STRLEN_OPT
-fi
+AS_VAR_IF([GCC], [yes], [PHP_BROKEN_GCC_STRLEN_OPT])
 
 dnl Detect the headers required to use makedev, major, and minor.
 dnl Autoconf <= 2.69 didn't check glibc 2.25 deprecated macros in sys/types.h.