Update gmp to 6.1.0:

Changes between GMP version 6.0.* and 6.1.0

  BUGS FIXED
  * The public function mpn_com is now correctly declared in gmp.h.

  * Healed possible failures of mpn_sec_sqr for non-cryptographic sizes for
    some obsolete CPUs.

  * The option --disable-assembly now disables all inlined asm.

  * Fixed bug affecting mini-gmp's bitwise functions mpz_setbit, mpz_clrbit,
    and mpz_combit.

  * Various problems related to precision for mpf have been fixed.

  * Fixed ABI incompatible stack alignment in calls from assembly code.

  * Fixed PIC bug in popcount affecting Intel processors using the 32-bit ABI.

  SPEEDUPS
  * Speedup for Intel Broadwell and Skylake though assembly code making use of
    new ADX instructions.

  * Square root is now faster when the remainder is not needed. Also the speed
    to compute the k-th root improved, for small sizes.

  * Improved arm64 support.

  FEATURES
  * New C++ functions gcd and lcm for mpz_class.

  * New public mpn functions mpn_divexact_1, mpn_zero_p, and mpn_cnd_swap.

  * New public mpq_cmp_z function, to efficiently compare rationals with
    integers.

  * Support for Darwin in all x86 code, thereby enabling fat builds on Darwin.

  * Support for more 32-bit arm processors.

  * Support for compilation with clang/llvm on more platforms.  Caution: GMP
    triggers mis-compilation bugs in clang for many platforms, such as arm, x86
    (32-bit and 64-bit), powerpc, mips.

  * Support for AVX-less modern x86 CPUs. (Such support might be missing either
    because the CPU vendor chose to disable AVX, or because the running kernel
    lacks AVX context switch support.)

  * Stack usage trimmed; we believe 512 KiB is now sufficient for any GMP
    call, irrespective of operand size.

  * Support for NetBSD under Xen; we switch off AVX unconditionally under
    NetBSD since a bug in NetBSD makes AVX fail under Xen.

  MISC
  * We now use manufacturers' code names for x86 CPUs, e.g., "haswell" instead
    of names derived from the commercial brands.

  * Small improvements and better coverage for the test suite.

  * The various FreeBSD problems listed for 6.0.0 affect this release too.

  * Tuned values for FFT multiplications are provided for larger number on
    many platforms.

5 files changed, 15 insertions, 40 deletions

diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index c346801e333..f83bd6bf262 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2015/03/30 18:48:08 gdt Exp $
+# $NetBSD: Makefile,v 1.78 2015/11/13 11:36:44 wiz Exp $
 
-DISTNAME=	gmp-6.0.0a
+DISTNAME=	gmp-6.1.0
 CATEGORIES=	devel math
 MASTER_SITES=	https://gmplib.org/download/gmp/ \
 		${MASTER_SITE_GNU:=gmp/}
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index b6da39a9897..b6c02a01677 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.49 2015/11/13 10:42:23 wiz Exp $
+$NetBSD: distinfo,v 1.50 2015/11/13 11:36:44 wiz Exp $
 
-SHA1 (gmp-6.0.0a.tar.bz2) = 360802e3541a3da08ab4b55268c80f799939fddc
-RMD160 (gmp-6.0.0a.tar.bz2) = 2322e21e2042c974dcfaca2da18ae22d43a23ec4
-SHA512 (gmp-6.0.0a.tar.bz2) = 04c8fde7f6e9c2e42753cebf6345d74ef6bdae5ef764df303b6615d17c8d851ac2876ca32c6ba5e111a8d07575c8b725c7b90518a6616be27a7b46d6aeb82c1a
-Size (gmp-6.0.0a.tar.bz2) = 2319400 bytes
+SHA1 (gmp-6.1.0.tar.bz2) = db38c7b67f8eea9f2e5b8a48d219165b2fdab11f
+RMD160 (gmp-6.1.0.tar.bz2) = 3bf2ad8471944f899bffcb86aed0e2072416a464
+SHA512 (gmp-6.1.0.tar.bz2) = 3c82aeab9c1596d4da8afac2eec38e429e84f3211e1a572cf8fd2b546493c44c039b922a1133eaaa48bd7f3e11dbe795a384e21ed95cbe3ecc58d7ac02246117
+Size (gmp-6.1.0.tar.bz2) = 2383840 bytes
 SHA1 (patch-aa) = dec275cbd5886a70f7cf0def1dedf01e7e4a49e9
 SHA1 (patch-ab) = 829812822a72a4926ea4cf6e8ffafdcd13a0f76c
 SHA1 (patch-ac) = 6f7de0a285bec2c2645479d3090dc0276580f3d8
@@ -13,8 +13,8 @@ SHA1 (patch-mpn_arm_cnd__aors__n.asm) = 3d15898f923524122c09f63773bd9a35820a6016
 SHA1 (patch-mpn_arm_com.asm) = fb6dde3cecb4d082a63b8f7cc5e2c2aa877da27c
 SHA1 (patch-mpn_arm_copyd.asm) = 93f4e677b8cf4b85ff2dd21db7fca475930d623f
 SHA1 (patch-mpn_arm_copyi.asm) = 6d385726860fcb88d516dca3faa95edeb82fb79d
-SHA1 (patch-mpn_arm_dive__1.asm) = cb3425948ba7e69eb4bdb9b150a83881a6011aa3
-SHA1 (patch-mpn_arm_invert__limb.asm) = f8eb28f094864b02ebd709745a19b496b63ca437
+SHA1 (patch-mpn_arm_dive__1.asm) = 64796557cb67e83b1a9dc8edd97d46ea32b5371f
+SHA1 (patch-mpn_arm_invert__limb.asm) = 1314230d1883679ec6fed3362065e0604a105b55
 SHA1 (patch-mpn_arm_logops__n.asm) = fbd73182a6f53b452cf385494080579e3ab17d81
 SHA1 (patch-mpn_arm_lshift.asm) = d076210156c4dbcbe3b46803c0aaf966954a3058
 SHA1 (patch-mpn_arm_lshiftc.asm) = 95692c226ff057294d2aa9cf409559b605f444e4
@@ -24,4 +24,3 @@ SHA1 (patch-mpn_arm_rsh1aors__n.asm) = 2c20729fdccd16f8418e0cf4e9b583848dd00b18
 SHA1 (patch-mpn_arm_rshift.asm) = fdc9b43d50a7c621b201098a01c440277c1ae43a
 SHA1 (patch-mpn_arm_sec__tabselect.asm) = 9f317285b87262d98e557bb7c4c9df21d51fa655
 SHA1 (patch-mpn_arm_udiv.asm) = 4f0cc8d7f578c41c11a73c7abb91ab955ec30019
-SHA1 (patch-mpn_x86__64_k8_redc_1.asm) = 896a8fcfe9f7370f5628403b93e10a5f52e38944
diff --git a/devel/gmp/patches/patch-mpn_arm_dive__1.asm b/devel/gmp/patches/patch-mpn_arm_dive__1.asm
index 0d7764a4183..48fd3502839 100644
--- a/devel/gmp/patches/patch-mpn_arm_dive__1.asm
+++ b/devel/gmp/patches/patch-mpn_arm_dive__1.asm
@@ -1,6 +1,6 @@
-$NetBSD: patch-mpn_arm_dive__1.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $
+$NetBSD: patch-mpn_arm_dive__1.asm,v 1.2 2015/11/13 11:36:44 wiz Exp $
 
---- mpn/arm/dive_1.asm.orig	2014-03-25 14:37:55.000000000 +0000
+--- mpn/arm/dive_1.asm.orig	2015-11-01 15:19:49.000000000 +0000
 +++ mpn/arm/dive_1.asm
 @@ -112,7 +112,10 @@ L(end):	sbc	cy, r5, cy
  	mul	r9, r4, cy
@@ -25,4 +25,4 @@ $NetBSD: patch-mpn_arm_dive__1.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $
 +')
  EPILOGUE()
  
- 	.section .rodata
+ 	RODATA
diff --git a/devel/gmp/patches/patch-mpn_arm_invert__limb.asm b/devel/gmp/patches/patch-mpn_arm_invert__limb.asm
index 17c815ca0c8..e9e949c26e5 100644
--- a/devel/gmp/patches/patch-mpn_arm_invert__limb.asm
+++ b/devel/gmp/patches/patch-mpn_arm_invert__limb.asm
@@ -1,6 +1,6 @@
-$NetBSD: patch-mpn_arm_invert__limb.asm,v 1.5 2015/11/13 10:42:23 wiz Exp $
+$NetBSD: patch-mpn_arm_invert__limb.asm,v 1.6 2015/11/13 11:36:44 wiz Exp $
 
---- mpn/arm/invert_limb.asm.orig	2014-03-25 14:37:55.000000000 +0000
+--- mpn/arm/invert_limb.asm.orig	2015-11-01 15:19:49.000000000 +0000
 +++ mpn/arm/invert_limb.asm
 @@ -52,7 +52,10 @@ PROLOGUE(mpn_invert_limb)
  	adds	r1, r12, r0
@@ -13,4 +13,4 @@ $NetBSD: patch-mpn_arm_invert__limb.asm,v 1.5 2015/11/13 10:42:23 wiz Exp $
 +')
  EPILOGUE()
  
- 	.section .rodata
+ 	RODATA
diff --git a/devel/gmp/patches/patch-mpn_x86__64_k8_redc_1.asm b/devel/gmp/patches/patch-mpn_x86__64_k8_redc_1.asm
deleted file mode 100644
index 7efc0bd3832..00000000000
--- a/devel/gmp/patches/patch-mpn_x86__64_k8_redc_1.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-mpn_x86__64_k8_redc_1.asm,v 1.1 2014/04/18 10:49:01 adam Exp $
-
-Workaround for Darwin assembler quirk.
-https://gmplib.org/repo/gmp/raw-rev/1fab0adc5ff7
-
---- mpn/x86_64/k8/redc_1.asm.orig	2014-03-25 14:37:55.000000000 +0000
-+++ mpn/x86_64/k8/redc_1.asm
-@@ -114,7 +114,7 @@ ifdef(`PIC',`
- 
- 	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 @@ L(le1):	add	%r10, (up)
- 
- 
- 	ALIGN(16)
-+L(0):
- L(0m4):
- L(lo0):	mov	(mp,nneg,8), %rax
- 	mov	nneg, i