php71: disable the use of a global register for execute_data on i386.

This seems to fix segfaults that occur on netbsd/i386 + gcc 4.8.5,
tested only in QEMU.

Upstream bug https://bugs.php.net/bug.php?id=74527

2 files changed, 30 insertions, 11 deletions

diff --git a/lang/php71/distinfo b/lang/php71/distinfo
index 5e08a69d20c..42a792a8abe 100644
--- a/lang/php71/distinfo
+++ b/lang/php71/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.18 2017/04/14 15:43:26 taca Exp $
+$NetBSD: distinfo,v 1.19 2017/05/02 03:40:36 maya Exp $
 
 SHA1 (php-7.1.4.tar.bz2) = 87d6de530d7f4a9ca1bf5d29bf91eada9d0471e3
 RMD160 (php-7.1.4.tar.bz2) = b51d1ac458bcac07de63117e556d109040e98ac0
 SHA512 (php-7.1.4.tar.bz2) = a1dd5ffd756176e6ba600dd850510033d0d6f07aff314de69fec0c42437e6a006449e3f4f98679146a2f2645caa65ea351e31a8e1da7c14cc5260856ad40eaff
 Size (php-7.1.4.tar.bz2) = 15710808 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
-SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
+SHA1 (patch-configure) = 8c7633d0b309b4b08fddffa2780f68cb7f55d55e
 SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d
diff --git a/lang/php71/patches/patch-configure b/lang/php71/patches/patch-configure
index b643af6f5ce..50ca3961de7 100644
--- a/lang/php71/patches/patch-configure
+++ b/lang/php71/patches/patch-configure
@@ -1,8 +1,27 @@
-$NetBSD: patch-configure,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
+$NetBSD: patch-configure,v 1.2 2017/05/02 03:40:36 maya Exp $
 
---- configure.orig	2016-04-28 18:12:26.000000000 +0000
+Disable the use of a global register on i386.
+https://bugs.php.net/bug.php?id=74527
+
+Detect openssl in / too.
+
+Some additional changes.
+
+--- configure.orig	2017-04-11 15:37:37.000000000 +0000
 +++ configure
-@@ -6930,27 +6930,6 @@ EOF
+@@ -5737,10 +5737,7 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no";
+ #else
+ # define ZEND_GCC_VERSION 0
+ #endif
+-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(i386)
+-# define ZEND_VM_FP_GLOBAL_REG "%esi"
+-# define ZEND_VM_IP_GLOBAL_REG "%edi"
+-#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__x86_64__)
++#if defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__x86_64__)
+ # define ZEND_VM_FP_GLOBAL_REG "%r14"
+ # define ZEND_VM_IP_GLOBAL_REG "%r15"
+ #elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
+@@ -6921,27 +6918,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +49,7 @@ $NetBSD: patch-configure,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -18408,7 +18387,7 @@ fi
+@@ -18402,7 +18378,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -39,7 +58,7 @@ $NetBSD: patch-configure,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; }
+@@ -20603,7 +20579,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -48,7 +67,7 @@ $NetBSD: patch-configure,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -31742,7 +31721,7 @@ fi
+@@ -31773,7 +31749,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -57,7 +76,7 @@ $NetBSD: patch-configure,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -42631,7 +42610,7 @@ fi
+@@ -42665,7 +42641,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -66,7 +85,7 @@ $NetBSD: patch-configure,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -92806,7 +92785,7 @@ fi
+@@ -93774,7 +93750,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -75,7 +94,7 @@ $NetBSD: patch-configure,v 1.1 2016/08/04 14:09:03 jdolecek Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -96439,12 +96418,7 @@ old_CC=$CC
+@@ -97400,12 +97376,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"