Merge branch 'PHP-7.4'

* PHP-7.4:
  Align .text segment for better huge pages usage

diff --cc configure.ac
index ccf6d7721f412b1112d9c8b558ae2661d580f02c,144a77d7366685e7c199cce0d7cd059f89210673..8085824e6bcd77480cb27411385166fbaf6c48bf
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1222,9 -1221,16 +1222,16 @@@ PHP_HELP_SEPARATOR([TSRM:]
  PHP_CONFIGURE_PART(Configuring TSRM)
  TSRM_BASIC_CHECKS
  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
+   *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"

diff --cc ext/opcache/ZendAccelerator.c
Simple merge