From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 29 Jan 2020 09:15:34 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bdce8edabd38adeeb4a71e18a5bca8d5dded08e;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79092 (Building with clang+lld-9 results in a broken PHP binary)
---

8bdce8edabd38adeeb4a71e18a5bca8d5dded08e
diff --cc configure.ac
index 4d6106581f,501730ba47..1c1964a9ee
--- a/configure.ac
+++ b/configure.ac
@@@ -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"