[vlc-commits] contrib: gmp: fix thumb2 build

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Mar 28 16:30:21 2014 +0100| [1d400f7a8540a3054b874d8632472cdf64d833c9] | committer: Rafaël Carré

contrib: gmp: fix thumb2 build

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d400f7a8540a3054b874d8632472cdf64d833c9
---

 contrib/src/gmp/rules.mak   |    1 +
 contrib/src/gmp/thumb.patch |   22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
index 37e81ff..46517a6 100644
--- a/contrib/src/gmp/rules.mak
+++ b/contrib/src/gmp/rules.mak
@@ -10,6 +10,7 @@ $(TARBALLS)/gmp-$(GMP_VERSION).tar.bz2:
 
 gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
 	$(UNPACK)
+	$(APPLY) $(SRC)/gmp/thumb.patch
 	$(MOVE)
 
 .gmp: gmp
diff --git a/contrib/src/gmp/thumb.patch b/contrib/src/gmp/thumb.patch
new file mode 100644
index 0000000..ed633cf
--- /dev/null
+++ b/contrib/src/gmp/thumb.patch
@@ -0,0 +1,22 @@
+--- gmp/mpn/generic/div_qr_1n_pi1.c.orig	2014-03-28 16:11:23.648263232 +0100
++++ gmp/mpn/generic/div_qr_1n_pi1.c	2014-03-28 16:22:29.376932722 +0100
+@@ -131,10 +131,19 @@
+ #endif
+ 
+ #if defined (__arm__) && W_TYPE_SIZE == 32
++#ifdef __thumb2__
++#define itcc "it cc\n\t"
++#define itcs "it cs\n\t"
++#else
++#define itcc
++#define itcs
++#endif
+ #define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
+   __asm__ (  "adds	%2, %5, %6\n\t"					\
+ 	     "adcs	%1, %3, %4\n\t"					\
++	     itcc							\
+ 	     "movcc	%0, #0\n\t"					\
++	     itcs							\
+ 	     "movcs	%0, #-1"					\
+ 	   : "=r" (m), "=r" (sh), "=&r" (sl)				\
+ 	   : "r" (ah), "rI" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)