archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* PHP-8.3:
  Do not remove -O0 in the middle of a flag
  Fix removal of optimization cflags in debug builds (#9647)
This commit is contained in:
Arnaud Le Blanc 2024-09-12 13:12:51 +02:00
commit c21899a9f0
No known key found for this signature in database
GPG key ID: 0098C05DD15ABC13
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build/php.m4
View file

@ -2533,3 +2533,15 @@ AS_VAR_IF([php_var], [yes],
[Define to 1 if the compiler supports the '$1' variable attribute.])]) [Define to 1 if the compiler supports the '$1' variable attribute.])])
AS_VAR_POPDEF([php_var]) AS_VAR_POPDEF([php_var])
]) ])
dnl
dnl PHP_REMOVE_OPTIMIZATION_FLAGS
dnl
dnl Removes known compiler optimization flags like -O, -O0, -O1, ..., -Ofast
dnl from CFLAGS and CXXFLAGS.
dnl
AC_DEFUN([PHP_REMOVE_OPTIMIZATION_FLAGS], [
sed_script='s/\([[\t ]]\|^\)-O\([[0-9gsz]]\|fast\|\)\([[\t ]]\|$\)/\1/g'
CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e "$sed_script")
])

12
configure.ac
View file

@ -785,11 +785,7 @@ AS_VAR_IF([PHP_GCOV], [yes], [
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/build/Makefile.gcov], [$abs_srcdir]) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/build/Makefile.gcov], [$abs_srcdir])
dnl Remove all optimization flags from CFLAGS. dnl Remove all optimization flags from CFLAGS.
changequote({,}) PHP_REMOVE_OPTIMIZATION_FLAGS
dnl Discard known '-O...' flags, including just '-O', but do not remove only '-O' in '-Ounknown'
CFLAGS=$(echo "$CFLAGS" | $SED -e 's/-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)//g')
CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e 's/-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)//g')
changequote([,])
dnl Add the special gcc flags. dnl Add the special gcc flags.
CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage" CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
@ -806,11 +802,7 @@ PHP_ARG_ENABLE([debug],
AS_VAR_IF([PHP_DEBUG], [yes], [ AS_VAR_IF([PHP_DEBUG], [yes], [
PHP_DEBUG=1 PHP_DEBUG=1
ZEND_DEBUG=yes ZEND_DEBUG=yes
changequote({,}) PHP_REMOVE_OPTIMIZATION_FLAGS
dnl Discard known '-O...' flags, including just '-O', but do not remove only '-O' in '-Ounknown'
CFLAGS=$(echo "$CFLAGS" | $SED -e 's/-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)//g')
CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e 's/-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)//g')
changequote([,])
dnl Add -O0 only if GCC or ICC is used. dnl Add -O0 only if GCC or ICC is used.
if test "$GCC" = "yes" || test "$ICC" = "yes"; then if test "$GCC" = "yes" || test "$ICC" = "yes"; then
CFLAGS="$CFLAGS -O0" CFLAGS="$CFLAGS -O0"

6
scripts/phpize.m4
View file

@ -104,11 +104,7 @@ dnl Discard optimization flags when debugging is enabled.
AS_VAR_IF([PHP_DEBUG], [yes], [ AS_VAR_IF([PHP_DEBUG], [yes], [
PHP_DEBUG=1 PHP_DEBUG=1
ZEND_DEBUG=yes ZEND_DEBUG=yes
changequote({,}) PHP_REMOVE_OPTIMIZATION_FLAGS
dnl Discard known '-O...' flags, including just '-O', but do not remove only '-O' in '-Ounknown'
CFLAGS=$(echo "$CFLAGS" | $SED -e 's/-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)//g')
CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e 's/-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)//g')
changequote([,])
dnl Add -O0 only if GCC or ICC is used. dnl Add -O0 only if GCC or ICC is used.
if test "$GCC" = "yes" || test "$ICC" = "yes"; then if test "$GCC" = "yes" || test "$ICC" = "yes"; then
CFLAGS="$CFLAGS -O0" CFLAGS="$CFLAGS -O0"