]> git.sesse.net Git - vlc/commitdiff
contrib: gmp: fix build on OSX 10.9 with clang
authorVittorio Giovara <vittorio.giovara@gmail.com>
Mon, 30 Jun 2014 19:04:23 +0000 (15:04 -0400)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 2 Jul 2014 18:51:34 +0000 (20:51 +0200)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
contrib/src/gmp/clang.patch [new file with mode: 0644]
contrib/src/gmp/rules.mak

diff --git a/contrib/src/gmp/clang.patch b/contrib/src/gmp/clang.patch
new file mode 100644 (file)
index 0000000..4431106
--- /dev/null
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Torbjorn Granlund <tege@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
index 53a0e25a894bb65b1c57a161e4649827bc8964da..fa1bbe3dc38310e73f84dec2d70b7636792a534b 100644 (file)
@@ -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