Here's an update for gmp 6.0.0, more of a work in progress really. This requires regression testing on additional archs--and then we can try to figure out what to do about the inevitable failures :-/
So far: amd64 ok sparc64 ok m88k (builds) vax some errors i386 some errors i386 doesn't always show the same errors, and the in-tree gmp has similar problems. Disabling the assembly pieces didn't help, nor did building it with gcc4.8. *scratches head* I considered using --disable-assembly by default and only enabling it on "known good" archs, but between i386 still having problems and sparc64 not building at all without assembly, this seemed increasingly less promising. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/gmp/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile 13 Apr 2013 20:19:50 -0000 1.26 +++ Makefile 11 Jul 2014 08:36:30 -0000 @@ -2,23 +2,25 @@ COMMENT= library for arbitrary precision arithmetic -DISTNAME= gmp-5.0.2 -REVISION= 2 -SHARED_LIBS += gmp 9.0 # 10.2 -SHARED_LIBS += gmpxx 1.0 # 6.2 +DISTNAME= gmp-6.0.0 +SHARED_LIBS += gmp 10.0 # 12.0 +SHARED_LIBS += gmpxx 2.0 # 8.0 CATEGORIES= devel math -HOMEPAGE= http://gmplib.org/ +HOMEPAGE= https://gmplib.org/ MAINTAINER= Christian Weisgerber <na...@openbsd.org> # LGPLv3+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += m stdc++ - -MASTER_SITES= ftp://ftp.gmplib.org/pub/${DISTNAME}/ \ +MASTER_SITES= https://gmplib.org/download/gmp/ \ ${MASTER_SITE_GNU:=gmp/} +EXTRACT_SUFX= .tar.xz +# re-rolled for minor documentation fixes +DISTFILES= gmp-6.0.0a.tar.xz + +WANTLIB= m stdc++ CONFIGURE_STYLE=gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ @@ -27,9 +29,9 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-unknown-openbsd${OSrev} post-patch: - @cp ${FILESDIR}/mpn_m88k_add_n.asm ${WRKSRC}/mpn/m88k/add_n.asm - @cp ${FILESDIR}/mpn_m88k_sub_n.asm ${WRKSRC}/mpn/m88k/sub_n.asm - @rm ${WRKSRC}/mpn/m88k/add_n.s ${WRKSRC}/mpn/m88k/sub_n.s \ + cp ${FILESDIR}/mpn_m88k_add_n.asm ${WRKSRC}/mpn/m88k/add_n.asm + cp ${FILESDIR}/mpn_m88k_sub_n.asm ${WRKSRC}/mpn/m88k/sub_n.asm + rm ${WRKSRC}/mpn/m88k/add_n.s ${WRKSRC}/mpn/m88k/sub_n.s \ ${WRKSRC}/mpn/m88k/mul_1.s .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/gmp/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 27 May 2011 20:48:39 -0000 1.13 +++ distinfo 11 Jul 2014 08:36:30 -0000 @@ -1,5 +1,2 @@ -MD5 (gmp-5.0.2.tar.gz) = h+c0R6/cLKXO/Zh9qGXaUQ== -RMD160 (gmp-5.0.2.tar.gz) = 0QdCZ2vxpuFUgECZvMuVQJP9TnQ= -SHA1 (gmp-5.0.2.tar.gz) = rPQdBnVemsuPEwDGNWiXMVtxgK8= -SHA256 (gmp-5.0.2.tar.gz) = Lw1Lu+/wZg9Cxcr2RkrA/uUmwG9N/MgqAVCB6n34tV0= -SIZE (gmp-5.0.2.tar.gz) = 2633571 +SHA256 (gmp-6.0.0a.tar.xz) = kVbTLtrGlVvFOwIY9fN2P6y4kLc6g11eG5Adz464t2Q= +SIZE (gmp-6.0.0a.tar.xz) = 1904112 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure 11 Jul 2014 08:36:30 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.orig Tue Mar 25 15:38:04 2014 ++++ configure Wed Jul 9 19:48:25 2014 +@@ -5080,7 +5080,7 @@ echo "include_mpn(\`sparc32/sparc-defs.m4')" >> $gmp_t + + + # VAX +- vax*-*-*elf*) ++ vax*-*-*elf* | vax-*-openbsd5[4-9]) + # Use elf conventions (i.e., '%' register prefix, no global prefix) + # + Index: patches/patch-mpn_sh_add_n_s =================================================================== RCS file: patches/patch-mpn_sh_add_n_s diff -N patches/patch-mpn_sh_add_n_s --- patches/patch-mpn_sh_add_n_s 29 Jan 2013 12:40:06 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-mpn_sh_add_n_s,v 1.1 2013/01/29 12:40:06 tobiasu Exp $ ---- mpn/sh/add_n.s.orig Mon Jan 28 17:51:00 2013 -+++ mpn/sh/add_n.s Mon Jan 28 17:51:32 2013 -@@ -27,8 +27,8 @@ - - .text - .align 2 -- .global ___gmpn_add_n --___gmpn_add_n: -+ .global __gmpn_add_n -+__gmpn_add_n: - mov #0,r3 ! clear cy save reg - - Loop: mov.l @r5+,r1 Index: patches/patch-mpn_sh_sub_n_s =================================================================== RCS file: patches/patch-mpn_sh_sub_n_s diff -N patches/patch-mpn_sh_sub_n_s --- patches/patch-mpn_sh_sub_n_s 29 Jan 2013 12:40:06 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-mpn_sh_sub_n_s,v 1.1 2013/01/29 12:40:06 tobiasu Exp $ ---- mpn/sh/sub_n.s.orig Mon Jan 28 17:51:08 2013 -+++ mpn/sh/sub_n.s Mon Jan 28 17:51:43 2013 -@@ -27,8 +27,8 @@ - - .text - .align 2 -- .global ___gmpn_sub_n --___gmpn_sub_n: -+ .global __gmpn_sub_n -+__gmpn_sub_n: - mov #0,r3 ! clear cy save reg - - Loop: mov.l @r5+,r1 Index: patches/patch-mpn_vax_add_n_s =================================================================== RCS file: patches/patch-mpn_vax_add_n_s diff -N patches/patch-mpn_vax_add_n_s --- patches/patch-mpn_vax_add_n_s 22 Jul 2013 16:54:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,63 +0,0 @@ -$OpenBSD: patch-mpn_vax_add_n_s,v 1.1 2013/07/22 16:54:56 espie Exp $ ---- mpn/vax/add_n.s.orig Sun May 8 03:49:29 2011 -+++ mpn/vax/add_n.s Mon Jul 22 02:58:33 2013 -@@ -27,33 +27,33 @@ - - .text - .align 1 --.globl ___gmpn_add_n --___gmpn_add_n: -+.globl __gmpn_add_n -+__gmpn_add_n: - .word 0x0 -- movl 16(ap),r0 -- movl 12(ap),r1 -- movl 8(ap),r2 -- movl 4(ap),r3 -- mnegl r0,r5 -- addl2 $3,r0 -- ashl $-2,r0,r0 # unroll loop count -- bicl2 $-4,r5 # mask out low 2 bits -- movaq (r5)[r5],r5 # 9x -- jmp Loop(r5) -+ movl 16(%ap),%r0 -+ movl 12(%ap),%r1 -+ movl 8(%ap),%r2 -+ movl 4(%ap),%r3 -+ mnegl %r0,%r5 -+ addl2 $3,%r0 -+ ashl $-2,%r0,%r0 # unroll loop count -+ bicl2 $-4,%r5 # mask out low 2 bits -+ movaq (%r5)[%r5],%r5 # 9x -+ jmp Loop(%r5) - --Loop: movl (r2)+,r4 -- adwc (r1)+,r4 -- movl r4,(r3)+ -- movl (r2)+,r4 -- adwc (r1)+,r4 -- movl r4,(r3)+ -- movl (r2)+,r4 -- adwc (r1)+,r4 -- movl r4,(r3)+ -- movl (r2)+,r4 -- adwc (r1)+,r4 -- movl r4,(r3)+ -- sobgtr r0,Loop -+Loop: movl (%r2)+,%r4 -+ adwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ movl (%r2)+,%r4 -+ adwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ movl (%r2)+,%r4 -+ adwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ movl (%r2)+,%r4 -+ adwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ sobgtr %r0,Loop - -- adwc r0,r0 -+ adwc %r0,%r0 - ret Index: patches/patch-mpn_vax_addmul_1_s =================================================================== RCS file: patches/patch-mpn_vax_addmul_1_s diff -N patches/patch-mpn_vax_addmul_1_s --- patches/patch-mpn_vax_addmul_1_s 22 Jul 2013 16:54:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,172 +0,0 @@ -$OpenBSD: patch-mpn_vax_addmul_1_s,v 1.1 2013/07/22 16:54:56 espie Exp $ ---- mpn/vax/addmul_1.s.orig Sun May 8 03:49:29 2011 -+++ mpn/vax/addmul_1.s Mon Jul 22 02:58:50 2013 -@@ -27,98 +27,98 @@ - - .text - .align 1 --.globl ___gmpn_addmul_1 --___gmpn_addmul_1: -+.globl __gmpn_addmul_1 -+__gmpn_addmul_1: - .word 0xfc0 -- movl 12(ap),r4 -- 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 - -- clrl r3 -- incl r4 -- ashl $-1,r4,r7 -- jlbc r4,L1 -- clrl r11 -+ clrl %r3 -+ incl %r4 -+ ashl $-1,%r4,%r7 -+ jlbc %r4,L1 -+ clrl %r11 - - # Loop for S2_LIMB < 0x80000000 --Loop1: movl (r8)+,r1 -+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 -+ 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)+ -- adwc $0,r11 -+L1p1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc $0,%r11 -+ addl2 %r10,(%r9)+ -+ adwc $0,%r11 - -- sobgtr r7,Loop1 -- movl r11,r0 -+ sobgtr %r7,Loop1 -+ movl %r11,%r0 - ret - --L1n0: emul r1,r6,$0,r2 -- addl2 r11,r2 -- adwc r6,r3 -- 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 --L1n1: emul r1,r6,$0,r10 -- addl2 r3,r10 -- adwc r6,r11 -- addl2 r10,(r9)+ -- adwc $0,r11 -+L1n1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r6,%r11 -+ addl2 %r10,(%r9)+ -+ adwc $0,%r11 - -- sobgtr r7,Loop1 -- movl r11,r0 -+ sobgtr %r7,Loop1 -+ movl %r11,%r0 - ret - - --s2_big: clrl r3 -- incl r4 -- ashl $-1,r4,r7 -- jlbc r4,L2 -- clrl r11 -+s2_big: clrl %r3 -+ incl %r4 -+ ashl $-1,%r4,%r7 -+ jlbc %r4,L2 -+ clrl %r11 - - # Loop for S2_LIMB >= 0x80000000 --Loop2: movl (r8)+,r1 -+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 -+ 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)+ -- adwc $0,r11 -+L2p1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r1,%r11 -+ addl2 %r10,(%r9)+ -+ adwc $0,%r11 - -- sobgtr r7,Loop2 -- movl r11,r0 -+ sobgtr %r7,Loop2 -+ movl %r11,%r0 - ret - --L2n0: emul r1,r6,$0,r2 -- addl2 r11,r2 -- adwc r6,r3 -- 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 --L2n1: emul r1,r6,$0,r10 -- addl2 r3,r10 -- adwc r6,r11 -- addl2 r10,(r9)+ -- adwc r1,r11 -+L2n1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r6,%r11 -+ addl2 %r10,(%r9)+ -+ adwc %r1,%r11 - -- sobgtr r7,Loop2 -- movl r11,r0 -+ sobgtr %r7,Loop2 -+ movl %r11,%r0 - ret Index: patches/patch-mpn_vax_lshift_s =================================================================== RCS file: patches/patch-mpn_vax_lshift_s diff -N patches/patch-mpn_vax_lshift_s --- patches/patch-mpn_vax_lshift_s 22 Jul 2013 16:54:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,53 +0,0 @@ -$OpenBSD: patch-mpn_vax_lshift_s,v 1.1 2013/07/22 16:54:56 espie Exp $ ---- mpn/vax/lshift.s.orig Sun May 8 03:49:29 2011 -+++ mpn/vax/lshift.s Mon Jul 22 02:58:58 2013 -@@ -28,29 +28,29 @@ - - .text - .align 1 --.globl ___gmpn_lshift --___gmpn_lshift: -+.globl __gmpn_lshift -+__gmpn_lshift: - .word 0x1c0 -- movl 4(ap),r7 -- movl 8(ap),r6 -- movl 12(ap),r1 -- movl 16(ap),r8 -+ movl 4(%ap),%r7 -+ movl 8(%ap),%r6 -+ movl 12(%ap),%r1 -+ movl 16(%ap),%r8 - -- moval (r6)[r1],r6 -- moval (r7)[r1],r7 -- clrl r3 -- movl -(r6),r2 -- ashq r8,r2,r4 -- movl r5,r0 -- movl r2,r3 -- decl r1 -+ moval (%r6)[%r1],%r6 -+ moval (%r7)[%r1],%r7 -+ clrl %r3 -+ movl -(%r6),%r2 -+ ashq %r8,%r2,%r4 -+ movl %r5,%r0 -+ movl %r2,%r3 -+ decl %r1 - jeql Lend - --Loop: movl -(r6),r2 -- ashq r8,r2,r4 -- movl r5,-(r7) -- movl r2,r3 -- sobgtr r1,Loop -+Loop: movl -(%r6),%r2 -+ ashq %r8,%r2,%r4 -+ movl %r5,-(%r7) -+ movl %r2,%r3 -+ sobgtr %r1,Loop - --Lend: movl r4,-4(r7) -+Lend: movl %r4,-4(%r7) - ret Index: patches/patch-mpn_vax_mul_1_s =================================================================== RCS file: patches/patch-mpn_vax_mul_1_s diff -N patches/patch-mpn_vax_mul_1_s --- patches/patch-mpn_vax_mul_1_s 22 Jul 2013 16:54:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,163 +0,0 @@ -$OpenBSD: patch-mpn_vax_mul_1_s,v 1.1 2013/07/22 16:54:56 espie Exp $ ---- mpn/vax/mul_1.s.orig Sun May 8 03:49:29 2011 -+++ mpn/vax/mul_1.s Mon Jul 22 02:59:13 2013 -@@ -27,95 +27,95 @@ - - .text - .align 1 --.globl ___gmpn_mul_1 --___gmpn_mul_1: -+.globl __gmpn_mul_1 -+__gmpn_mul_1: - .word 0xfc0 -- movl 12(ap),r4 -- 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 - - # One might want to combine the addl2 and the store below, but that - # is actually just slower according to my timing tests. (VAX 3600) - -- clrl r3 -- incl r4 -- ashl $-1,r4,r7 -- jlbc r4,L1 -- clrl r11 -+ clrl %r3 -+ incl %r4 -+ ashl $-1,%r4,%r7 -+ jlbc %r4,L1 -+ clrl %r11 - - # Loop for S2_LIMB < 0x80000000 --Loop1: movl (r8)+,r1 -+Loop1: movl (%r8)+,%r1 - 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 --L1p1: emul r1,r6,$0,r10 -- addl2 r3,r10 -- adwc $0,r11 -- movl r10,(r9)+ -+L1p1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc $0,%r11 -+ movl %r10,(%r9)+ - -- sobgtr r7,Loop1 -- movl r11,r0 -+ sobgtr %r7,Loop1 -+ movl %r11,%r0 - ret - --L1n0: emul r1,r6,$0,r2 -- addl2 r11,r2 -- 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 --L1n1: emul r1,r6,$0,r10 -- addl2 r3,r10 -- adwc r6,r11 -- movl r10,(r9)+ -+L1n1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r6,%r11 -+ movl %r10,(%r9)+ - -- sobgtr r7,Loop1 -- movl r11,r0 -+ sobgtr %r7,Loop1 -+ movl %r11,%r0 - ret - - --s2_big: clrl r3 -- incl r4 -- ashl $-1,r4,r7 -- jlbc r4,L2 -- clrl r11 -+s2_big: clrl %r3 -+ incl %r4 -+ ashl $-1,%r4,%r7 -+ jlbc %r4,L2 -+ clrl %r11 - - # Loop for S2_LIMB >= 0x80000000 --Loop2: movl (r8)+,r1 -+Loop2: movl (%r8)+,%r1 - 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 --L2p1: emul r1,r6,$0,r10 -- addl2 r3,r10 -- adwc r1,r11 -- movl r10,(r9)+ -+L2p1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r1,%r11 -+ movl %r10,(%r9)+ - -- sobgtr r7,Loop2 -- movl r11,r0 -+ sobgtr %r7,Loop2 -+ movl %r11,%r0 - ret - --L2n0: emul r1,r6,$0,r2 -- addl2 r1,r3 -- addl2 r11,r2 -- 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 --L2n1: emul r1,r6,$0,r10 -- addl2 r1,r11 -- addl2 r3,r10 -- adwc r6,r11 -- movl r10,(r9)+ -+L2n1: emul %r1,%r6,$0,%r10 -+ addl2 %r1,%r11 -+ addl2 %r3,%r10 -+ adwc %r6,%r11 -+ movl %r10,(%r9)+ - -- sobgtr r7,Loop2 -- movl r11,r0 -+ sobgtr %r7,Loop2 -+ movl %r11,%r0 - ret Index: patches/patch-mpn_vax_rshift_s =================================================================== RCS file: patches/patch-mpn_vax_rshift_s diff -N patches/patch-mpn_vax_rshift_s --- patches/patch-mpn_vax_rshift_s 22 Jul 2013 16:54:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,49 +0,0 @@ -$OpenBSD: patch-mpn_vax_rshift_s,v 1.1 2013/07/22 16:54:56 espie Exp $ ---- mpn/vax/rshift.s.orig Sun May 8 03:49:29 2011 -+++ mpn/vax/rshift.s Mon Jul 22 02:59:21 2013 -@@ -28,27 +28,27 @@ - - .text - .align 1 --.globl ___gmpn_rshift --___gmpn_rshift: -+.globl __gmpn_rshift -+__gmpn_rshift: - .word 0x1c0 -- movl 4(ap),r7 -- movl 8(ap),r6 -- movl 12(ap),r1 -- movl 16(ap),r8 -+ movl 4(%ap),%r7 -+ movl 8(%ap),%r6 -+ movl 12(%ap),%r1 -+ movl 16(%ap),%r8 - -- movl (r6)+,r2 -- subl3 r8,$32,r8 -- ashl r8,r2,r0 -- decl r1 -+ movl (%r6)+,%r2 -+ subl3 %r8,$32,%r8 -+ ashl %r8,%r2,%r0 -+ decl %r1 - jeql Lend - --Loop: movl (r6)+,r3 -- ashq r8,r2,r4 -- movl r5,(r7)+ -- movl r3,r2 -- sobgtr r1,Loop -+Loop: movl (%r6)+,%r3 -+ ashq %r8,%r2,%r4 -+ movl %r5,(%r7)+ -+ movl %r3,%r2 -+ sobgtr %r1,Loop - --Lend: clrl r3 -- ashq r8,r2,r4 -- movl r5,(r7) -+Lend: clrl %r3 -+ ashq %r8,%r2,%r4 -+ movl %r5,(%r7) - ret Index: patches/patch-mpn_vax_sub_n_s =================================================================== RCS file: patches/patch-mpn_vax_sub_n_s diff -N patches/patch-mpn_vax_sub_n_s --- patches/patch-mpn_vax_sub_n_s 22 Jul 2013 16:54:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,63 +0,0 @@ -$OpenBSD: patch-mpn_vax_sub_n_s,v 1.1 2013/07/22 16:54:56 espie Exp $ ---- mpn/vax/sub_n.s.orig Sun May 8 03:49:29 2011 -+++ mpn/vax/sub_n.s Mon Jul 22 02:59:32 2013 -@@ -27,33 +27,33 @@ - - .text - .align 1 --.globl ___gmpn_sub_n --___gmpn_sub_n: -+.globl __gmpn_sub_n -+__gmpn_sub_n: - .word 0x0 -- movl 16(ap),r0 -- movl 12(ap),r1 -- movl 8(ap),r2 -- movl 4(ap),r3 -- mnegl r0,r5 -- addl2 $3,r0 -- ashl $-2,r0,r0 # unroll loop count -- bicl2 $-4,r5 # mask out low 2 bits -- movaq (r5)[r5],r5 # 9x -- jmp Loop(r5) -+ movl 16(%ap),%r0 -+ movl 12(%ap),%r1 -+ movl 8(%ap),%r2 -+ movl 4(%ap),%r3 -+ mnegl %r0,%r5 -+ addl2 $3,%r0 -+ ashl $-2,%r0,%r0 # unroll loop count -+ bicl2 $-4,%r5 # mask out low 2 bits -+ movaq (%r5)[%r5],%r5 # 9x -+ jmp Loop(%r5) - --Loop: movl (r2)+,r4 -- sbwc (r1)+,r4 -- movl r4,(r3)+ -- movl (r2)+,r4 -- sbwc (r1)+,r4 -- movl r4,(r3)+ -- movl (r2)+,r4 -- sbwc (r1)+,r4 -- movl r4,(r3)+ -- movl (r2)+,r4 -- sbwc (r1)+,r4 -- movl r4,(r3)+ -- sobgtr r0,Loop -+Loop: movl (%r2)+,%r4 -+ sbwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ movl (%r2)+,%r4 -+ sbwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ movl (%r2)+,%r4 -+ sbwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ movl (%r2)+,%r4 -+ sbwc (%r1)+,%r4 -+ movl %r4,(%r3)+ -+ sobgtr %r0,Loop - -- adwc r0,r0 -+ adwc %r0,%r0 - ret Index: patches/patch-mpn_vax_submul_1_s =================================================================== RCS file: patches/patch-mpn_vax_submul_1_s diff -N patches/patch-mpn_vax_submul_1_s --- patches/patch-mpn_vax_submul_1_s 22 Jul 2013 16:54:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,172 +0,0 @@ -$OpenBSD: patch-mpn_vax_submul_1_s,v 1.1 2013/07/22 16:54:56 espie Exp $ ---- mpn/vax/submul_1.s.orig Sun May 8 03:49:29 2011 -+++ mpn/vax/submul_1.s Mon Jul 22 02:59:44 2013 -@@ -27,98 +27,98 @@ - - .text - .align 1 --.globl ___gmpn_submul_1 --___gmpn_submul_1: -+.globl __gmpn_submul_1 -+__gmpn_submul_1: - .word 0xfc0 -- movl 12(ap),r4 -- 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 - -- clrl r3 -- incl r4 -- ashl $-1,r4,r7 -- jlbc r4,L1 -- clrl r11 -+ clrl %r3 -+ incl %r4 -+ ashl $-1,%r4,%r7 -+ jlbc %r4,L1 -+ clrl %r11 - - # Loop for S2_LIMB < 0x80000000 --Loop1: movl (r8)+,r1 -+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 -+ 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)+ -- adwc $0,r11 -+L1p1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc $0,%r11 -+ subl2 %r10,(%r9)+ -+ adwc $0,%r11 - -- sobgtr r7,Loop1 -- movl r11,r0 -+ sobgtr %r7,Loop1 -+ movl %r11,%r0 - ret - --L1n0: emul r1,r6,$0,r2 -- addl2 r11,r2 -- adwc r6,r3 -- 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 --L1n1: emul r1,r6,$0,r10 -- addl2 r3,r10 -- adwc r6,r11 -- subl2 r10,(r9)+ -- adwc $0,r11 -+L1n1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r6,%r11 -+ subl2 %r10,(%r9)+ -+ adwc $0,%r11 - -- sobgtr r7,Loop1 -- movl r11,r0 -+ sobgtr %r7,Loop1 -+ movl %r11,%r0 - ret - - --s2_big: clrl r3 -- incl r4 -- ashl $-1,r4,r7 -- jlbc r4,L2 -- clrl r11 -+s2_big: clrl %r3 -+ incl %r4 -+ ashl $-1,%r4,%r7 -+ jlbc %r4,L2 -+ clrl %r11 - - # Loop for S2_LIMB >= 0x80000000 --Loop2: movl (r8)+,r1 -+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 -+ 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)+ -- adwc $0,r11 -+L2p1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r1,%r11 -+ subl2 %r10,(%r9)+ -+ adwc $0,%r11 - -- sobgtr r7,Loop2 -- movl r11,r0 -+ sobgtr %r7,Loop2 -+ movl %r11,%r0 - ret - --L2n0: emul r1,r6,$0,r2 -- addl2 r11,r2 -- adwc r6,r3 -- 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 --L2n1: emul r1,r6,$0,r10 -- addl2 r3,r10 -- adwc r6,r11 -- subl2 r10,(r9)+ -- adwc r1,r11 -+L2n1: emul %r1,%r6,$0,%r10 -+ addl2 %r3,%r10 -+ adwc %r6,%r11 -+ subl2 %r10,(%r9)+ -+ adwc %r1,%r11 - -- sobgtr r7,Loop2 -- movl r11,r0 -+ sobgtr %r7,Loop2 -+ movl %r11,%r0 - ret Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 6 Jun 2009 17:45:48 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.9 2009/06/06 17:45:48 naddy Exp $ -@lib lib/libgmp.so.${LIBgmp_VERSION} -@lib lib/libgmpxx.so.${LIBgmpxx_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/gmp/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 6 Jun 2009 17:45:48 -0000 1.7 +++ pkg/PLIST 11 Jul 2014 08:36:30 -0000 @@ -4,6 +4,7 @@ include/gmpxx.h @info info/gmp.info lib/libgmp.a lib/libgmp.la -%%SHARED%% +@lib lib/libgmp.so.${LIBgmp_VERSION} lib/libgmpxx.a lib/libgmpxx.la +@lib lib/libgmpxx.so.${LIBgmpxx_VERSION} -- Christian "naddy" Weisgerber na...@mips.inka.de
