0baf3af3d3
Pull upstream hg changeset c56ea318eb64 and 676e2d0f0e4d to fix ARM build breakage when compiling in thumb mode. Fixes: http://autobuild.buildroot.net/results/f44/f447ce933ad8dd975b17aeda03cc46b0cace0b03/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
22 lines
743 B
Diff
22 lines
743 B
Diff
|
|
# HG changeset patch
|
|
# User Torbjorn Granlund <tege@gmplib.org>
|
|
# Date 1396035313 -3600
|
|
# Node ID c56ea318eb6435bdd28dbfef657b2fe372134f1f
|
|
# Parent c6fe20ab62acc266ff5ad3629bef447bc43dcd1b
|
|
Conditionalise ARM asm on !__thumb__.
|
|
|
|
diff -r c6fe20ab62ac -r c56ea318eb64 mpn/generic/mod_1_1.c
|
|
--- a/mpn/generic/mod_1_1.c Wed Mar 26 12:58:33 2014 +0100
|
|
+++ b/mpn/generic/mod_1_1.c Fri Mar 28 20:35:13 2014 +0100
|
|
@@ -129,7 +129,7 @@
|
|
"%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
|
|
#endif
|
|
|
|
-#if defined (__arm__) && W_TYPE_SIZE == 32
|
|
+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
|
|
#define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \
|
|
__asm__ ( "adds %2, %5, %6\n\t" \
|
|
"adcs %1, %3, %4\n\t" \
|
|
|