move --disable-gcc-global-regs to Makefile.php.

Seems to make a previously segfaulting netbsd-8/i386's build not segfault.
ap-php runs PHP's configure and builds some of its code, so it needs the
same flag.

Now we can stop requiring an arbitrary GCC version. The test case in the
GCC bugzilla fails on all GCC versions I tested, but magically some
versions of GCC manage to build a working PHP.

6 files changed, 14 insertions, 29 deletions

diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index c0ffdf349ee..8ea1d5f87bf 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/20 13:27:28 taca Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/31 01:17:56 maya Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -48,12 +48,6 @@ INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
-.if ${MACHINE_ARCH} == "i386"
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-CONFIGURE_ARGS+=	--disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=	yes
diff --git a/lang/php70/Makefile.php b/lang/php70/Makefile.php
index 2590ba6d364..7b98a24074d 100644
--- a/lang/php70/Makefile.php
+++ b/lang/php70/Makefile.php
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.php,v 1.10 2018/07/30 07:17:15 manu Exp $
+# $NetBSD: Makefile.php,v 1.11 2018/07/31 01:17:56 maya Exp $
 # used by lang/php70/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
-# With --disable-gcc-global-regs, works around
+# segfaults when buidling with many compilers
 # https://bugs.php.net/bug.php?id=74527
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
 .if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=		6.4
+CONFIGURE_ARGS+=	--disable-gcc-global-regs
 .endif
 
 .include "../../lang/php70/Makefile.common"
diff --git a/lang/php71/Makefile b/lang/php71/Makefile
index a9eceb2a69a..7ab2016d21b 100644
--- a/lang/php71/Makefile
+++ b/lang/php71/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/20 13:23:46 taca Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/31 01:17:56 maya Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -48,12 +48,6 @@ INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=	--disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=	yes
diff --git a/lang/php71/Makefile.php b/lang/php71/Makefile.php
index bbe942fe790..a161e9b47ff 100644
--- a/lang/php71/Makefile.php
+++ b/lang/php71/Makefile.php
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.php,v 1.9 2018/07/30 07:17:16 manu Exp $
+# $NetBSD: Makefile.php,v 1.10 2018/07/31 01:17:56 maya Exp $
 # used by lang/php71/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
 # With --disable-gcc-global-regs, works around 
 # https://bugs.php.net/bug.php?id=74527
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
 .if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=		6.4
+CONFIGURE_ARGS+=	--disable-gcc-global-regs
 .endif
 
 .include "../../lang/php71/Makefile.common"
diff --git a/lang/php72/Makefile b/lang/php72/Makefile
index d1791c413d2..f934b7ed186 100644
--- a/lang/php72/Makefile
+++ b/lang/php72/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/20 13:29:50 taca Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/31 01:17:56 maya Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -40,12 +40,6 @@ SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
 
 INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=	--disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=	yes
diff --git a/lang/php72/Makefile.php b/lang/php72/Makefile.php
index e060bc6d758..7ea0b857a31 100644
--- a/lang/php72/Makefile.php
+++ b/lang/php72/Makefile.php
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.php,v 1.7 2018/07/30 07:17:16 manu Exp $
+# $NetBSD: Makefile.php,v 1.8 2018/07/31 01:17:56 maya Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
-# With --disable-gcc-global-regs, works around 
+# segfaults when buidling with many compilers
 # https://bugs.php.net/bug.php?id=74527
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
 .if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=		6.4
+CONFIGURE_ARGS+=	--disable-gcc-global-regs
 .endif
 
 # the binary actually needs full dep on PCRE