contrib: gmp: fix build failure with recent binutils

fanyer · Aug 11, 2013 · 1337178 · 1337178
1 parent 5389383
commit 1337178
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/contrib/src/gmp/arm.diff b/contrib/src/gmp/arm.diff
@@ -0,0 +1,20 @@
+--- gmp/mpn/arm/udiv.asm.orig	2013-08-11 17:38:14.542690389 +0200
++++ gmp/mpn/arm/udiv.asm	2013-08-11 17:38:18.078690240 +0200
+@@ -50,7 +50,7 @@
+ 	teq	r12, #0
+ 	bne	L(oop)
+
+-	str	n1, [ rem_ptr ]		C store remainder
++	str	n1, [rem_ptr]		C store remainder
+ 	adc	r0, n0, n0		C quotient: add last carry from divstep
+ 	mov	pc, lr
+
+@@ -89,7 +89,7 @@
+ 	addcs	n0, n0, #1		C adjust quotient
+
+ L(_even_divisor):
+-	str	n1, [ rem_ptr ]		C store remainder
++	str	n1, [rem_ptr]		C store remainder
+ 	mov	r0, n0			C quotient
+ 	ldmfd	sp!, { r8, pc }
+ EPILOGUE(mpn_udiv_qrnnd)
diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
@@ -14,6 +14,7 @@ $(TARBALLS)/gmp-$(GMP_VERSION).tar.bz2:
 gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
 	$(UNPACK)
 	$(APPLY) $(SRC)/gmp/inline.diff
+	$(APPLY) $(SRC)/gmp/arm.diff
 	$(APPLY) $(SRC)/gmp/ansitest.diff
 	$(APPLY) $(SRC)/gmp/ansi2knr.diff
 	$(MOVE)