Skip to content

Commit 71e002b

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Add cross-compiling 3rd argument to AC_RUN_IFELSE
2 parents c3f6579 + de5557b commit 71e002b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ PHP NEWS
66
. Fixed bug GH-12953 (false positive SSA integrity verification failed when
77
loading composer classmaps with more than 11k elements). (nielsdos)
88
. Fixed bug GH-12999 (zend_strnlen build when strnlen is unsupported). (rainerjung)
9+
. Fixed bug GH-12966 (missing cross-compiling 3rd argument so Autoconf doesn't
10+
emit warnings). (Peter Kokot)
911

1012
- Cli:
1113
. Fix incorrect timeout in built-in web server when using router script and

configure.ac

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,15 +1625,16 @@ if test "$PHP_UNDEFINED_SANITIZER" = "yes"; then
16251625
dnl cast to void*. In that case, set -fno-sanitize=function.
16261626
OLD_CFLAGS="$CFLAGS"
16271627
CFLAGS="$CFLAGS -fno-sanitize-recover=undefined"
1628+
AC_CACHE_CHECK([whether to add -fno-sanitize=function],[php_cv_ubsan_no_function],[
16281629
AC_RUN_IFELSE([AC_LANG_SOURCE([[
16291630
void foo(char *string) {}
16301631
int main(void) {
16311632
void (*f)(void *) = (void (*)(void *))foo;
16321633
f("foo");
16331634
}
1634-
]])],,[ubsan_needs_no_function=yes],)
1635+
]])],[php_cv_ubsan_no_function=no],[php_cv_ubsan_no_function=yes],[php_cv_ubsan_no_function=no])])
16351636
CFLAGS="$OLD_CFLAGS"
1636-
if test "$ubsan_needs_no_function" = yes; then
1637+
if test "$php_cv_ubsan_no_function" = yes; then
16371638
CFLAGS="$CFLAGS -fno-sanitize=function"
16381639
CXXFLAGS="$CFLAGS -fno-sanitize=function"
16391640
fi

0 commit comments

Comments
 (0)