Patch similar-change-to-zend-m4 for Compile Failure Bug #74527

Patch version 2017-05-02 03:32 UTC

• 2017-05-02 03:32 UTC [diff to current]

Developer: coypu@sdf.org

From 23bb87247d8bd09fb91b1db49cb0dade73731480 Mon Sep 17 00:00:00 2001
From: Maya Rashish <coypu@sdf.org>
Date: Tue, 2 May 2017 06:21:47 +0300
Subject: [PATCH 1/1] Don't use a global register on i386.

It's broken on NetBSD-7.1/i386 with GCC 4.8.5.
---
 Zend/Zend.m4 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 8afb7f59..e2d1c2ac 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -426,10 +426,7 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
 #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__)
-- 
2.12.2