[HEAD] gcc6 build failure

[BERTRAND Joël <joel.bertrand%systella.fr@localhost>]

	Hello,

	For some days, gcc6 build process aborts on my server (NetBSD 8) with
following error:

(cd ../../devel/gmp && /usr/bin/make
WRKDIR=/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/.devel.gmp
EXTRACT_DIR=/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0
WRKSRC='${EXTRACT_DIR}/${DISTNAME:C/a$//}' SKIP_DEPENDS=YES patch)
===> Overriding tools for gmp-6.1.2
===> Extracting for gmp-6.1.2
===> Patching for gmp-6.1.2
=> Applying pkgsrc patches for gmp-6.1.2
/bin/mv /usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/gmp-*
/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/gmp
(cd ../../math/mpcomplex && /usr/bin/make
WRKDIR=/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/.devel.mpcomplex
EXTRACT_DIR=/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0
WRKSRC='${EXTRACT_DIR}/${DISTNAME}' SKIP_DEPENDS=YES patch)
===> Overriding tools for mpcomplex-1.1.0
===> Extracting for mpcomplex-1.1.0
===> Patching for mpcomplex-1.1.0
=> Applying pkgsrc patches for mpcomplex-1.1.0
/bin/mv /usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/mpc-*
/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/mpc
(cd ../../math/mpfr && /usr/bin/make
WRKDIR=/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/.devel.mpfr
EXTRACT_DIR=/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0
WRKSRC='${EXTRACT_DIR}/${DISTNAME}' SKIP_DEPENDS=YES patch)
===> Overriding tools for mpfr-4.0.0nb1
===> Extracting for mpfr-4.0.0nb1
===> Patching for mpfr-4.0.0nb1
/bin/mv /usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/mpfr-*
/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/mpfr
/bin/tar -jxf /usr/src/pkgsrc/distfiles/isl-0.14.tar.bz2 -C
/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0
/bin/mv /usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/isl-0.14
/usr/src/pkgsrc/lang/gcc6/work/gcc-6.4.0/isl
===> Patching for gcc6-6.4.0nb2
=> Applying pkgsrc patches for gcc6-6.4.0nb2
1 out of 1 hunks failed--saving rejects to mpc/src/mpc-impl.h.rej
Patch /usr/src/pkgsrc/lang/gcc6/patches/patch-mpc_src_mpc-impl.h failed
2 out of 2 hunks failed--saving rejects to mpc/src/mul.c.rej
Patch /usr/src/pkgsrc/lang/gcc6/patches/patch-mpc_src_mul.c failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/src/pkgsrc/lang/gcc6/patches/patch-mpc_src_mpc-impl.h
ERROR:  /usr/src/pkgsrc/lang/gcc6/patches/patch-mpc_src_mul.c
ERROR:
==========================================================================
ERROR:
ERROR: Some of the selected build options and/or local patches may be
incompatible.
ERROR: Please try building with fewer options or patches.
ERROR:
ERROR:
==========================================================================
*** Error code 1

Stop.
make[1]: stopped in /usr/src/pkgsrc/lang/gcc6
*** Error code 1

	mpc-impl.h.rej contains :

@@ -60,8 +60,8 @@
    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)

	And mul.c.rej :
@@ -172,7 +172,7 @@


 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 @@
    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);

	I have no idea to fix this issue as I don't know which kind of mistake
pkgsrc patches have to fix.

	Best regards,

	JKB