From: Elan Ruusamäe <glen@delfi.ee>
Date: Fri, 27 Feb 2015 23:43:53 +0000 (+0200)
Subject: merge ZEND_SIGNED_MULTIPLY_LONG for i386 and x86_64
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~759^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce73a47996ca2d5b9721336975c4ea8b9da9a7a1;p=php

merge ZEND_SIGNED_MULTIPLY_LONG for i386 and x86_64

as the definitions are identical
refs b7eb3c1c5a858e98985adc2335df9b4a021ade51
---

diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index ce77ce1dd4..b12c1e23b3 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -22,19 +22,7 @@
 #ifndef ZEND_MULTIPLY_H
 #define ZEND_MULTIPLY_H
 
-#if defined(__i386__) && defined(__GNUC__)
-
-#define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {	\
-	zend_long __tmpvar; 													\
-	__asm__ ("imul %3,%0\n"											\
-		"adc $0,%1" 												\
-			: "=r"(__tmpvar),"=r"(usedval) 							\
-			: "0"(a), "r"(b), "1"(0));								\
-	if (usedval) (dval) = (double) (a) * (double) (b);				\
-	else (lval) = __tmpvar;											\
-} while (0)
-
-#elif defined(__x86_64__) && defined(__GNUC__)
+#if (defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__)
 
 #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {	\
 	zend_long __tmpvar; 													\