summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-12-02 18:11:03 +0100
committerNikita Popov <nikita.ppv@gmail.com>2017-12-02 18:11:03 +0100
commitcbe60003f12b2b0ef43a96405c0c47a180cd2619 (patch)
treec9f28d705a4836aba3ec3d4367bb228b27110621
parentffd94f9bf82730ea28b54b51661fef97b8f2b3b6 (diff)
parentd6d4f2a9b38cd7fa7e938142e49e5a514d612e52 (diff)
downloadphp-git-cbe60003f12b2b0ef43a96405c0c47a180cd2619.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r--Zend/zend_multiply.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index e156d33a16..c66e19248f 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -53,8 +53,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)