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
761 B
Diff
22 lines
761 B
Diff
|
|
# HG changeset patch
|
|
# User Torbjorn Granlund <tege@gmplib.org>
|
|
# Date 1396602422 -7200
|
|
# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
|
|
# Parent 0194a75b56b21a9196626430af86c5bd9110c42d
|
|
Conditionalise ARM asm on !__thumb__.
|
|
|
|
diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
|
|
--- a/mpn/generic/div_qr_1n_pi1.c Thu Apr 03 23:58:51 2014 +0200
|
|
+++ b/mpn/generic/div_qr_1n_pi1.c Fri Apr 04 11:07:02 2014 +0200
|
|
@@ -130,7 +130,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" \
|
|
|