]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Wed, 29 Jan 2020 09:15:34 +0000 (12:15 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 29 Jan 2020 09:15:34 +0000 (12:15 +0300)
* PHP-7.4:
  Fixed bug #79092 (Building with clang+lld-9 results in a broken PHP binary)

1  2 
configure.ac

diff --cc configure.ac
index 4d6106581f0895347c92899485ad21fa838b8292,501730ba47fbcfbe3f4a44c6070955480465c3d4..1c1964a9ee3a9829fca127711920e6e9cdc23bc2
@@@ -1137,16 -1201,9 +1173,9 @@@ unset LIBS LDFLAG
  PHP_HELP_SEPARATOR([TSRM:])
  PHP_CONFIGURE_PART(Configuring TSRM)
  if test "$PHP_THREAD_SAFETY" = "yes"; then
 -  TSRM_THREADS_CHECKS
 +  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"