Skip to content

Commit 907b078

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Add cross-compiling 3rd argument to AC_RUN_IFELSE
2 parents 952ffbf + 71e002b commit 907b078

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ Core:
66
. Added zend_call_stack_get implementation for NetBSD, DragonFlyBSD,
77
Solaris and Haiku. (David Carlier)
88
. Enabled ifunc checks on FreeBSD from the 12.x releases. (Freaky)
9+
. Fixed bug GH-12953 (false positive SSA integrity verification failed when
10+
loading composer classmaps with more than 11k elements). (nielsdos)
11+
. Fixed bug GH-12999 (zend_strnlen build when strnlen is unsupported). (rainerjung)
12+
. Fixed bug GH-12966 (missing cross-compiling 3rd argument so Autoconf doesn't
13+
emit warnings). (Peter Kokot)
914

1015
Date:
1116
. Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)

configure.ac

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

0 commit comments

Comments
 (0)