 @@ -1,41 +1,39 @@
-# $NetBSD: Makefile,v 1.21 2018/11/10 04:24:00 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2019/01/05 00:39:13 adam Exp $
 GCC_PKGNAME=		gcc7
 .include		"version.mk"
 DISTNAME=	gcc-${GCC7_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC7_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc7-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
 PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/}
 EXTRACT_SUFX=	.tar.xz
 EXTRACT_USING=	bsdtar
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gcc.gnu.org/
 COMMENT=	The GNU Compiler Collection (GCC) - 7.0 Release Series
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 DISTFILES=		${DEFAULT_DISTFILES}
 EXTRACT_ONLY=		${DEFAULT_DISTFILES}
 NOT_FOR_PLATFORM=	Interix-*-*
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake makeinfo sed:run tar:build
+USE_TOOLS+=		gmake makeinfo perl sed:run tar:build
 USE_TOOLS.NetBSD+=	gsed
 GNU_CONFIGURE=		yes
 ## Build outside ${WRKSRC}
 OBJDIR=			../build
 CONFIGURE_DIRS=		${OBJDIR}
 CONFIGURE_SCRIPT=	../${DISTNAME}/configure
 GCC_SUBPREFIX=		${GCC_PKGNAME}
 GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
 GNU_CONFIGURE_PREFIX=	${GCC_PREFIX}
 INFO_FILES=		yes
 CONFIGURE_ARGS+=	--disable-libstdcxx-pch
 @@ -68,34 +66,26 @@ BOOT_LDFLAGS+=		${LDFLAGS:M-Wl,-syslibro
 BUILDLINK_TRANSFORM+=	rm:-stdlib=libc++
 # Disable fixincludes on SmartOS, header changes result in broken includes
 # being generated, see https://github.com/joyent/pkgsrc-legacy/issues/270
 .if ${OS_VARIANT} == "SmartOS"
 SUBST_CLASSES+=		fixinc
 SUBST_STAGE.fixinc=	pre-configure
 SUBST_FILES.fixinc=	gcc/Makefile.in
 SUBST_SED.fixinc=	-e "s,\./fixinc.sh,-c true,"
 .endif
 .include "options.mk"
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 post-extract:
 	${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
 	${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
 # native SSP conflicts with gcc's libssp
 CONFIGURE_ARGS+=	--disable-libssp
 # Match base libstdc++ major
 SUBST_CLASSES+=		libstdc
 SUBST_STAGE.libstdc=	pre-configure
 SUBST_FILES.libstdc=	libstdc++-v3/configure
 SUBST_MESSAGE.libstdc=	Bumping libstdc++ major to 7
 SUBST_SED.libstdc=	-e 's,libtool_VERSION=6:,libtool_VERSION=7:,g'
 .else
 CONFIGURE_ARGS+=	--enable-libssp
 .endif
 @@ -126,27 +116,26 @@ CONFIGURE_ARGS.DragonFly+=	--disable-boo
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=	--with-arch=i486 --with-tune=i486
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
 CONFIGURE_ARGS+=	--with-arch=nocona --with-tune=nocona --with-fpmath=sse
 .endif
 .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
 CONFIGURE_ARGS+=	--with-dwarf2
 .endif
 # ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
 # a binary so we need to make sure we give it the installed sed and not
 # the tool wrapped one.
 MAKE_ENV+=		ac_cv_path_SED=${TOOLS_SED}
 MAKE_ENV+=		lt_cv_path_SED=${TOOLS_SED}
 # Determine whether to use binutils
 .if ${OPSYS} == "SunOS"
 .  if exists(/usr/sfw/bin/gobjdump)
 CONFIGURE_ENV+=		OBJDUMP=/usr/sfw/bin/gobjdump
 .  endif
 .  if exists(/usr/bin/ld)
 CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/bin/ld
 @@ -165,41 +154,43 @@ CONFIGURE_ARGS+=	--with-gnu-as --with-as
 .endif
 .if ${OS_VARIANT} == "SmartOS"
 SUBST_CLASSES+=		ccs
 SUBST_STAGE.ccs=	pre-configure
 SUBST_FILES.ccs=	contrib/make_sunver.pl
 SUBST_SED.ccs=		-e 's,/usr/ccs/bin,/usr/bin,g'
 .endif
 pre-configure:
 	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 TEST_TARGET=	-k check || ${TRUE}
 pre-test:
 	${RUN} 							\
 	if runtest --version >/dev/null 2>/dev/null ; then	\
 		: ;						\
 	else							\
-	  ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
+	  ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite."; \
-	  exit 1 ;						\
+	  exit 1;						\
 	fi
 post-test:
 	${RUN} cd ${WRKSRC} && cd ${OBJDIR} &&		\
 	${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
 	${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
 post-install:
 	${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
 		( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
 .if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
 	${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
 	${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
 .endif
 GENERATE_PLIST+= \
-	cd ${DESTDIR}${PREFIX} && 					\
+	cd ${DESTDIR}${PREFIX} && \
-	${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
+	${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.13 2018/11/10 04:24:00 mrg Exp $
+$NetBSD: distinfo,v 1.14 2019/01/05 00:39:13 adam Exp $
-SHA1 (gcc-7.3.0.tar.xz) = 9689b9cae7b2886fdaa08449a26701f095c04e48
+SHA1 (gcc-7.4.0.tar.xz) = bf09553cfa08ae6e29dfbbd541e5c69c3cbc6c66
-RMD160 (gcc-7.3.0.tar.xz) = 31f6934a0e0c0ca84b6668110f9afdb91c1f9023
+RMD160 (gcc-7.4.0.tar.xz) = 77d3cdafe7df748fa484a300e9513acb3ee2c2e1
-SHA512 (gcc-7.3.0.tar.xz) = ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
+SHA512 (gcc-7.4.0.tar.xz) = 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
-Size (gcc-7.3.0.tar.xz) = 62462388 bytes
+Size (gcc-7.4.0.tar.xz) = 62601888 bytes
-SHA1 (isl-0.16.1.tar.bz2) = c5a2b201bf05229647e73203c0bf2d9679d4d21f
+SHA1 (isl-0.18.tar.bz2) = bbffc5a2b05e4f0c97e882f96c448504491dc4ed
-RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0d0a1f6bbac1ed4448f2403495c55b2
+RMD160 (isl-0.18.tar.bz2) = e876f1049893de5be4a82a63f272f62547d455ca
-SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
+SHA512 (isl-0.18.tar.bz2) = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
-Size (isl-0.16.1.tar.bz2) = 1626446 bytes
+Size (isl-0.18.tar.bz2) = 1658291 bytes
 SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca
 SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
 SHA1 (patch-gcc_common_config_arm_arm-common.c) = 7c973cb9554a52f4b85f8fc98708f5e5cce8e8bd
 SHA1 (patch-gcc_config.gcc) = 20d1444cc2c031c8adc96289e1ccc6c1d29eb72f
 SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = b10ef4b9ad39e605fc4e2a0c8dffdae677842e94
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = ed7bc42813b33c87242f5ef0a304a621b873c9eb
 SHA1 (patch-gcc_config_aarch64_aarch64.h) = 5339d9c7ce9d040097c29cc3b7ec1d2fbfff811c
 SHA1 (patch-gcc_config_aarch64_t-aarch64-netbsd) = 0e7feb6f238b0a752ccc50e95e09b017cb368a90
 SHA1 (patch-gcc_config_alpha_elf.h) = 05657c528109480296cbe8a98461cba7853af492
 SHA1 (patch-gcc_config_alpha_linux.h) = fce1256bce232143ff6c1c1b8b9c855737adb23f
 SHA1 (patch-gcc_config_arm_arm.h) = 92c8bff1063e153fec4454e6dea5334a42b0dad6
 SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 9c1d2148e306024e8de3bdc9802fb63b976e0e7a
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 80a07645fab197969b4a6f518fdc81bda7376375
 @@ -39,15 +39,15 @@ SHA1 (patch-libdecnumber_decNumber.c) =
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
 SHA1 (patch-libgcc_config.host) = 4fa15e83a446e026507ac4f16c4f7ef686544c43
 SHA1 (patch-libgcc_config_arm_t-netbsd) = fe986b09ccbfc253aaaca263e8e38f06da4891cc
 SHA1 (patch-libgcc_config_arm_t-netbsd-eabi) = 1e818e92fe79f57d305ff42ce3449dddf87c3179
 SHA1 (patch-libgcc_config_i386_cpuinfo.h) = d217e3c65178c96c7314cb88c740b9586d4e8fed
 SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
 SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
 SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
 SHA1 (patch-libsanitizer_configure.tgt) = 0aff54104734b2cb21090e33f9304738946ea5a0
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 06bba6da02344f76c26eed765a7cb022c035994e
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf
-SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = c23679d5bd18ba82c578eb2909a8055bf37c34cd
+SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = b3897aa6d6d7208c524ebab35998e27663dfb4e8
 SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1

 @@ -1,30 +1,23 @@
-# $NetBSD: options.mk,v 1.3 2018/05/02 18:38:30 minskim Exp $
+# $NetBSD: options.mk,v 1.4 2019/01/05 00:39:13 adam Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran \
 			gcc-go gcc-objc gcc-objc++ gcc-graphite
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
 			gcc-graphite gcc-inplace-math
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
 PKG_SUGGESTED_OPTIONS+=	nls
 .elif ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	nls
 .elif ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+= nls
 .elif ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
 .else
 .endif
 ###
 ### Determine if multilib is avalible.
 ###
 MULTILIB_SUPPORTED?=	unknown
 .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
 .  if exists(/usr/include/x86_64-linux-gnu/gnu)
 _GNU_INCLUDE_DIR=	/usr/include/x86_64-linux-gnu/gnu
 .  else
 _GNU_INCLUDE_DIR=	/usr/include/gnu
 .  endif
 .  if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \
 @@ -76,56 +69,55 @@ CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_
 CONFIGURE_ARGS+=	--with-mpc=${BUILDLINK_PREFIX.mpcomplex}
 CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
 LIBS.SunOS+=		-lgmp
 .  include "../../devel/gmp/buildlink3.mk"
 .  include "../../math/mpcomplex/buildlink3.mk"
 .  include "../../math/mpfr/buildlink3.mk"
 .endif
 ###
 ### Graphite Support
 ###
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16 = isl-0.16.1
+ISL=			isl-0.18
-SITES.${ISL16}.tar.bz2 = ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
+DISTFILES+=		${ISL}.tar.bz2
-#SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
+SITES.${ISL}.tar.bz2=	ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
-DISTFILES += ${ISL16}.tar.bz2
+post-extract:
 	${LN} -f -s ${WRKDIR}/${ISL} ${WRKSRC}/isl
 .endif
 ###
 ### Optional languages
 ### Ada could be added although there is a bootstrapping issue.  See
 ### ../gcc34-ada for guidance
 ###
 .if !empty(PKG_OPTIONS:Mgcc-objc++)
 .  if empty(PKG_OPTIONS:Mgcc-c++)
 PKG_OPTIONS+=		gcc-c++
 .  endif
 .  if empty(PKG_OPTIONS:Mgcc-objc)
 PKG_OPTIONS+=		gcc-objc
 .  endif
 LANGS+=			obj-c++
 .endif
 .if !empty(PKG_OPTIONS:Mgcc-objc)
 LANGS+=			objc
 .endif
 .if !empty(PKG_OPTIONS:Mgcc-go)
 LANGS+=			go
 .endif
 .if !empty(PKG_OPTIONS:Mgcc-fortran)
 LANGS+=			fortran
 .endif
 .if !empty(PKG_OPTIONS:Mgcc-c++)
 LANGS+=			c++
 USE_TOOLS+=		perl
 CONFIGURE_ARGS+=	--enable-__cxa_atexit
 CONFIGURE_ARGS+=	--with-gxx-include-dir=${GCC_PREFIX}/include/c++/
 .else
 CONFIGURE_ARGS+=	--disable-build-with-cxx
 CONFIGURE_ARGS+=	--disable-build-poststage1-with-cxx
 .endif

 @@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2018/07/18 22:55:08 maya Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/05 00:39:13 adam Exp $
 GCC_PKGNAME=	gcc7
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
 DISTNAME=	gcc-${GCC7_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-libs-${GCC7_DIST_VERSION}
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc7 package so that with the dependence pattern
-## '{gcc7,gcc7-libs}>=7.3.*' pkg_add will choose gcc7-libs over gcc7.
+## '{gcc7,gcc7-libs}>=7.4.*' pkg_add will choose gcc7-libs over gcc7.
-PKGREVISION=	4
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gcc.gnu.org/
 COMMENT=	The GNU Compiler Collection (GCC) support shared libraries
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 USE_TOOLS+=	pax
 NO_BUILD=	yes
 @@ -33,33 +33,33 @@ BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC7_D
 LIBGCC_SUBPREFIX=	${GCC_PKGNAME}
 LIBGCC_PREFIX=		${LOCALBASE}/${LIBGCC_SUBPREFIX}
 GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_TARGET_MACHINE
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=	dylib
 .else
 SHLIB_EXT=	so
 .endif
 LIBRARY_FILES=	${WRKDIR}/lib_files
-GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
+GENERATE_PLIST+=	${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
 			${LIBRARY_FILES};
-GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
+GENERATE_PLIST+=	${GREP} -q 'lib/' ${LIBRARY_FILES} || \
-	   ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
+			${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib';
 ${LIBRARY_FILES}:
-	${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC7_DIST_VERSION}*' |		\
+	${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC7_DIST_VERSION}*' |	\
 	${SED} -n -e's,^${LIBGCC_PREFIX}/,,' -e'/libexec\//d'		\
 		-e'/libgij/d;/libgcj/d;/libjvm/d'			\
-		-e'/lib.*\.${SHLIB_EXT}/p' 		>${LIBRARY_FILES}
+		-e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES}
 do-install: ${LIBRARY_FILES}
 	${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib ||	\
 		${MKDIR} ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib
 	cd ${LIBGCC_PREFIX} && 						\
 	  ${PAX} -rw ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE} <${LIBRARY_FILES}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.4 2018/01/25 23:27:30 maya Exp $
+# $NetBSD: version.mk,v 1.5 2019/01/05 00:39:13 adam Exp $
-GCC7_DIST_VERSION:=7.3.0
+GCC7_DIST_VERSION:=	7.4.0

 @@ -1,17 +1,17 @@
-$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.2 2017/05/12 18:10:56 jperkin Exp $
+$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.3 2019/01/05 00:39:13 adam Exp $
 Ensure we can find SunOS std::aligned_alloc if using it.
---- libstdc++-v3/libsupc++/new_opa.cc.orig	2017-01-26 14:30:45.000000000 +0000
+--- libstdc++-v3/libsupc++/new_opa.cc.orig	2019-01-04 10:50:16.000000000 +0000
 +++ libstdc++-v3/libsupc++/new_opa.cc
-@@ -31,6 +31,10 @@
+@@ -42,6 +42,10 @@ extern "C" void *memalign(std::size_t bo
  using std::new_handler;
  using std::bad_alloc;
 +#if defined(__sun) && _GLIBCXX_HAVE_ALIGNED_ALLOC
 +using std::aligned_alloc;
 +#endif
++
- #if !_GLIBCXX_HAVE_ALIGNED_ALLOC
+ namespace __gnu_cxx {
- #if _GLIBCXX_HAVE__ALIGNED_MALLOC
+ #if _GLIBCXX_HAVE_ALIGNED_ALLOC
- #define aligned_alloc(al,sz) _aligned_malloc(sz,al)
+ using ::aligned_alloc;

 @@ -1,24 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/05/21 10:05:58 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/01/05 00:39:13 adam Exp $
 BUILDLINK_TREE+=	gcc7-libs
 .if !defined(GCC7_LIBS_BUILDLINK3_MK)
 GCC7_LIBS_BUILDLINK3_MK:=
 .if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
-BUILDLINK_API_DEPENDS.gcc7-libs+=	gcc7-libs>=7.3.0
+BUILDLINK_API_DEPENDS.gcc7-libs+=	gcc7-libs>=7.4.0
 .else
-BUILDLINK_API_DEPENDS.gcc7-libs+=	{gcc7,gcc7-libs}>=7.3.0
+BUILDLINK_API_DEPENDS.gcc7-libs+=	{gcc7,gcc7-libs}>=7.4.0
 .endif
 BUILDLINK_PKGSRCDIR.gcc7-libs=		../../lang/gcc7-libs
 BUILDLINK_DEPMETHOD.gcc7-libs?=		full
 BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.gcc7-libs}/gcc7
 BUILDLINK_FILES.gcc7-libs=	#empty
 BUILDLINK_AUTO_VARS.gcc7-libs=	no
 .if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
 # Use custom specs file to ensure we link against pkgsrc libraries.
 SPECS_LIBGCC=		${WRAPPER_DIR}/specs.libgcc
 WRAPPER_TARGETS+=	${SPECS_LIBGCC}