diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-01-15 00:45:28 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-01-15 11:51:11 +0100 |
| commit | afa677453987175d073f803dddfadc9b36dceef4 (patch) | |
| tree | 15703070cd0973bf6eb597516a3ec19a0f737c0b | |
| parent | ea9ed43045851fda2f12e21d89800ffa643564a2 (diff) | |
| download | buildroot-novena-afa677453987175d073f803dddfadc9b36dceef4.tar.gz buildroot-novena-afa677453987175d073f803dddfadc9b36dceef4.zip | |
gmp: fix build on AArch64
Include an upstream patch to fix the build problem on AArch64.
Fixes:
http://autobuild.buildroot.org/results/1fb1b3678277e6b0cef220405c54ffb8299c9da1/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch b/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch new file mode 100644 index 000000000..1b835a569 --- /dev/null +++ b/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch @@ -0,0 +1,46 @@ +# 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. + +Taken upstream from http://gmplib.org:8000/gmp/rev/187b7b1646ee. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +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); \ + |