diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-01-08 11:37:39 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-01-09 16:40:35 -0800 |
| commit | 561564d7baf2484365a03360ae27bb80ec4ab257 (patch) | |
| tree | aa6e8d19eac1cadfb73753f97ee8e6efda49bb14 /meta/recipes-support | |
| parent | f5f9cfcccd1526572673ffbc5435bf3221498409 (diff) | |
| download | openembedded-core-561564d7baf2484365a03360ae27bb80ec4ab257.tar.gz openembedded-core-561564d7baf2484365a03360ae27bb80ec4ab257.tar.bz2 openembedded-core-561564d7baf2484365a03360ae27bb80ec4ab257.zip | |
gmp: add patch from upstream to unbreak AArch64
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch | 44 | ||||
| -rw-r--r-- | meta/recipes-support/gmp/gmp_5.1.0.bb | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch b/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch new file mode 100644 index 0000000000..486f8c58f6 --- /dev/null +++ b/meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch @@ -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); \ + diff --git a/meta/recipes-support/gmp/gmp_5.1.0.bb b/meta/recipes-support/gmp/gmp_5.1.0.bb index 9cb80fee46..eb5ef33ddf 100644 --- a/meta/recipes-support/gmp/gmp_5.1.0.bb +++ b/meta/recipes-support/gmp/gmp_5.1.0.bb @@ -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" |