diff mbox

php: fix build for AArch64

Message ID 20161212045113.25961-1-ishitatsuyuki@gmail.com
State Accepted
Headers show

Commit Message

Tatsuyuki Ishi Dec. 12, 2016, 4:51 a.m. UTC
From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>

Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
---
 ...asm-constraints-in-aarch64-multiply-macro.patch | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch

Comments

Thomas Petazzoni Dec. 12, 2016, 9:35 p.m. UTC | #1
Hello,

On Mon, 12 Dec 2016 13:51:13 +0900, ishitatsuyuki@gmail.com wrote:
> From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
> 
> Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
> ---
>  ...asm-constraints-in-aarch64-multiply-macro.patch | 24 ++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>  create mode 100644 package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch

I've slightly improved the commit log (mentioned what is fixed
exactly), and added a reference to the upstream pull request. Applied
with those changes. Thanks!

Thomas
diff mbox

Patch

diff --git a/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch b/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch
new file mode 100644
index 000000000..9544d0edb
--- /dev/null
+++ b/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch
@@ -0,0 +1,24 @@ 
+From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001
+From: Andy Postnikov <apostnikov@gmail.com>
+Date: Sat, 10 Dec 2016 23:51:17 +0300
+Subject: [PATCH] Fix bug #70015 - Compilation failure on aarch64
+
+---
+ Zend/zend_multiply.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
+index 75769db..fbd69ab 100644
+--- a/Zend/zend_multiply.h
++++ b/Zend/zend_multiply.h
+@@ -75,8 +75,8 @@
+ 	__asm__("mul %0, %2, %3\n"										\
+ 		"smulh %1, %2, %3\n"										\
+ 		"sub %1, %1, %0, asr #63\n"									\
+-			: "=X"(__tmpvar), "=X"(usedval)							\
+-			: "X"(a), "X"(b));										\
++			: "=&r"(__tmpvar), "=&r"(usedval)						\
++			: "r"(a), "r"(b));										\
+ 	if (usedval) (dval) = (double) (a) * (double) (b);				\
+ 	else (lval) = __tmpvar;											\
+ } while (0)