gmp: add patch from upstream to unbreak AArch64

(From OE-Core rev: 561564d7baf2484365a03360ae27bb80ec4ab257)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marcin Juszkiewicz 2013-01-08 11:37:39 +01:00 committed by Richard Purdie
parent 54021c2a41
commit a5f95409fc
2 changed files with 45 additions and 0 deletions

View File

@ -0,0 +1,44 @@
Upstream-status: Backport
# HG changeset patch
# User Torbjorn Granlund <tege@gmplib.org>
# Date 1357413121 -3600
# Node ID 187b7b1646ee0ace782768bb36117b62c8408bb6
# Parent 87a24013e9ee2cabf74e32282c18584a2c669009
(aarch64): Make add_ssaaaa and sub_ddmmss actually work.
diff -r 87a24013e9ee -r 187b7b1646ee longlong.h
--- a/longlong.h Fri Jan 04 16:32:01 2013 +0100
+++ b/longlong.h Sat Jan 05 20:12:01 2013 +0100
@@ -530,23 +530,16 @@
#endif /* __arm__ */
#if defined (__aarch64__) && W_TYPE_SIZE == 64
+/* FIXME: Extend the immediate range for the low word by using both
+ ADDS and SUBS, since they set carry in the same way. */
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \
+ __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3" \
: "=r" (sh), "=&r" (sl) \
- : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
+ : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- do { \
- if (__builtin_constant_p (bl)) \
- { \
- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
- : "=r" (sh), "=&r" (sl) \
- : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
- } \
- else /* only bh might be a constant */ \
- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
- : "=r" (sh), "=&r" (sl) \
- : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
- } while (0)
+ __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3" \
+ : "=r,r" (sh), "=&r,&r" (sl) \
+ : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
#define umul_ppmm(ph, pl, m0, m1) \
do { \
UDItype __m0 = (m0), __m1 = (m1); \

View File

@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
SRC_URI_append = " file://use-includedir.patch \
file://gmp_fix_for_x32.patch \
file://187b7b1646ee.patch \
"
SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"