mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Fixed bug #79092 (Building with clang+lld-9 results in a broken PHP binary)
This commit is contained in:
Dmitry Stogov 2020-01-29 12:15:34 +03:00
commit 8bdce8edab
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
configure.ac
View File

@ -1020,6 +1020,42 @@ esyscmd(./build/config-stubs ext)
dnl Extensions post-config.
dnl ----------------------------------------------------------------------------
dnl Align segments on huge page boundary
case $host_alias in
i[[3456]]86-*-linux-* | x86_64-*-linux-*)
AC_MSG_CHECKING(linker support for -zcommon-page-size=2097152)
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[int main() {return 0;}]])],
[ac_cv_common_page_size=yes],
[ac_cv_common_page_size=no],
[ac_cv_common_page_size=no])
LDFLAGS=$save_LDFLAGS
if test "$ac_cv_common_page_size" = "yes"; then
AC_MSG_RESULT([yes])
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
else
AC_MSG_RESULT([no])
AC_MSG_CHECKING(linker support for -zmax-page-size=2097152)
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-zmax-page-size=2097152"
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[int main() {return 0;}]])],
[ac_cv_max_page_size=yes],
[ac_cv_max_page_size=no],
[ac_cv_max_page_size=no])
LDFLAGS=$save_LDFLAGS
if test "$ac_cv_max_page_size" = "yes"; then
AC_MSG_RESULT([yes])
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zmax-page-size=2097152"
else
AC_MSG_RESULT([no])
fi
fi
;;
esac
enable_shared=yes
enable_static=yes
@ -1140,13 +1176,6 @@ if test "$PHP_THREAD_SAFETY" = "yes"; then
TSRM_CHECK_PTHREADS
fi
dnl Align segments on huge page boundary
case $host_alias in
i[[3456]]86-*-linux-* | x86_64-*-linux-*)
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
;;
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS"
EXTRA_LIBS="$EXTRA_LIBS $LIBS"