diff options
author | adam <adam@pkgsrc.org> | 2018-02-03 19:30:46 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2018-02-03 19:30:46 +0000 |
commit | d1a712b22728c8d21d2860ea12e6d732c6fbaf75 (patch) | |
tree | 4990d0ad7ea91e943b6ff7ece3c2fd472339f71a /lang/gcc6 | |
parent | b3b3a985438b27daa3e7da40b658b3f096a07006 (diff) | |
download | pkgsrc-d1a712b22728c8d21d2860ea12e6d732c6fbaf75.tar.gz |
Removed mpc patches as these are not needed with newer mpc(omplex)
Diffstat (limited to 'lang/gcc6')
-rw-r--r-- | lang/gcc6/distinfo | 4 | ||||
-rw-r--r-- | lang/gcc6/patches/patch-mpc_src_mpc-impl.h | 17 | ||||
-rw-r--r-- | lang/gcc6/patches/patch-mpc_src_mul.c | 27 |
3 files changed, 1 insertions, 47 deletions
diff --git a/lang/gcc6/distinfo b/lang/gcc6/distinfo index edf314e57e9..3285a590849 100644 --- a/lang/gcc6/distinfo +++ b/lang/gcc6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2018/01/29 14:02:08 adam Exp $ +$NetBSD: distinfo,v 1.10 2018/02/03 19:30:46 adam Exp $ SHA1 (gcc-6.4.0.tar.xz) = f237974b2d3af0f60936ce6a2f35b912a91e0239 RMD160 (gcc-6.4.0.tar.xz) = 63c16a8f5df0c2c2db3355ff1e984ad6b3653ab3 @@ -38,5 +38,3 @@ SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = b63c2682336c9b6f0e0d7b900d6f40ad6e7a5ec4 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1 -SHA1 (patch-mpc_src_mpc-impl.h) = b447abccc4d715690ca10d4734ac5c35652768e1 -SHA1 (patch-mpc_src_mul.c) = d34ee11845ca20a376dd80a907b5ab96b81933f6 diff --git a/lang/gcc6/patches/patch-mpc_src_mpc-impl.h b/lang/gcc6/patches/patch-mpc_src_mpc-impl.h deleted file mode 100644 index f7da5188bb6..00000000000 --- a/lang/gcc6/patches/patch-mpc_src_mpc-impl.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-mpc_src_mpc-impl.h,v 1.1 2018/01/29 14:02:08 adam Exp $ - -Work around macros removed in mpfr 4.0.0. - ---- mpc/src/mpc-impl.h.orig 2018-01-29 13:32:27.000000000 +0000 -+++ mpc/src/mpc-impl.h -@@ -60,8 +60,8 @@ along with this program. If not, see htt - mpfr_setsign (x, y, 0, rnd) : \ - mpfr_copysign (x, y, z, rnd)) - /* work around spurious signs in nan */ --#define MPFR_ADD_ONE_ULP(x) mpfr_add_one_ulp (x, GMP_RNDN) --#define MPFR_SUB_ONE_ULP(x) mpfr_sub_one_ulp (x, GMP_RNDN) -+#define MPFR_ADD_ONE_ULP(x) (mpfr_sgn(x) > 0 ? mpfr_nextabove(x) : mpfr_nextbelow(x)) -+#define MPFR_SUB_ONE_ULP(x) (mpfr_sgn(x) > 0 ? mpfr_nextbelow(x) : mpfr_nextabove(x)) - /* drop unused rounding mode from macroes */ - #define MPFR_SWAP(a,b) do { mpfr_srcptr tmp; tmp = a; a = b; b = tmp; } while (0) - diff --git a/lang/gcc6/patches/patch-mpc_src_mul.c b/lang/gcc6/patches/patch-mpc_src_mul.c deleted file mode 100644 index 51bfcdb3581..00000000000 --- a/lang/gcc6/patches/patch-mpc_src_mul.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-mpc_src_mul.c,v 1.1 2018/01/29 14:02:08 adam Exp $ - -Avoid conflict with mpfr_fmma introduced in mpfr 4.0.0. - ---- mpc/src/mul.c.orig 2018-01-29 13:19:07.000000000 +0000 -+++ mpc/src/mul.c -@@ -172,7 +172,7 @@ mul_imag (mpc_ptr z, mpc_srcptr x, mpc_s - - - static int --mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, -+gcc_mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c, - mpfr_srcptr d, int sign, mpfr_rnd_t rnd) - { - /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0. -@@ -337,9 +337,9 @@ mpc_mul_naive (mpc_ptr z, mpc_srcptr x, - else - rop [0] = z [0]; - -- inex = MPC_INEX (mpfr_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), -+ inex = MPC_INEX (gcc_mpfr_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x), - mpc_imagref (y), -1, MPC_RND_RE (rnd)), -- mpfr_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), -+ gcc_mpfr_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x), - mpc_realref (y), +1, MPC_RND_IM (rnd))); - - mpc_set (z, rop, MPC_RNDNN); |