Patch X-to-r-to-avoid-macro-expansion-error.patch for Compile Failure Bug #70015

Patch version 2015-07-10 06:09 UTC

Obsoleted by patches:

• fix-asm-constraints-in-aarch64-multiply-macro, revision 2016-04-25 10:15 UTC

• 2015-07-10 06:09 UTC [diff to current]

Developer: rongqing.li@windriver.com

Modify X to r to avoid macro expansion error

Upstream-Status: Pending [php]

Author: Huang Yuanjie <yuanjie.huang@windriver.com>
Signed-off-by: Jian Liu <jian.liu@windriver.com>

diff -Nur php-5.5.15.orig/Zend/zend_multiply.h php-5.5.15/Zend/zend_multiply.h
--- php-5.5.15.orig/Zend/zend_multiply.h	2015-01-23 16:37:19.992619803 +0800
+++ php-5.5.15/Zend/zend_multiply.h	2015-01-23 16:38:50.005644880 +0800
@@ -63,7 +63,7 @@
 		"smulh %1, %2, %3\n"										\
 		"sub %1, %1, %0, asr #63\n"									\
 			: "=X"(__tmpvar), "=X"(usedval)							\
-			: "X"(a), "X"(b));										\
+			: "r"(a), "r"(b));										\
 	if (usedval) (dval) = (double) (a) * (double) (b);				\
 	else (lval) = __tmpvar;											\
 } while (0)