summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-01-08 11:37:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:08 +0000
commita5f95409fce05e8449cf543d2f9020e0d0bc4abe (patch)
tree4def006001c3a7f4fb06789ee853a08dfac93326 /meta
parent54021c2a4183c21a16f1325f79c0ab7f78162a43 (diff)
downloadpoky-a5f95409fce05e8449cf543d2f9020e0d0bc4abe.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch44
-rw-r--r--meta/recipes-support/gmp/gmp_5.1.0.bb1
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 @@
1Upstream-status: Backport
2
3# HG changeset patch
4# User Torbjorn Granlund <tege@gmplib.org>
5# Date 1357413121 -3600
6# Node ID 187b7b1646ee0ace782768bb36117b62c8408bb6
7# Parent 87a24013e9ee2cabf74e32282c18584a2c669009
8(aarch64): Make add_ssaaaa and sub_ddmmss actually work.
9
10diff -r 87a24013e9ee -r 187b7b1646ee longlong.h
11--- a/longlong.h Fri Jan 04 16:32:01 2013 +0100
12+++ b/longlong.h Sat Jan 05 20:12:01 2013 +0100
13@@ -530,23 +530,16 @@
14 #endif /* __arm__ */
15
16 #if defined (__aarch64__) && W_TYPE_SIZE == 64
17+/* FIXME: Extend the immediate range for the low word by using both
18+ ADDS and SUBS, since they set carry in the same way. */
19 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
20- __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \
21+ __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3" \
22 : "=r" (sh), "=&r" (sl) \
23- : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
24+ : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
25 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
26- do { \
27- if (__builtin_constant_p (bl)) \
28- { \
29- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
30- : "=r" (sh), "=&r" (sl) \
31- : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
32- } \
33- else /* only bh might be a constant */ \
34- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
35- : "=r" (sh), "=&r" (sl) \
36- : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
37- } while (0)
38+ __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3" \
39+ : "=r,r" (sh), "=&r,&r" (sl) \
40+ : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
41 #define umul_ppmm(ph, pl, m0, m1) \
42 do { \
43 UDItype __m0 = (m0), __m1 = (m1); \
44
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 \
5 5
6SRC_URI_append = " file://use-includedir.patch \ 6SRC_URI_append = " file://use-includedir.patch \
7 file://gmp_fix_for_x32.patch \ 7 file://gmp_fix_for_x32.patch \
8 file://187b7b1646ee.patch \
8 " 9 "
9 10
10SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78" 11SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"