[vlc-commits] Contribs: update gmp to 6.1.2

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jan  5 17:01:32 2018 +0100| [59e29d61144ce09b32bc4d861e69d2d1c4bc012a] | committer: Jean-Baptiste Kempf

Contribs: update gmp to 6.1.2

(cherry picked from commit 3375d5413a2358efcc928fc6507b21e4892270c6)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=59e29d61144ce09b32bc4d861e69d2d1c4bc012a
---

 contrib/src/gmp/SHA512SUMS  |  2 +-
 contrib/src/gmp/clang.patch | 27 ---------------------------
 contrib/src/gmp/rules.mak   |  4 +---
 contrib/src/gmp/thumb.patch | 22 ----------------------
 4 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/contrib/src/gmp/SHA512SUMS b/contrib/src/gmp/SHA512SUMS
index 3cffd07d8b..d1b0b5d405 100644
--- a/contrib/src/gmp/SHA512SUMS
+++ b/contrib/src/gmp/SHA512SUMS
@@ -1 +1 @@
-06bdd312146f77bd23d1447e60b02bfea2f1e6d00798b073879e8a50a6cf7264bdbf6f31a8347dd3a0889c7a9dee2d24051b74542fc4f9f07ba2d0f744e092ad  gmp-6.0.0.tar.bz2
+268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf  gmp-6.1.2.tar.bz2
diff --git a/contrib/src/gmp/clang.patch b/contrib/src/gmp/clang.patch
deleted file mode 100644
index 4431106cba..0000000000
--- a/contrib/src/gmp/clang.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 9b060f8e9f..1d20c8e0a1 100644
--- a/contrib/src/gmp/rules.mak
+++ b/contrib/src/gmp/rules.mak
@@ -1,6 +1,6 @@
 # GNU Multiple Precision Arithmetic
 
-GMP_VERSION := 6.0.0
+GMP_VERSION := 6.1.2
 GMP_URL := https://gmplib.org/download/gmp-$(GMP_VERSION)/gmp-$(GMP_VERSION).tar.bz2
 
 GMP_CONF :=
@@ -21,8 +21,6 @@ $(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
 	$(APPLY) $(SRC)/gmp/ppc64.patch
 	$(MOVE)
 
diff --git a/contrib/src/gmp/thumb.patch b/contrib/src/gmp/thumb.patch
deleted file mode 100644
index ed633cfba4..0000000000
--- a/contrib/src/gmp/thumb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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)