Update to 3.1.1.

Split patch-aa into a patch per file while I'm here.

4 files changed, 72 insertions, 66 deletions

diff --git a/devel/gmp/patches/patch-aa b/devel/gmp/patches/patch-aa
index 81ccba2e3a4..643ceb21543 100644
--- a/devel/gmp/patches/patch-aa
+++ b/devel/gmp/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2000/11/17 07:21:55 mycroft Exp $
+$NetBSD: patch-aa,v 1.5 2000/12/31 14:05:30 skrll Exp $
 
---- mpn/arm/add_n.S.orig	Mon Apr 17 06:01:59 2000
-+++ mpn/arm/add_n.S	Thu Nov 16 14:01:51 2000
+--- mpn/arm/add_n.S.orig	Mon Jul 24 18:04:21 2000
++++ mpn/arm/add_n.S
 @@ -35,9 +35,9 @@
  
  .text
@@ -21,66 +21,3 @@ $NetBSD: patch-aa,v 1.4 2000/11/17 07:21:55 mycroft Exp $
  end:
 -	.size	__gmpn_add_n, end - __gmpn_add_n
 +	.size	___gmpn_add_n, end - ___gmpn_add_n
---- mpn/arm/addmul_1.S.orig	Mon Apr 17 06:01:59 2000
-+++ mpn/arm/addmul_1.S	Thu Nov 16 14:01:57 2000
-@@ -35,9 +35,9 @@
- 
- .text
- 	.align	0
--	.global	__gmpn_addmul_1
--	.type	__gmpn_addmul_1,%function
--__gmpn_addmul_1:
-+	.global	___gmpn_addmul_1
-+	.type	___gmpn_addmul_1,%function
-+___gmpn_addmul_1:
- 	stmfd	sp!, { r8-r11, lr }
- 	mov	z, #0
- 	mov	ip, #0
-@@ -86,4 +86,4 @@
- 	mov	r0, ip
- 	ldmfd	sp!, { r8-r11, pc }
- end:
--	.size	__gmpn_addmul_1, end - __gmpn_addmul_1
-+	.size	___gmpn_addmul_1, end - ___gmpn_addmul_1
---- mpn/arm/mul_1.S.orig	Mon Apr 17 06:01:59 2000
-+++ mpn/arm/mul_1.S	Thu Nov 16 14:02:03 2000
-@@ -35,9 +35,9 @@
- 
- .text
- 	.align	0
--	.global	__gmpn_mul_1
--	.type	__gmpn_mul_1,%function
--__gmpn_mul_1:
-+	.global	___gmpn_mul_1
-+	.type	___gmpn_mul_1,%function
-+___gmpn_mul_1:
- 	stmfd	sp!, { r8, r9, lr }
- 	ands	ip, n, #1
- 	beq	skip1
-@@ -78,4 +78,4 @@
- 	mov	r0, ip
- 	ldmfd	sp!, { r8, r9, pc }
- end:
--	.size	__gmpn_mul_1, end - __gmpn_mul_1
-+	.size	___gmpn_mul_1, end - ___gmpn_mul_1
---- mpn/arm/sub_n.S.orig	Mon Apr 17 06:01:59 2000
-+++ mpn/arm/sub_n.S	Thu Nov 16 14:02:08 2000
-@@ -35,9 +35,9 @@
- 
- .text
- 	.align	0
--	.global	__gmpn_sub_n
--	.type	__gmpn_sub_n,%function
--__gmpn_sub_n:
-+	.global	___gmpn_sub_n
-+	.type	___gmpn_sub_n,%function
-+___gmpn_sub_n:
- 	stmfd	sp!, { r8, r9, lr }
- 	subs	ip, ip, ip
- 	tst	n, #1
-@@ -76,4 +76,4 @@
- 	and	r0, r0, #1
- 	ldmfd	sp!, { r8, r9, pc }
- end:
--	.size	__gmpn_sub_n, end - __gmpn_sub_n
-+	.size	___gmpn_sub_n, end - ___gmpn_sub_n
diff --git a/devel/gmp/patches/patch-ab b/devel/gmp/patches/patch-ab
new file mode 100644
index 00000000000..be330fcedf8
--- /dev/null
+++ b/devel/gmp/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.3 2000/12/31 14:05:30 skrll Exp $
+
+--- mpn/arm/addmul_1.S.orig	Mon Jul 24 18:04:21 2000
++++ mpn/arm/addmul_1.S
+@@ -35,9 +35,9 @@
+ 
+ .text
+ 	.align	0
+-	.global	__gmpn_addmul_1
+-	.type	__gmpn_addmul_1,%function
+-__gmpn_addmul_1:
++	.global	___gmpn_addmul_1
++	.type	___gmpn_addmul_1,%function
++___gmpn_addmul_1:
+ 	stmfd	sp!, { r8-r11, lr }
+ 	mov	z, #0
+ 	mov	ip, #0
+@@ -86,4 +86,4 @@
+ 	mov	r0, ip
+ 	ldmfd	sp!, { r8-r11, pc }
+ end:
+-	.size	__gmpn_addmul_1, end - __gmpn_addmul_1
++	.size	___gmpn_addmul_1, end - ___gmpn_addmul_1
diff --git a/devel/gmp/patches/patch-ac b/devel/gmp/patches/patch-ac
new file mode 100644
index 00000000000..a0bf8c2d17a
--- /dev/null
+++ b/devel/gmp/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2000/12/31 14:05:30 skrll Exp $
+
+--- mpn/arm/mul_1.S.orig	Mon Jul 24 18:04:21 2000
++++ mpn/arm/mul_1.S
+@@ -35,9 +35,9 @@
+ 
+ .text
+ 	.align	0
+-	.global	__gmpn_mul_1
+-	.type	__gmpn_mul_1,%function
+-__gmpn_mul_1:
++	.global	___gmpn_mul_1
++	.type	___gmpn_mul_1,%function
++___gmpn_mul_1:
+ 	stmfd	sp!, { r8, r9, lr }
+ 	ands	ip, n, #1
+ 	beq	skip1
+@@ -78,4 +78,4 @@
+ 	mov	r0, ip
+ 	ldmfd	sp!, { r8, r9, pc }
+ end:
+-	.size	__gmpn_mul_1, end - __gmpn_mul_1
++	.size	___gmpn_mul_1, end - ___gmpn_mul_1
diff --git a/devel/gmp/patches/patch-ad b/devel/gmp/patches/patch-ad
new file mode 100644
index 00000000000..17ed0a92582
--- /dev/null
+++ b/devel/gmp/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2000/12/31 14:05:30 skrll Exp $
+
+--- mpn/arm/sub_n.S.orig	Mon Jul 24 18:04:21 2000
++++ mpn/arm/sub_n.S
+@@ -35,9 +35,9 @@
+ 
+ .text
+ 	.align	0
+-	.global	__gmpn_sub_n
+-	.type	__gmpn_sub_n,%function
+-__gmpn_sub_n:
++	.global	___gmpn_sub_n
++	.type	___gmpn_sub_n,%function
++___gmpn_sub_n:
+ 	stmfd	sp!, { r8, r9, lr }
+ 	subs	ip, ip, ip
+ 	tst	n, #1
+@@ -76,4 +76,4 @@
+ 	and	r0, r0, #1
+ 	ldmfd	sp!, { r8, r9, pc }
+ end:
+-	.size	__gmpn_sub_n, end - __gmpn_sub_n
++	.size	___gmpn_sub_n, end - ___gmpn_sub_n