In the VAX asm code: hide all local labels and make calculated jumps PIC,

so the shared library now works as well. Thanks to Matt Thomas for vax
asm help.

8 files changed, 200 insertions, 175 deletions

diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index b787d79c40d..28d872f024a 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2010/05/18 18:33:48 martin Exp $
+$NetBSD: distinfo,v 1.34 2010/05/28 13:50:25 martin Exp $
 
 SHA1 (gmp-5.0.1.tar.bz2) = 6340edc7ceb95f9015a758c7c0d196eb0f441d49
 RMD160 (gmp-5.0.1.tar.bz2) = 3e89ebf5294639e1c926b92d9786bbdd0c8fa587
@@ -6,10 +6,10 @@ Size (gmp-5.0.1.tar.bz2) = 2006109 bytes
 SHA1 (patch-aa) = a53db34c8ecf38d6556a59a0fa7382456c30fab6
 SHA1 (patch-ab) = e768eca25c117871041d12a618e38d9d252f25e5
 SHA1 (patch-ac) = 9c7e6817632596bfd6c86a30e3b2d7f78fccd5ff
-SHA1 (patch-ad) = b41e8211f07b4359922e43d4af44d76b81175c8f
-SHA1 (patch-ae) = 6125e843634e7bc4fec8b6be2e667c50e2735c72
-SHA1 (patch-af) = e18dac84d9b7a0c00463350b038a76337b8c158a
-SHA1 (patch-ag) = 8b4fa742b0221b45fee7acdc8346cf23b1529ca2
-SHA1 (patch-ah) = 81f99a11e6da851433281a60d00a63c8bd9a1bfe
-SHA1 (patch-ai) = 0461c898639780767a28cfc8a4c220a9ed9f53ea
-SHA1 (patch-aj) = 642d674ecb851c23f9e6b07d0a23f2586f7c4995
+SHA1 (patch-ad) = 96ea97d0ac6b2a8df4e7d6e33bbe6ec54bf17d4f
+SHA1 (patch-ae) = affe0829a9e23470f26212a9ac6d60485b08ea88
+SHA1 (patch-af) = 8d30438c3bd5bc01d7752e09da265b93098ae5ef
+SHA1 (patch-ag) = 66f5cd58ca75a19e3136bb2dedced9b406df82ce
+SHA1 (patch-ah) = 6144e12426073013ec2a4582f1b795c7de7a6c35
+SHA1 (patch-ai) = 2a692aac1a3fe191156d5ce66c13eb33e3c4fc8c
+SHA1 (patch-aj) = 49e8945703e67f7a158ed7fd496188d85c659fb3
diff --git a/devel/gmp/patches/patch-ad b/devel/gmp/patches/patch-ad
index c9ae187ec82..eb6a47bc48e 100644
--- a/devel/gmp/patches/patch-ad
+++ b/devel/gmp/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2010/05/18 18:33:48 martin Exp $
+$NetBSD: patch-ad,v 1.9 2010/05/28 13:50:25 martin Exp $
 
 --- mpn/vax/add_n.s.orig	2010-02-06 13:43:14.000000000 +0100
-+++ mpn/vax/add_n.s	2010-05-18 10:16:29.000000000 +0200
++++ mpn/vax/add_n.s	2010-05-28 10:26:03.000000000 +0200
 @@ -27,33 +27,33 @@
  
  .text
@@ -30,7 +30,7 @@ $NetBSD: patch-ad,v 1.8 2010/05/18 18:33:48 martin Exp $
 +	ashl	$-2,%r0,%r0	# unroll loop count
 +	bicl2	$-4,%r5		# mask out low 2 bits
 +	movaq	(%r5)[%r5],%r5	# 9x
-+	jmp	Loop(%r5)
++	jmp	.Loop[%r5]
  
 -Loop:	movl	(r2)+,r4
 -	adwc	(r1)+,r4
@@ -45,7 +45,7 @@ $NetBSD: patch-ad,v 1.8 2010/05/18 18:33:48 martin Exp $
 -	adwc	(r1)+,r4
 -	movl	r4,(r3)+
 -	sobgtr	r0,Loop
-+Loop:	movl	(%r2)+,%r4
++.Loop:	movl	(%r2)+,%r4
 +	adwc	(%r1)+,%r4
 +	movl	%r4,(%r3)+
 +	movl	(%r2)+,%r4
@@ -57,7 +57,7 @@ $NetBSD: patch-ad,v 1.8 2010/05/18 18:33:48 martin Exp $
 +	movl	(%r2)+,%r4
 +	adwc	(%r1)+,%r4
 +	movl	%r4,(%r3)+
-+	sobgtr	%r0,Loop
++	sobgtr	%r0,.Loop
  
 -	adwc	r0,r0
 +	adwc	%r0,%r0
diff --git a/devel/gmp/patches/patch-ae b/devel/gmp/patches/patch-ae
index d1006c8a06c..f64ab367ea0 100644
--- a/devel/gmp/patches/patch-ae
+++ b/devel/gmp/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
+$NetBSD: patch-ae,v 1.3 2010/05/28 13:50:26 martin Exp $
 
 --- mpn/vax/addmul_1.s.orig	2010-02-06 13:43:14.000000000 +0100
-+++ mpn/vax/addmul_1.s	2010-05-18 10:16:29.000000000 +0200
++++ mpn/vax/addmul_1.s	2010-05-25 10:04:02.000000000 +0200
 @@ -27,98 +27,98 @@
  
  .text
@@ -15,46 +15,50 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	movl	8(ap),r8
 -	movl	4(ap),r9
 -	movl	16(ap),r6
-+	movl	12(%ap),%r4
-+	movl	8(%ap),%r8
-+	movl	4(%ap),%r9
-+	movl	16(%ap),%r6
- 	jlss	s2_big
- 
+-	jlss	s2_big
+-
 -	clrl	r3
 -	incl	r4
 -	ashl	$-1,r4,r7
 -	jlbc	r4,L1
 -	clrl	r11
++	movl	12(%ap),%r4
++	movl	8(%ap),%r8
++	movl	4(%ap),%r9
++	movl	16(%ap),%r6
++	jlss	.Ls2_big
++
 +	clrl	%r3
 +	incl	%r4
 +	ashl	$-1,%r4,%r7
-+	jlbc	%r4,L1
++	jlbc	%r4,.L1
 +	clrl	%r11
  
  # Loop for S2_LIMB < 0x80000000
 -Loop1:	movl	(r8)+,r1
-+Loop1:	movl	(%r8)+,%r1
- 	jlss	L1n0
+-	jlss	L1n0
 -	emul	r1,r6,$0,r2
 -	addl2	r11,r2
 -	adwc	$0,r3
 -	addl2	r2,(r9)+
 -	adwc	$0,r3
 -L1:	movl	(r8)+,r1
-+	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	$0,%r3
-+	addl2	%r2,(%r9)+
-+	adwc	$0,%r3
-+L1:	movl	(%r8)+,%r1
- 	jlss	L1n1
+-	jlss	L1n1
 -L1p1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	$0,r11
 -	addl2	r10,(r9)+
 -	adwc	$0,r11
-+L1p1:	emul	%r1,%r6,$0,%r10
++.Loop1:	movl	(%r8)+,%r1
++	jlss	.L1n0
++	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	$0,%r3
++	addl2	%r2,(%r9)+
++	adwc	$0,%r3
++.L1:	movl	(%r8)+,%r1
++	jlss	.L1n1
++.L1p1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	$0,%r11
 +	addl2	%r10,(%r9)+
@@ -62,7 +66,7 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop1
 -	movl	r11,r0
-+	sobgtr	%r7,Loop1
++	sobgtr	%r7,.Loop1
 +	movl	%r11,%r0
  	ret
  
@@ -72,19 +76,20 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	addl2	r2,(r9)+
 -	adwc	$0,r3
 -	movl	(r8)+,r1
-+L1n0:	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r6,%r3
-+	addl2	%r2,(%r9)+
-+	adwc	$0,%r3
-+	movl	(%r8)+,%r1
- 	jgeq	L1p1
+-	jgeq	L1p1
 -L1n1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r6,r11
 -	addl2	r10,(r9)+
 -	adwc	$0,r11
-+L1n1:	emul	%r1,%r6,$0,%r10
++.L1n0:	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r6,%r3
++	addl2	%r2,(%r9)+
++	adwc	$0,%r3
++	movl	(%r8)+,%r1
++	jgeq	.L1p1
++.L1n1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r6,%r11
 +	addl2	%r10,(%r9)+
@@ -92,7 +97,7 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop1
 -	movl	r11,r0
-+	sobgtr	%r7,Loop1
++	sobgtr	%r7,.Loop1
 +	movl	%r11,%r0
  	ret
  
@@ -102,35 +107,37 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	ashl	$-1,r4,r7
 -	jlbc	r4,L2
 -	clrl	r11
-+s2_big:	clrl	%r3
++.Ls2_big: clrl	%r3
 +	incl	%r4
 +	ashl	$-1,%r4,%r7
-+	jlbc	%r4,L2
++	jlbc	%r4,.L2
 +	clrl	%r11
  
  # Loop for S2_LIMB >= 0x80000000
 -Loop2:	movl	(r8)+,r1
-+Loop2:	movl	(%r8)+,%r1
- 	jlss	L2n0
+-	jlss	L2n0
 -	emul	r1,r6,$0,r2
 -	addl2	r11,r2
 -	adwc	r1,r3
 -	addl2	r2,(r9)+
 -	adwc	$0,r3
 -L2:	movl	(r8)+,r1
-+	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r1,%r3
-+	addl2	%r2,(%r9)+
-+	adwc	$0,%r3
-+L2:	movl	(%r8)+,%r1
- 	jlss	L2n1
+-	jlss	L2n1
 -L2p1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r1,r11
 -	addl2	r10,(r9)+
 -	adwc	$0,r11
-+L2p1:	emul	%r1,%r6,$0,%r10
++.Loop2:	movl	(%r8)+,%r1
++	jlss	.L2n0
++	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r1,%r3
++	addl2	%r2,(%r9)+
++	adwc	$0,%r3
++.L2:	movl	(%r8)+,%r1
++	jlss	.L2n1
++.L2p1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r1,%r11
 +	addl2	%r10,(%r9)+
@@ -138,7 +145,7 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop2
 -	movl	r11,r0
-+	sobgtr	%r7,Loop2
++	sobgtr	%r7,.Loop2
 +	movl	%r11,%r0
  	ret
  
@@ -148,19 +155,20 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	addl2	r2,(r9)+
 -	adwc	r1,r3
 -	movl	(r8)+,r1
-+L2n0:	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r6,%r3
-+	addl2	%r2,(%r9)+
-+	adwc	%r1,%r3
-+	movl	(%r8)+,%r1
- 	jgeq	L2p1
+-	jgeq	L2p1
 -L2n1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r6,r11
 -	addl2	r10,(r9)+
 -	adwc	r1,r11
-+L2n1:	emul	%r1,%r6,$0,%r10
++.L2n0:	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r6,%r3
++	addl2	%r2,(%r9)+
++	adwc	%r1,%r3
++	movl	(%r8)+,%r1
++	jgeq	.L2p1
++.L2n1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r6,%r11
 +	addl2	%r10,(%r9)+
@@ -168,6 +176,6 @@ $NetBSD: patch-ae,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop2
 -	movl	r11,r0
-+	sobgtr	%r7,Loop2
++	sobgtr	%r7,.Loop2
 +	movl	%r11,%r0
  	ret
diff --git a/devel/gmp/patches/patch-af b/devel/gmp/patches/patch-af
index 23c8a91e290..be7661df02b 100644
--- a/devel/gmp/patches/patch-af
+++ b/devel/gmp/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2010/05/18 18:33:48 martin Exp $
+$NetBSD: patch-af,v 1.3 2010/05/28 13:50:26 martin Exp $
 
 --- mpn/vax/lshift.s.orig	2010-02-06 13:43:14.000000000 +0100
-+++ mpn/vax/lshift.s	2010-05-18 10:16:29.000000000 +0200
++++ mpn/vax/lshift.s	2010-05-25 10:04:33.000000000 +0200
 @@ -28,29 +28,29 @@
  
  .text
@@ -28,6 +28,7 @@ $NetBSD: patch-af,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	movl	r5,r0
 -	movl	r2,r3
 -	decl	r1
+-	jeql	Lend
 +	moval	(%r6)[%r1],%r6
 +	moval	(%r7)[%r1],%r7
 +	clrl	%r3
@@ -36,19 +37,19 @@ $NetBSD: patch-af,v 1.2 2010/05/18 18:33:48 martin Exp $
 +	movl	%r5,%r0
 +	movl	%r2,%r3
 +	decl	%r1
- 	jeql	Lend
++	jeql	.Lend
  
 -Loop:	movl	-(r6),r2
 -	ashq	r8,r2,r4
 -	movl	r5,-(r7)
 -	movl	r2,r3
 -	sobgtr	r1,Loop
-+Loop:	movl	-(%r6),%r2
++.Loop:	movl	-(%r6),%r2
 +	ashq	%r8,%r2,%r4
 +	movl	%r5,-(%r7)
 +	movl	%r2,%r3
-+	sobgtr	%r1,Loop
++	sobgtr	%r1,.Loop
  
 -Lend:	movl	r4,-4(r7)
-+Lend:	movl	%r4,-4(%r7)
++.Lend:	movl	%r4,-4(%r7)
  	ret
diff --git a/devel/gmp/patches/patch-ag b/devel/gmp/patches/patch-ag
index 509ea69480c..7337247fc97 100644
--- a/devel/gmp/patches/patch-ag
+++ b/devel/gmp/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.2 2010/05/18 18:33:48 martin Exp $
+$NetBSD: patch-ag,v 1.3 2010/05/28 13:50:26 martin Exp $
 
 --- mpn/vax/mul_1.s.orig	2010-02-06 13:43:14.000000000 +0100
-+++ mpn/vax/mul_1.s	2010-05-18 10:16:29.000000000 +0200
++++ mpn/vax/mul_1.s	2010-05-25 00:27:32.000000000 +0200
 @@ -27,95 +27,95 @@
  
  .text
@@ -15,11 +15,12 @@ $NetBSD: patch-ag,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	movl	8(ap),r8
 -	movl	4(ap),r9
 -	movl	16(ap),r6
+-	jlss	s2_big
 +	movl	12(%ap),%r4
 +	movl	8(%ap),%r8
 +	movl	4(%ap),%r9
 +	movl	16(%ap),%r6
- 	jlss	s2_big
++	jlss	.Ls2_big
  
  # One might want to combine the addl2 and the store below, but that
  # is actually just slower according to my timing tests.  (VAX 3600)
@@ -32,36 +33,38 @@ $NetBSD: patch-ag,v 1.2 2010/05/18 18:33:48 martin Exp $
 +	clrl	%r3
 +	incl	%r4
 +	ashl	$-1,%r4,%r7
-+	jlbc	%r4,L1
++	jlbc	%r4,.L1
 +	clrl	%r11
  
  # Loop for S2_LIMB < 0x80000000
 -Loop1:	movl	(r8)+,r1
-+Loop1:	movl	(%r8)+,%r1
- 	jlss	L1n0
+-	jlss	L1n0
 -	emul	r1,r6,$0,r2
 -	addl2	r11,r2
 -	adwc	$0,r3
 -	movl	r2,(r9)+
 -L1:	movl	(r8)+,r1
-+	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	$0,%r3
-+	movl	%r2,(%r9)+
-+L1:	movl	(%r8)+,%r1
- 	jlss	L1n1
+-	jlss	L1n1
 -L1p1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	$0,r11
 -	movl	r10,(r9)+
-+L1p1:	emul	%r1,%r6,$0,%r10
++.Loop1:	movl	(%r8)+,%r1
++	jlss	.L1n0
++	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	$0,%r3
++	movl	%r2,(%r9)+
++.L1:	movl	(%r8)+,%r1
++	jlss	.L1n1
++.L1p1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	$0,%r11
 +	movl	%r10,(%r9)+
  
 -	sobgtr	r7,Loop1
 -	movl	r11,r0
-+	sobgtr	%r7,Loop1
++	sobgtr	%r7,.Loop1
 +	movl	%r11,%r0
  	ret
  
@@ -70,24 +73,25 @@ $NetBSD: patch-ag,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	adwc	r6,r3
 -	movl	r2,(r9)+
 -	movl	(r8)+,r1
-+L1n0:	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r6,%r3
-+	movl	%r2,(%r9)+
-+	movl	(%r8)+,%r1
- 	jgeq	L1p1
+-	jgeq	L1p1
 -L1n1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r6,r11
 -	movl	r10,(r9)+
-+L1n1:	emul	%r1,%r6,$0,%r10
++.L1n0:	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r6,%r3
++	movl	%r2,(%r9)+
++	movl	(%r8)+,%r1
++	jgeq	.L1p1
++.L1n1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r6,%r11
 +	movl	%r10,(%r9)+
  
 -	sobgtr	r7,Loop1
 -	movl	r11,r0
-+	sobgtr	%r7,Loop1
++	sobgtr	%r7,.Loop1
 +	movl	%r11,%r0
  	ret
  
@@ -97,39 +101,41 @@ $NetBSD: patch-ag,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	ashl	$-1,r4,r7
 -	jlbc	r4,L2
 -	clrl	r11
-+s2_big:	clrl	%r3
++.Ls2_big: clrl	%r3
 +	incl	%r4
 +	ashl	$-1,%r4,%r7
-+	jlbc	%r4,L2
++	jlbc	%r4,.L2
 +	clrl	%r11
  
  # Loop for S2_LIMB >= 0x80000000
 -Loop2:	movl	(r8)+,r1
-+Loop2:	movl	(%r8)+,%r1
- 	jlss	L2n0
+-	jlss	L2n0
 -	emul	r1,r6,$0,r2
 -	addl2	r11,r2
 -	adwc	r1,r3
 -	movl	r2,(r9)+
 -L2:	movl	(r8)+,r1
-+	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r1,%r3
-+	movl	%r2,(%r9)+
-+L2:	movl	(%r8)+,%r1
- 	jlss	L2n1
+-	jlss	L2n1
 -L2p1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r1,r11
 -	movl	r10,(r9)+
-+L2p1:	emul	%r1,%r6,$0,%r10
++.Loop2:	movl	(%r8)+,%r1
++	jlss	.L2n0
++	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r1,%r3
++	movl	%r2,(%r9)+
++.L2:	movl	(%r8)+,%r1
++	jlss	.L2n1
++.L2p1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r1,%r11
 +	movl	%r10,(%r9)+
  
 -	sobgtr	r7,Loop2
 -	movl	r11,r0
-+	sobgtr	%r7,Loop2
++	sobgtr	%r7,.Loop2
 +	movl	%r11,%r0
  	ret
  
@@ -139,19 +145,20 @@ $NetBSD: patch-ag,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	adwc	r6,r3
 -	movl	r2,(r9)+
 -	movl	(r8)+,r1
-+L2n0:	emul	%r1,%r6,$0,%r2
-+	addl2	%r1,%r3
-+	addl2	%r11,%r2
-+	adwc	%r6,%r3
-+	movl	%r2,(%r9)+
-+	movl	(%r8)+,%r1
- 	jgeq	L2p1
+-	jgeq	L2p1
 -L2n1:	emul	r1,r6,$0,r10
 -	addl2	r1,r11
 -	addl2	r3,r10
 -	adwc	r6,r11
 -	movl	r10,(r9)+
-+L2n1:	emul	%r1,%r6,$0,%r10
++.L2n0:	emul	%r1,%r6,$0,%r2
++	addl2	%r1,%r3
++	addl2	%r11,%r2
++	adwc	%r6,%r3
++	movl	%r2,(%r9)+
++	movl	(%r8)+,%r1
++	jgeq	.L2p1
++.L2n1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r1,%r11
 +	addl2	%r3,%r10
 +	adwc	%r6,%r11
@@ -159,6 +166,6 @@ $NetBSD: patch-ag,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop2
 -	movl	r11,r0
-+	sobgtr	%r7,Loop2
++	sobgtr	%r7,.Loop2
 +	movl	%r11,%r0
  	ret
diff --git a/devel/gmp/patches/patch-ah b/devel/gmp/patches/patch-ah
index 494e1e9a64a..b1b0421478a 100644
--- a/devel/gmp/patches/patch-ah
+++ b/devel/gmp/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2010/05/18 18:33:48 martin Exp $
+$NetBSD: patch-ah,v 1.3 2010/05/28 13:50:26 martin Exp $
 
 --- mpn/vax/rshift.s.orig	2010-02-06 13:43:14.000000000 +0100
-+++ mpn/vax/rshift.s	2010-05-18 10:16:29.000000000 +0200
++++ mpn/vax/rshift.s	2010-05-25 10:05:24.000000000 +0200
 @@ -28,27 +28,27 @@
  
  .text
@@ -24,27 +24,28 @@ $NetBSD: patch-ah,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	subl3	r8,$32,r8
 -	ashl	r8,r2,r0
 -	decl	r1
+-	jeql	Lend
 +	movl	(%r6)+,%r2
 +	subl3	%r8,$32,%r8
 +	ashl	%r8,%r2,%r0
 +	decl	%r1
- 	jeql	Lend
++	jeql	.Lend
  
 -Loop:	movl	(r6)+,r3
 -	ashq	r8,r2,r4
 -	movl	r5,(r7)+
 -	movl	r3,r2
 -	sobgtr	r1,Loop
-+Loop:	movl	(%r6)+,%r3
++.Loop:	movl	(%r6)+,%r3
 +	ashq	%r8,%r2,%r4
 +	movl	%r5,(%r7)+
 +	movl	%r3,%r2
-+	sobgtr	%r1,Loop
++	sobgtr	%r1,.Loop
  
 -Lend:	clrl	r3
 -	ashq	r8,r2,r4
 -	movl	r5,(r7)
-+Lend:	clrl	%r3
++.Lend:	clrl	%r3
 +	ashq	%r8,%r2,%r4
 +	movl	%r5,(%r7)
  	ret
diff --git a/devel/gmp/patches/patch-ai b/devel/gmp/patches/patch-ai
index ea14fc5d5aa..29a44048c15 100644
--- a/devel/gmp/patches/patch-ai
+++ b/devel/gmp/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2010/05/18 18:33:48 martin Exp $
+$NetBSD: patch-ai,v 1.3 2010/05/28 13:50:26 martin Exp $
 
 --- mpn/vax/sub_n.s.orig	2010-02-06 13:43:14.000000000 +0100
-+++ mpn/vax/sub_n.s	2010-05-18 10:16:29.000000000 +0200
++++ mpn/vax/sub_n.s	2010-05-28 10:26:30.000000000 +0200
 @@ -27,33 +27,33 @@
  
  .text
@@ -30,7 +30,7 @@ $NetBSD: patch-ai,v 1.2 2010/05/18 18:33:48 martin Exp $
 +	ashl	$-2,%r0,%r0	# unroll loop count
 +	bicl2	$-4,%r5		# mask out low 2 bits
 +	movaq	(%r5)[%r5],%r5	# 9x
-+	jmp	Loop(%r5)
++	jmp	.Loop[%r5]
  
 -Loop:	movl	(r2)+,r4
 -	sbwc	(r1)+,r4
@@ -45,7 +45,7 @@ $NetBSD: patch-ai,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	sbwc	(r1)+,r4
 -	movl	r4,(r3)+
 -	sobgtr	r0,Loop
-+Loop:	movl	(%r2)+,%r4
++.Loop:	movl	(%r2)+,%r4
 +	sbwc	(%r1)+,%r4
 +	movl	%r4,(%r3)+
 +	movl	(%r2)+,%r4
@@ -57,7 +57,7 @@ $NetBSD: patch-ai,v 1.2 2010/05/18 18:33:48 martin Exp $
 +	movl	(%r2)+,%r4
 +	sbwc	(%r1)+,%r4
 +	movl	%r4,(%r3)+
-+	sobgtr	%r0,Loop
++	sobgtr	%r0,.Loop
  
 -	adwc	r0,r0
 +	adwc	%r0,%r0
diff --git a/devel/gmp/patches/patch-aj b/devel/gmp/patches/patch-aj
index 6d04730b565..fb8dd3ea4ed 100644
--- a/devel/gmp/patches/patch-aj
+++ b/devel/gmp/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
+$NetBSD: patch-aj,v 1.3 2010/05/28 13:50:26 martin Exp $
 
 --- mpn/vax/submul_1.s.orig	2010-02-06 13:43:14.000000000 +0100
-+++ mpn/vax/submul_1.s	2010-05-18 10:16:29.000000000 +0200
++++ mpn/vax/submul_1.s	2010-05-25 10:07:06.000000000 +0200
 @@ -27,98 +27,98 @@
  
  .text
@@ -15,46 +15,50 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	movl	8(ap),r8
 -	movl	4(ap),r9
 -	movl	16(ap),r6
-+	movl	12(%ap),%r4
-+	movl	8(%ap),%r8
-+	movl	4(%ap),%r9
-+	movl	16(%ap),%r6
- 	jlss	s2_big
- 
+-	jlss	s2_big
+-
 -	clrl	r3
 -	incl	r4
 -	ashl	$-1,r4,r7
 -	jlbc	r4,L1
 -	clrl	r11
++	movl	12(%ap),%r4
++	movl	8(%ap),%r8
++	movl	4(%ap),%r9
++	movl	16(%ap),%r6
++	jlss	.Ls2_big
++
 +	clrl	%r3
 +	incl	%r4
 +	ashl	$-1,%r4,%r7
-+	jlbc	%r4,L1
++	jlbc	%r4,.L1
 +	clrl	%r11
  
  # Loop for S2_LIMB < 0x80000000
 -Loop1:	movl	(r8)+,r1
-+Loop1:	movl	(%r8)+,%r1
- 	jlss	L1n0
+-	jlss	L1n0
 -	emul	r1,r6,$0,r2
 -	addl2	r11,r2
 -	adwc	$0,r3
 -	subl2	r2,(r9)+
 -	adwc	$0,r3
 -L1:	movl	(r8)+,r1
-+	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	$0,%r3
-+	subl2	%r2,(%r9)+
-+	adwc	$0,%r3
-+L1:	movl	(%r8)+,%r1
- 	jlss	L1n1
+-	jlss	L1n1
 -L1p1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	$0,r11
 -	subl2	r10,(r9)+
 -	adwc	$0,r11
-+L1p1:	emul	%r1,%r6,$0,%r10
++.Loop1:	movl	(%r8)+,%r1
++	jlss	.L1n0
++	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	$0,%r3
++	subl2	%r2,(%r9)+
++	adwc	$0,%r3
++.L1:	movl	(%r8)+,%r1
++	jlss	.L1n1
++.L1p1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	$0,%r11
 +	subl2	%r10,(%r9)+
@@ -62,7 +66,7 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop1
 -	movl	r11,r0
-+	sobgtr	%r7,Loop1
++	sobgtr	%r7,.Loop1
 +	movl	%r11,%r0
  	ret
  
@@ -72,19 +76,20 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	subl2	r2,(r9)+
 -	adwc	$0,r3
 -	movl	(r8)+,r1
-+L1n0:	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r6,%r3
-+	subl2	%r2,(%r9)+
-+	adwc	$0,%r3
-+	movl	(%r8)+,%r1
- 	jgeq	L1p1
+-	jgeq	L1p1
 -L1n1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r6,r11
 -	subl2	r10,(r9)+
 -	adwc	$0,r11
-+L1n1:	emul	%r1,%r6,$0,%r10
++.L1n0:	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r6,%r3
++	subl2	%r2,(%r9)+
++	adwc	$0,%r3
++	movl	(%r8)+,%r1
++	jgeq	.L1p1
++.L1n1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r6,%r11
 +	subl2	%r10,(%r9)+
@@ -92,7 +97,7 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop1
 -	movl	r11,r0
-+	sobgtr	%r7,Loop1
++	sobgtr	%r7,.Loop1
 +	movl	%r11,%r0
  	ret
  
@@ -102,35 +107,37 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	ashl	$-1,r4,r7
 -	jlbc	r4,L2
 -	clrl	r11
-+s2_big:	clrl	%r3
++.Ls2_big: clrl	%r3
 +	incl	%r4
 +	ashl	$-1,%r4,%r7
-+	jlbc	%r4,L2
++	jlbc	%r4,.L2
 +	clrl	%r11
  
  # Loop for S2_LIMB >= 0x80000000
 -Loop2:	movl	(r8)+,r1
-+Loop2:	movl	(%r8)+,%r1
- 	jlss	L2n0
+-	jlss	L2n0
 -	emul	r1,r6,$0,r2
 -	addl2	r11,r2
 -	adwc	r1,r3
 -	subl2	r2,(r9)+
 -	adwc	$0,r3
 -L2:	movl	(r8)+,r1
-+	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r1,%r3
-+	subl2	%r2,(%r9)+
-+	adwc	$0,%r3
-+L2:	movl	(%r8)+,%r1
- 	jlss	L2n1
+-	jlss	L2n1
 -L2p1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r1,r11
 -	subl2	r10,(r9)+
 -	adwc	$0,r11
-+L2p1:	emul	%r1,%r6,$0,%r10
++.Loop2:	movl	(%r8)+,%r1
++	jlss	.L2n0
++	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r1,%r3
++	subl2	%r2,(%r9)+
++	adwc	$0,%r3
++.L2:	movl	(%r8)+,%r1
++	jlss	.L2n1
++.L2p1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r1,%r11
 +	subl2	%r10,(%r9)+
@@ -138,7 +145,7 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop2
 -	movl	r11,r0
-+	sobgtr	%r7,Loop2
++	sobgtr	%r7,.Loop2
 +	movl	%r11,%r0
  	ret
  
@@ -148,19 +155,20 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
 -	subl2	r2,(r9)+
 -	adwc	r1,r3
 -	movl	(r8)+,r1
-+L2n0:	emul	%r1,%r6,$0,%r2
-+	addl2	%r11,%r2
-+	adwc	%r6,%r3
-+	subl2	%r2,(%r9)+
-+	adwc	%r1,%r3
-+	movl	(%r8)+,%r1
- 	jgeq	L2p1
+-	jgeq	L2p1
 -L2n1:	emul	r1,r6,$0,r10
 -	addl2	r3,r10
 -	adwc	r6,r11
 -	subl2	r10,(r9)+
 -	adwc	r1,r11
-+L2n1:	emul	%r1,%r6,$0,%r10
++.L2n0:	emul	%r1,%r6,$0,%r2
++	addl2	%r11,%r2
++	adwc	%r6,%r3
++	subl2	%r2,(%r9)+
++	adwc	%r1,%r3
++	movl	(%r8)+,%r1
++	jgeq	.L2p1
++.L2n1:	emul	%r1,%r6,$0,%r10
 +	addl2	%r3,%r10
 +	adwc	%r6,%r11
 +	subl2	%r10,(%r9)+
@@ -168,6 +176,6 @@ $NetBSD: patch-aj,v 1.2 2010/05/18 18:33:48 martin Exp $
  
 -	sobgtr	r7,Loop2
 -	movl	r11,r0
-+	sobgtr	%r7,Loop2
++	sobgtr	%r7,.Loop2
 +	movl	%r11,%r0
  	ret