[vlc-commits] contrib: gmp: fix build on OSX 10.9 with clang

[Vittorio Giovara]

vlc/vlc-2.2 | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jun 30 15:04:23 2014 -0400| [555aa20d8255b556a292bcea63ec244a2463a677] | committer: Felix Paul Kühne

contrib: gmp: fix build on OSX 10.9 with clang

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit 2f30b0bf46dc39f3821bd4c258db022464af5b5e)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=555aa20d8255b556a292bcea63ec244a2463a677
---

 contrib/src/gmp/clang.patch |   27 +++++++++++++++++++++++++++
 contrib/src/gmp/rules.mak   |    1 +
 2 files changed, 28 insertions(+)

diff --git a/contrib/src/gmp/clang.patch b/contrib/src/gmp/clang.patch
new file mode 100644
index 0000000..4431106
--- /dev/null
+++ b/contrib/src/gmp/clang.patch
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Torbjorn Granlund <tege at gmplib.org>
+# Date 1396470504 -7200
+# Node ID 1fab0adc5ff7d9ecddcbda96f407da58347bb49c
+# Parent  db645603dcdb41afcf78b19b551ecd5a01c3841c
+Workaround for Darwin assembler quirk.
+
+diff -r db645603dcdb -r 1fab0adc5ff7 mpn/x86_64/k8/redc_1.asm
+--- a/mpn/x86_64/k8/redc_1.asm	Mon Mar 31 23:04:32 2014 +0200
++++ b/mpn/x86_64/k8/redc_1.asm	Wed Apr 02 22:28:24 2014 +0200
+@@ -114,7 +114,7 @@
+ 
+ 	JUMPTABSECT
+ 	ALIGN(8)
+-L(tab):	JMPENT(	L(0m4), L(tab))
++L(tab):	JMPENT(	L(0), L(tab))
+ 	JMPENT(	L(1), L(tab))
+ 	JMPENT(	L(2), L(tab))
+ 	JMPENT(	L(3), L(tab))
+@@ -397,6 +397,7 @@
+ 
+ 
+ 	ALIGN(16)
++L(0):
+ L(0m4):
+ L(lo0):	mov	(mp,nneg,8), %rax
+ 	mov	nneg, i
diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
index 53a0e25..fa1bbe3 100644
--- a/contrib/src/gmp/rules.mak
+++ b/contrib/src/gmp/rules.mak
@@ -11,6 +11,7 @@ $(TARBALLS)/gmp-$(GMP_VERSION).tar.bz2:
 gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
 	$(UNPACK)
 	$(APPLY) $(SRC)/gmp/thumb.patch
+	$(APPLY) $(SRC)/gmp/clang.patch
 	$(MOVE)
 
 .gmp: gmp