CVS commit: pkgsrc/lang/gcc6

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 29 14:02:08 UTC 2018

Modified Files:
        pkgsrc/lang/gcc6: distinfo
Added Files:
        pkgsrc/lang/gcc6/patches: patch-mpc_src_mpc-impl.h patch-mpc_src_mul.c

Log Message:
Fix building with mpfr 4.0.0


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc6/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc6/patches/patch-mpc_src_mpc-impl.h \
    pkgsrc/lang/gcc6/patches/patch-mpc_src_mul.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc6/distinfo
diff -u pkgsrc/lang/gcc6/distinfo:1.8 pkgsrc/lang/gcc6/distinfo:1.9
--- pkgsrc/lang/gcc6/distinfo:1.8       Tue Jul  4 21:56:40 2017
+++ pkgsrc/lang/gcc6/distinfo   Mon Jan 29 14:02:08 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2017/07/04 21:56:40 maya Exp $
+$NetBSD: distinfo,v 1.9 2018/01/29 14:02:08 adam Exp $
 
 SHA1 (gcc-6.4.0.tar.xz) = f237974b2d3af0f60936ce6a2f35b912a91e0239
 RMD160 (gcc-6.4.0.tar.xz) = 63c16a8f5df0c2c2db3355ff1e984ad6b3653ab3
@@ -38,3 +38,5 @@ SHA1 (patch-libstdc++-v3_config_os_bsd_n
 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

Added files:

Index: pkgsrc/lang/gcc6/patches/patch-mpc_src_mpc-impl.h
diff -u /dev/null pkgsrc/lang/gcc6/patches/patch-mpc_src_mpc-impl.h:1.1
--- /dev/null   Mon Jan 29 14:02:08 2018
+++ pkgsrc/lang/gcc6/patches/patch-mpc_src_mpc-impl.h   Mon Jan 29 14:02:08 2018
@@ -0,0 +1,17 @@
+$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)
+ 
Index: pkgsrc/lang/gcc6/patches/patch-mpc_src_mul.c
diff -u /dev/null pkgsrc/lang/gcc6/patches/patch-mpc_src_mul.c:1.1
--- /dev/null   Mon Jan 29 14:02:08 2018
+++ pkgsrc/lang/gcc6/patches/patch-mpc_src_mul.c        Mon Jan 29 14:02:08 2018
@@ -0,0 +1,27 @@
+$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);