diff options
Diffstat (limited to 'devel')
20 files changed, 9 insertions, 309 deletions
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index f83bd6bf262..0c7789c4ab0 100644 --- a/devel/gmp/Makefile +++ b/devel/gmp/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.78 2015/11/13 11:36:44 wiz Exp $ +# $NetBSD: Makefile,v 1.79 2016/08/23 05:10:48 adam Exp $ -DISTNAME= gmp-6.1.0 +DISTNAME= gmp-6.1.1 CATEGORIES= devel math MASTER_SITES= https://gmplib.org/download/gmp/ \ ${MASTER_SITE_GNU:=gmp/} diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk index aa58b03be78..e2395c25acb 100644 --- a/devel/gmp/buildlink3.mk +++ b/devel/gmp/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/03/24 21:54:15 asau Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2016/08/23 05:10:48 adam Exp $ BUILDLINK_TREE+= gmp .if !defined(GMP_BUILDLINK3_MK) GMP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gmp+= gmp>=4.2.1 +BUILDLINK_API_DEPENDS.gmp+= gmp>=4.2.1 BUILDLINK_ABI_DEPENDS.gmp+= gmp>=5.0.1 BUILDLINK_PKGSRCDIR.gmp?= ../../devel/gmp .endif # GMP_BUILDLINK3_MK diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo index b6c02a01677..28b571f7f63 100644 --- a/devel/gmp/distinfo +++ b/devel/gmp/distinfo @@ -1,26 +1,9 @@ -$NetBSD: distinfo,v 1.50 2015/11/13 11:36:44 wiz Exp $ +$NetBSD: distinfo,v 1.51 2016/08/23 05:10:48 adam Exp $ -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 (gmp-6.1.1.tar.bz2) = 757d672e66d8e0afe60ca04735ab11c00d9346e4 +RMD160 (gmp-6.1.1.tar.bz2) = 833b1dea9d3ce993e63cb3c629ab792e1e7197bb +SHA512 (gmp-6.1.1.tar.bz2) = 0a2a2407c1efcb50a0c05f0bfcee06507ac96c889489c20402fb78ed2dc408577e555bac39ec84af5ac4ecdb92bb245f1bbf438165330e0c21d8a50c3a5fec8c +Size (gmp-6.1.1.tar.bz2) = 2384919 bytes SHA1 (patch-aa) = dec275cbd5886a70f7cf0def1dedf01e7e4a49e9 SHA1 (patch-ab) = 829812822a72a4926ea4cf6e8ffafdcd13a0f76c SHA1 (patch-ac) = 6f7de0a285bec2c2645479d3090dc0276580f3d8 -SHA1 (patch-mpn_arm_aorslsh1__n.asm) = 2c12b798eba26a3c4429792e1a88f91638261255 -SHA1 (patch-mpn_arm_bdiv__dbm1c.asm) = 8fcc50684c6baae02abeadb56feeb2340fc39731 -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) = 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 -SHA1 (patch-mpn_arm_mod__34lsub1.asm) = 30a31a9d999097568cc8bc83a9565ee2f30657e0 -SHA1 (patch-mpn_arm_mode1o.asm) = 9fb7a224489ea56b433ab5e869c9402138210a30 -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 diff --git a/devel/gmp/patches/patch-mpn_arm_aorslsh1__n.asm b/devel/gmp/patches/patch-mpn_arm_aorslsh1__n.asm deleted file mode 100644 index b7d68e5ea9d..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_aorslsh1__n.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_aorslsh1__n.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/aorslsh1_n.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/aorslsh1_n.asm -@@ -163,5 +163,8 @@ L(rt1): mov r14, r12 - REVCY(r12) - L(rt0): RETVAL( r14) - pop {r4-r10r11, r14} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_bdiv__dbm1c.asm b/devel/gmp/patches/patch-mpn_arm_bdiv__dbm1c.asm deleted file mode 100644 index 97c41d24df4..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_bdiv__dbm1c.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_bdiv__dbm1c.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/bdiv_dbm1c.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/bdiv_dbm1c.asm -@@ -109,5 +109,8 @@ L(wd1): subs r5, r5, r8 - str r5, [qp] - sbc r0, r5, r12 - pop {r4, r5, r6, r7, r8} -- bx lr -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_cnd__aors__n.asm b/devel/gmp/patches/patch-mpn_arm_cnd__aors__n.asm deleted file mode 100644 index f91e53476c7..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_cnd__aors__n.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_cnd__aors__n.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/cnd_aors_n.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/cnd_aors_n.asm -@@ -130,5 +130,8 @@ L(top): ldm vp!, {r4,r5,r6,r7} - - L(end): RETVAL - pop {r4-r11} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_com.asm b/devel/gmp/patches/patch-mpn_arm_com.asm deleted file mode 100644 index d9990e698de..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_com.asm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mpn_arm_com.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/com.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/com.asm -@@ -71,5 +71,9 @@ L(top): ldmia up!, { r3, r8, r9, r12 } C - bne L(top) - - ldmfd sp!, { r7, r8, r9 } C restore regs from stack --L(rtn): bx lr -+L(rtn): -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_copyd.asm b/devel/gmp/patches/patch-mpn_arm_copyd.asm deleted file mode 100644 index d37652b70ad..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_copyd.asm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mpn_arm_copyd.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/copyd.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/copyd.asm -@@ -80,5 +80,9 @@ L(top): subs n, n, #4 - - L(end): stmda rp, { r3,r4,r5,r12 } - pop { r4-r5 } --L(rtn): bx lr -+L(rtn): -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_copyi.asm b/devel/gmp/patches/patch-mpn_arm_copyi.asm deleted file mode 100644 index 5d25c81174b..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_copyi.asm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mpn_arm_copyi.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/copyi.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/copyi.asm -@@ -75,5 +75,9 @@ L(top): subs n, n, #4 - - L(end): stm rp, { r3,r4,r5,r12 } - pop { r4-r5 } --L(rtn): bx lr -+L(rtn): -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_dive__1.asm b/devel/gmp/patches/patch-mpn_arm_dive__1.asm deleted file mode 100644 index 48fd3502839..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_dive__1.asm +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-mpn_arm_dive__1.asm,v 1.2 2015/11/13 11:36:44 wiz Exp $ - ---- 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 - str r9, [rp] - pop {r4-r9} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - - L(unnorm): - rsb tnc, cnt, #32 -@@ -136,7 +139,10 @@ L(edu): sbc cy, r5, cy - mul r9, r4, cy - str r9, [rp] - pop {r4-r9} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() - - RODATA diff --git a/devel/gmp/patches/patch-mpn_arm_invert__limb.asm b/devel/gmp/patches/patch-mpn_arm_invert__limb.asm deleted file mode 100644 index e9e949c26e5..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_invert__limb.asm +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mpn_arm_invert__limb.asm,v 1.6 2015/11/13 11:36:44 wiz Exp $ - ---- 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 - adc r3, r3, r0 - rsb r0, r3, r2 -- bx lr -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - EPILOGUE() - - RODATA diff --git a/devel/gmp/patches/patch-mpn_arm_logops__n.asm b/devel/gmp/patches/patch-mpn_arm_logops__n.asm deleted file mode 100644 index 580e1e57ff0..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_logops__n.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_logops__n.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/logops_n.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/logops_n.asm -@@ -135,5 +135,8 @@ L(mid): sub n, n, #4 - pop { r4, r5, r6, r7 } C popping r8-r10 here strangely fails - - L(rtn): pop { r8, r9, r10 } -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_lshift.asm b/devel/gmp/patches/patch-mpn_arm_lshift.asm deleted file mode 100644 index 3feb536b88f..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_lshift.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_lshift.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/lshift.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/lshift.asm -@@ -84,5 +84,8 @@ L(end): orr r7, r7, r6, lsr tnc - L(1): str r7, [rp, #-4] - mov r0, r4, lsr tnc - pop {r4, r6, r7, r8} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_lshiftc.asm b/devel/gmp/patches/patch-mpn_arm_lshiftc.asm deleted file mode 100644 index 0a0b0a3600e..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_lshiftc.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_lshiftc.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/lshiftc.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/lshiftc.asm -@@ -91,5 +91,8 @@ L(1): mvn r6, #0 - str r7, [rp, #-4] - mov r0, r4, lsr tnc - pop {r4, r6, r7, r8} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_mod__34lsub1.asm b/devel/gmp/patches/patch-mpn_arm_mod__34lsub1.asm deleted file mode 100644 index ce730ebcc4c..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_mod__34lsub1.asm +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-mpn_arm_mod__34lsub1.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/mod_34lsub1.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/mod_34lsub1.asm -@@ -106,7 +106,10 @@ L(sum2): - add r0, r0, r12, lsr #8 - - pop { r4, r5, r6, r7 } -- bx lr -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - - L(le2): cmn n, #1 - bne L(1) -@@ -117,5 +120,8 @@ L(1): ldr r2, [ap] - bic r0, r2, #0xff000000 - add r0, r0, r2, lsr #24 - pop { r4, r5, r6, r7 } -- bx lr -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_mode1o.asm b/devel/gmp/patches/patch-mpn_arm_mode1o.asm deleted file mode 100644 index 1fb03f25e68..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_mode1o.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_mode1o.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/mode1o.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/mode1o.asm -@@ -88,5 +88,8 @@ L(end): sbcs cy, r5, cy - addcc r0, r0, #1 - - ldmfd sp!, {r4, r5} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_rsh1aors__n.asm b/devel/gmp/patches/patch-mpn_arm_rsh1aors__n.asm deleted file mode 100644 index e2df18d3a3c..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_rsh1aors__n.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_rsh1aors__n.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/rsh1aors_n.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/rsh1aors_n.asm -@@ -120,5 +120,8 @@ L(e1): RSTCY( r12, r1) - str r4, [rp, #0] - mov r0, r11 - pop {r4-r11} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_rshift.asm b/devel/gmp/patches/patch-mpn_arm_rshift.asm deleted file mode 100644 index eba89733564..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_rshift.asm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mpn_arm_rshift.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/rshift.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/rshift.asm -@@ -82,5 +82,8 @@ L(end): orr r7, r7, r6, lsl tnc - L(1): str r7, [rp] - mov r0, r4, lsl tnc - pop {r4, r6, r7, r8} -- bx r14 -+ifdef(`ARM_THUMB_MODE', -+` bx r14 -+',` mov pc, r14 -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_sec__tabselect.asm b/devel/gmp/patches/patch-mpn_arm_sec__tabselect.asm deleted file mode 100644 index 71654ef51b8..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_sec__tabselect.asm +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-mpn_arm_sec__tabselect.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/sec_tabselect.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/sec_tabselect.asm -@@ -109,7 +109,10 @@ L(tp2): subs c, c, #1 - bge L(tp2) - stmia rp, {r8,r9} - pop {r4-r11, r14} -- bx lr -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - - L(n2): cmp j, #-2 - bne L(n1) -@@ -127,5 +130,8 @@ L(tp1): subs c, c, #1 - bge L(tp1) - str r8, [rp] - L(n1): pop {r4-r11, r14} -- bx lr -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - EPILOGUE() diff --git a/devel/gmp/patches/patch-mpn_arm_udiv.asm b/devel/gmp/patches/patch-mpn_arm_udiv.asm deleted file mode 100644 index 376ed77cb47..00000000000 --- a/devel/gmp/patches/patch-mpn_arm_udiv.asm +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mpn_arm_udiv.asm,v 1.1 2015/11/13 10:42:23 wiz Exp $ - ---- mpn/arm/udiv.asm.orig 2014-03-25 14:37:55.000000000 +0000 -+++ mpn/arm/udiv.asm -@@ -61,7 +61,10 @@ L(oop): divstep(n1,n0,d) - - str n1, [rem_ptr] C store remainder - adc r0, n0, n0 C quotient: add last carry from divstep -- bx lr -+ifdef(`ARM_THUMB_MODE', -+` bx lr -+',` mov pc, lr -+') - - L(_large_divisor): - stmfd sp!, { r8, lr } |