diff --git a/gcc9snapshot/DESCR b/gcc9snapshot/DESCR
index e1291cbc05..8085ebdf9e 100644
--- a/gcc9snapshot/DESCR
+++ b/gcc9snapshot/DESCR
@@ -1,4 +1,4 @@
 The GNU Compiler Collection (GCC) includes front ends for C, C++, Objective-C,
 Fortran, and Go.
 
-This package provides the development version of version 8.x.
+This package provides the development version of version 9.x.
diff --git a/gcc9snapshot/Makefile b/gcc9snapshot/Makefile
index a9c87f7fcd..902b11390c 100644
--- a/gcc9snapshot/Makefile
+++ b/gcc9snapshot/Makefile
@@ -6,7 +6,7 @@ GCC_PKGNAME=		gcc9snapshot
 DISTNAME=	gcc-${GCC9S_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC9S_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
+## lang/gcc9-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
 CATEGORIES=	lang
 #MASTER_SITES=	${MASTER_SITE_GNU:=gcc/snapshots/${GCC9S_DIST_VERSION}/}
@@ -21,13 +21,13 @@ 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.NetBSD+=	gsed
 
 GNU_CONFIGURE=		yes
+GNU_CONFIGURE_STRICT=	no # too many unknown options
+
 ## Build outside ${WRKSRC}
 OBJDIR=			../build
 CONFIGURE_DIRS=		${OBJDIR}
diff --git a/gcc9snapshot/buildlink3.mk b/gcc9snapshot/buildlink3.mk
index bc93ca3864..83bb1655ca 100644
--- a/gcc9snapshot/buildlink3.mk
+++ b/gcc9snapshot/buildlink3.mk
@@ -1,31 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/19 10:6:56 keckhardt Exp $
+# $NetBSD$
 
-BUILDLINK_TREE+=	gcc7snapshot
+BUILDLINK_TREE+=	gcc9snapshot
 
-.if !defined(GCC7_BUILDLINK3_MK)
-GCC6SNAPSHOT_BUILDLINK3_MK:=
+.if !defined(GCC9SNAPSHOT_BUILDLINK3_MK)
+GCC9SNAPSHOT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc7snapshot+=	gcc6>=${_GCC_REQD}
-BUILDLINK_ABI_DEPENDS.gcc7snapshot+=	gcc6>=7.0
-BUILDLINK_PKGSRCDIR.gcc7snapshot=	../../wip/gcc7snapshot
-BUILDLINK_DEPMETHOD.gcc7snapshot?=	build
+BUILDLINK_API_DEPENDS.gcc9snapshot+=	gcc9>=9.0
+BUILDLINK_ABI_DEPENDS.gcc9snapshot+=	gcc9>=9.0
+BUILDLINK_PKGSRCDIR.gcc9snapshot=	../../wip/gcc9snapshot
+BUILDLINK_DEPMETHOD.gcc9snapshot?=	build
 
-BUILDLINK_FILES.gcc7snapshot=		#empty
-BUILDLINK_AUTO_VARS.gcc7snapshot=	no
+BUILDLINK_FILES.gcc9snapshot=		# none
+BUILDLINK_AUTO_VARS.gcc9snapshot=	no
 
-# Packages that link against shared libraries need a full dependency.
-#.if defined(_USE_GCC_SHLIB)
-#DEPENDS+=	{gcc7, gcc7-libs}>=${_GCC_REQD}:../../lang/gcc7-libs
-#ABI_DEPENDS+=	{gcc7,gcc7-libs}>=7.0:../../lang/gcc7-libs
-#.endif
-
-pkgbase := gcc7snapshot
-.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.gcc7snapshot:Mgcc-java)
 .include "../../devel/zlib/buildlink3.mk"
-.endif
-
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.endif # GCC7SNAPSHOT_BUILDLINK3_MK
-BUILDLINK_TREE+=	-gcc7snapshot
+.endif # GCC9SNAPSHOT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gcc9snapshot
diff --git a/gcc9snapshot/distinfo b/gcc9snapshot/distinfo
index e2d9851514..c3aa968e51 100644
--- a/gcc9snapshot/distinfo
+++ b/gcc9snapshot/distinfo
@@ -1,23 +1,21 @@
 $NetBSD: distinfo,v 1.23 2015/05/06 05:25:00 keckhardt Exp $
 
-SHA1 (gcc-9-20190120.tar.xz) = 26c75649cfb069261b88d845679f4292c5a9b6a7
-RMD160 (gcc-9-20190120.tar.xz) = 10d981b9ee1148a268709542dd71e0c1576e4b34
-SHA512 (gcc-9-20190120.tar.xz) = d4e90ba52ed8eca5257ba76c69994f05c9fc30779cb21d82ce314d55b9e39a41877fafa4734d9af2399299ee5bedf7bd72336121ed4bd7b4c55799889ab15a32
-Size (gcc-9-20190120.tar.xz) = 68207640 bytes
+SHA1 (gcc-9.0.1-RC-20190426.tar.xz) = 49ed9a232517d01d99370ce54f0d576543aa6b1c
+RMD160 (gcc-9.0.1-RC-20190426.tar.xz) = c6f288b5df64ad80fde595620bf796d297fb0084
+SHA512 (gcc-9.0.1-RC-20190426.tar.xz) = c3fcb6212cbbf3eb1ea6ae785c532385768a278293d50e76057c25cb7db8200b401db8897fe0f9063e9cd3074be7d645cc3144c651609bcb690616dedb9714c0
+Size (gcc-9.0.1-RC-20190426.tar.xz) = 70526560 bytes
 SHA1 (isl-0.16.1.tar.bz2) = c5a2b201bf05229647e73203c0bf2d9679d4d21f
 RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0d0a1f6bbac1ed4448f2403495c55b2
 SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
 SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca
 SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
-SHA1 (patch-gcc_config.gcc) = 8df363dc630f5cb81b1819bebf516ded346cd0a5
 SHA1 (patch-gcc_config_arm_arm.h) = ef381dbb70cab2f76f6ad190eaa5519240ae1a02
 SHA1 (patch-gcc_config_netbsd-protos.h) = 5c788878832f3b48d83941d2b36401abe8ece91c
 SHA1 (patch-gcc_config_t-netbsd) = cb39774b614f1de64684cf2f4df337e7b40427d6
 SHA1 (patch-gcc_config_x-netbsd) = 9dc75bfab8331b5223efc382aae5f577fb6e1b7b
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
 SHA1 (patch-gcc_d_d-builtins.cc) = 89c48c8e04c1137fdff9e3c548b9fd20add9229c
-SHA1 (patch-gcc_d_d-system.h) = 554f67dae8729819edf1bcc0e63d9303374d30f0
 SHA1 (patch-gcc_d_dmd_globals.h) = 701a302323e669e2eb703dd35557120f6580c6f9
 SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 7bd85ac8ade76a28c394f6fbe5d495f91824f79f
@@ -27,14 +25,6 @@ SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e3
 SHA1 (patch-libgcc_config.host) = bdd4cd27249c8b62793204428d95c977d58f06fb
 SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
-SHA1 (patch-libphobos_configure.tgt) = 7827878e76dc7014a6d470432e8f9807a7db568e
-SHA1 (patch-libphobos_libdruntime_Makefile.am) = 5330c13cf6d670a98e890ab006bb38239cff6a32
-SHA1 (patch-libphobos_libdruntime_Makefile.in) = 71628db1bf13087baa02056890ff251c338148ac
-SHA1 (patch-libphobos_libdruntime_core_stdc_assert__.d) = 5ba87194c78d2573269b90cfd62605de9b9dee8c
-SHA1 (patch-libphobos_libdruntime_core_stdc_wchar_.d) = 3ef87a04e90a6b33484dcadb7b2efbf075269a20
-SHA1 (patch-libphobos_libdruntime_core_sys_netbsd_dlfcn.d) = fb2760fc27d4c95af10ce0c9f7666badc6f8a770
-SHA1 (patch-libphobos_libdruntime_core_sys_netbsd_execinfo.d) = b4608d535788698ef51c0bb7aaf31a329b78c63e
-SHA1 (patch-libphobos_src_Makefile.am) = b3d4e04a143595305d27ca1549048714a9630a20
-SHA1 (patch-libphobos_src_Makefile.in) = a21da4cfab16c3de9a67944d9b46268d59406d4b
+SHA1 (patch-libgo-mksysinfo.sh) = cc352ebbda4261d11fcbcfe1409f38d487e8d006
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 1b907114f8b3477400fabc7b84ca5c16cd9c2930
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = d498ce411dfcd57652f87957778fab66dd4ab9a0
diff --git a/gcc9snapshot/options.mk b/gcc9snapshot/options.mk
index ed6079d168..cbf0c1b31f 100644
--- a/gcc9snapshot/options.mk
+++ b/gcc9snapshot/options.mk
@@ -6,22 +6,17 @@ PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran \
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
 			gcc-graphite gcc-inplace-math
 
-.if ${OPSYS} == "NetBSD"
-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
+PKG_SUGGESTED_OPTIONS.NetBSD=		nls
+PKG_SUGGESTED_OPTIONS.Linux=		nls
+PKG_SUGGESTED_OPTIONS.DragonFly=	nls
+PKG_SUGGESTED_OPTIONS.SunOS=		gcc-inplace-math
+PKG_SUGGESTED_OPTIONS+=			${PKG_SUGGESTED_OPTIONS.${OPSYS}}
 
 ###
-### Determine if multilib is avalible.
+### Determine if multilib is available.
 ###
 MULTILIB_SUPPORTED?=	unknown
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+.if ${MACHINE_PLATFORM:MLinux-*-x86_64}
 .  if exists(/usr/include/gnu/stubs-64.h) && \
      !exists(/usr/include/gnu/stubs-32.h)
 MULTILIB_SUPPORTED=	No
@@ -29,7 +24,7 @@ MULTILIB_SUPPORTED=	No
 MULTILIB_SUPPORTED=	Yes
 .  endif
 .endif
-.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
+.if ${MULTILIB_SUPPORTED:tl} == yes
 PKG_SUPPORTED_OPTIONS+=	gcc-multilib
 PKG_SUGGESTED_OPTIONS+=	gcc-multilib
 .endif
@@ -81,17 +76,11 @@ LIBS.SunOS+=		-lgmp
 ### Graphite Support
 ###
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16 =		isl-0.16.1
-SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES +=	${ISL16}.tar.bz2
+ISL16=		isl-0.16.1
+SITES.${ISL16}.tar.bz2= ${MASTER_SITE_GNU:=gcc/infrastructure/}
+DISTFILES+=	${ISL16}.tar.bz2
 .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++
diff --git a/gcc9snapshot/patches/patch-gcc_config.gcc b/gcc9snapshot/patches/patch-gcc_config.gcc
deleted file mode 100644
index c99431ee79..0000000000
--- a/gcc9snapshot/patches/patch-gcc_config.gcc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- gcc/config.gcc.orig	2019-01-17 12:34:28.000000000 +0000
-+++ gcc/config.gcc
-@@ -838,15 +838,22 @@ case ${target} in
- *-*-netbsd*)
-   tm_p_file="${tm_p_file} netbsd-protos.h"
-   tmake_file="t-netbsd t-slibgcc"
-+  d_target_objs="${d_target_objs} netbsd-d.o"
-   extra_objs="${extra_objs} netbsd.o"
-   gas=yes
-   gnu_ld=yes
-   use_gcc_stdint=wrap
-+  # cabs/cabsf are renamed to __c99_cabs/cabsf
-+  tm_p_file="${tm_p_file} netbsd-protos.h"
-+  target_gtfiles="${target_gtfiles} \$(srcdir)/config/netbsd.c"
-+  extra_objs="${extra_objs} netbsd.o"
-+  default_gnu_indirect_function=yes
-   case ${enable_threads} in
-     "" | yes | posix) thread_file='posix' ;;
-   esac
-   nbsd_tm_file="netbsd.h netbsd-stdint.h netbsd-elf.h"
-   default_use_cxa_atexit=yes
-+  target_has_targetdm=yes
-   ;;
- *-*-openbsd*)
-   tmake_file="t-openbsd"
-@@ -1650,10 +1657,12 @@ x86_64-*-freebsd*)
- i[34567]86-*-netbsdelf*)
- 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${nbsd_tm_file} i386/netbsd-elf.h"
- 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-+	tmake_file="${tmake_file} i386/t-crtstuff"
- 	;;
- x86_64-*-netbsd*)
- 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${nbsd_tm_file} i386/x86-64.h i386/netbsd64.h"
- 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-+	tmake_file="${tmake_file} i386/t-crtstuff"
- 	;;
- i[34567]86-*-openbsd*)
- 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
diff --git a/gcc9snapshot/patches/patch-gcc_d_d-system.h b/gcc9snapshot/patches/patch-gcc_d_d-system.h
deleted file mode 100644
index d7fe85164c..0000000000
--- a/gcc9snapshot/patches/patch-gcc_d_d-system.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- gcc/d/d-system.h.orig	2019-01-01 12:31:55.000000000 +0000
-+++ gcc/d/d-system.h
-@@ -24,7 +24,8 @@
- 
- /* Used by the dmd front-end to determine if we have POSIX-style IO.  */
- #define POSIX (__linux__ || __GLIBC__ || __gnu_hurd__ || __APPLE__ \
--	       || __FreeBSD__ || __OpenBSD__ || __DragonFly__ || __sun)
-+	       || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ \
-+	       || __sun)
- 
- /* Forward assert invariants to gcc_assert.  */
- #undef assert
diff --git a/gcc9snapshot/patches/patch-libgo-mksysinfo.sh b/gcc9snapshot/patches/patch-libgo-mksysinfo.sh
new file mode 100644
index 0000000000..8f99d09dc3
--- /dev/null
+++ b/gcc9snapshot/patches/patch-libgo-mksysinfo.sh
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- libgo/mksysinfo.sh.orig	2019-03-19 14:00:59.000000000 +0000
++++ libgo/mksysinfo.sh	2019-04-28 21:05:47.652698233 +0000
+@@ -1127,7 +1127,7 @@
+ # Prefer largefile variant if available.
+ # CentOS 5 does not have f_flags, so pull from f_spare.
+ statfs=`grep '^type _statfs64 ' gen-sysinfo.go || true`
+-if test "$statfs" == ""; then
++if test "$statfs" = ""; then
+   statfs=`grep '^type _statfs ' gen-sysinfo.go || true`
+ fi
+ if ! echo "$statfs" | grep f_flags; then
diff --git a/gcc9snapshot/patches/patch-libphobos_configure.tgt b/gcc9snapshot/patches/patch-libphobos_configure.tgt
deleted file mode 100644
index 777ac55ed6..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_configure.tgt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Add netbsd/x86
-
---- libphobos/configure.tgt.orig	2019-01-01 12:31:55.000000000 +0000
-+++ libphobos/configure.tgt
-@@ -30,6 +30,8 @@ case "${target}" in
- 	;;
-   x86_64-*-linux* | i?86-*-linux*)
- 	;;
-+  x86_64-*-netbsd* | i?86-*-netbsd*)
-+  	;;
-   *)
- 	UNSUPPORTED=1
- 	;;
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.am b/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.am
deleted file mode 100644
index 2bf33dc376..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Create directories, because BSD install(1) -D doesn't create directories
-
---- libphobos/libdruntime/Makefile.am.orig	2019-01-01 12:31:55.000000000 +0000
-+++ libphobos/libdruntime/Makefile.am
-@@ -140,10 +140,13 @@ clean-local:
- # Handles generated files as well
- install-data-local:
- 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
-+	  dirname=$$(dirname $$file) ; \
- 	  if test -f $$file; then \
--	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  else \
--	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $(srcdir)/$$file \
- 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  fi ; \
- 	done
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.in b/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.in
deleted file mode 100644
index 9b0b2faf19..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
-Regen for Makefile.am
-
---- libphobos/libdruntime/Makefile.in.orig	2018-11-28 17:54:07.000000000 +0000
-+++ libphobos/libdruntime/Makefile.in
-@@ -15,7 +15,7 @@
- @SET_MAKE@
- 
- # Makefile for the D runtime library.
--# Copyright (C) 2012-2018 Free Software Foundation, Inc.
-+# Copyright (C) 2012-2019 Free Software Foundation, Inc.
- #
- # GCC is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -656,7 +656,6 @@ phobos_compiler_shared_flag = @phobos_co
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -2171,10 +2170,13 @@ clean-local:
- # Handles generated files as well
- install-data-local:
- 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
-+	  dirname=$$(dirname $$file) ; \
- 	  if test -f $$file; then \
--	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  else \
--	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $(srcdir)/$$file \
- 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  fi ; \
- 	done
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_stdc_assert__.d b/gcc9snapshot/patches/patch-libphobos_libdruntime_core_stdc_assert__.d
deleted file mode 100644
index 5d2badf9c3..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_stdc_assert__.d
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- libphobos/libdruntime/core/stdc/assert_.d.orig	2018-10-28 19:51:47.000000000 +0000
-+++ libphobos/libdruntime/core/stdc/assert_.d
-@@ -53,6 +53,13 @@ else version (FreeBSD)
-      */
-     void __assert(const(char)* exp, const(char)* file, uint line);
- }
-+else version (NetBSD)
-+{
-+    /***
-+     * Assert failure function in the NetBSD C library.
-+     */
-+    void __assert(const(char)* file, int line, const(char)* exp);
-+}
- else version (DragonFlyBSD)
- {
-     /***
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_stdc_wchar_.d b/gcc9snapshot/patches/patch-libphobos_libdruntime_core_stdc_wchar_.d
deleted file mode 100644
index 057ed4cd59..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_stdc_wchar_.d
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- libphobos/libdruntime/core/stdc/wchar_.d.orig	2018-10-28 19:51:47.000000000 +0000
-+++ libphobos/libdruntime/core/stdc/wchar_.d
-@@ -43,6 +43,15 @@ version (CRuntime_Glibc)
-         ___value __value;
-     }
- }
-+else version (NetBSD)
-+{
-+    union __mbstate_t
-+    {
-+        int64_t   __mbstateL;
-+        char[128] __mbstate8;
-+    }
-+    alias mbstate_t = __mbstate_t;
-+}
- else version (OpenBSD)
- {
-     union __mbstate_t
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_sys_netbsd_dlfcn.d b/gcc9snapshot/patches/patch-libphobos_libdruntime_core_sys_netbsd_dlfcn.d
deleted file mode 100644
index 6046789ab4..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_sys_netbsd_dlfcn.d
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- libphobos/libdruntime/core/sys/netbsd/dlfcn.d.orig	2018-10-28 19:51:47.000000000 +0000
-+++ libphobos/libdruntime/core/sys/netbsd/dlfcn.d
-@@ -103,7 +103,7 @@ static if (__BSD_VISIBLE)
-     //void*    fdlopen(int, int);
-     int      dladdr(const(void)*, Dl_info*);
-     //dlfunc_t dlfunc(void*, const(char)*);
--    //int      dlinfo(void*, int, void*);
-+    int      dlinfo(void*, int, void*);
-     /+void     dllockinit(void* _context,
-         void* function(void* _context) _lock_create,
-         void  function(void* _lock)    _rlock_acquire,
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_sys_netbsd_execinfo.d b/gcc9snapshot/patches/patch-libphobos_libdruntime_core_sys_netbsd_execinfo.d
deleted file mode 100644
index f6caa736e3..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_libdruntime_core_sys_netbsd_execinfo.d
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD$
-
---- libphobos/libdruntime/core/sys/netbsd/execinfo.d.orig	2018-10-28 19:51:47.000000000 +0000
-+++ libphobos/libdruntime/core/sys/netbsd/execinfo.d
-@@ -14,103 +14,9 @@ nothrow:
- 
- import core.sys.netbsd.dlfcn;
- 
--// Use extern (D) so that these functions don't collide with libexecinfo.
--
--extern (D) int backtrace(void** buffer, int size)
--{
--    import core.thread : thread_stackBottom;
--
--    void** p, pend=cast(void**)thread_stackBottom();
--    version (D_InlineAsm_X86)
--        asm nothrow @trusted { mov p[EBP], EBP; }
--    else version (D_InlineAsm_X86_64)
--        asm nothrow @trusted { mov p[RBP], RBP; }
--    else
--        static assert(false, "Architecture not supported.");
--
--    int i;
--    for (; i < size && p < pend; ++i)
--    {
--        buffer[i] = *(p + 1);
--        auto pnext = cast(void**)*p;
--        if (pnext <= p) break;
--        p = pnext;
--    }
--    return i;
--}
--
--
--extern (D) char** backtrace_symbols(const(void*)* buffer, int size)
--{
--    static void* realloc(void* p, size_t len) nothrow
--    {
--        static import cstdlib=core.stdc.stdlib;
--        auto res = cstdlib.realloc(p, len);
--        if (res is null) cstdlib.free(p);
--        return res;
--    }
--
--    if (size <= 0) return null;
--
--    size_t pos = size * (char*).sizeof;
--    char** p = cast(char**)realloc(null, pos);
--    if (p is null) return null;
--
--    Dl_info info;
--    foreach (i, addr; buffer[0 .. size])
--    {
--        if (dladdr(addr, &info) == 0)
--            (cast(ubyte*)&info)[0 .. info.sizeof] = 0;
--        fixupDLInfo(addr, info);
--
--        immutable len = formatStackFrame(null, 0, addr, info);
--        assert(len > 0);
--
--        p = cast(char**)realloc(p, pos + len);
--        if (p is null) return null;
--
--        formatStackFrame(cast(char*)p + pos, len, addr, info) == len || assert(0);
--
--        p[i] = cast(char*)pos;
--        pos += len;
--    }
--    foreach (i; 0 .. size)
--    {
--        pos = cast(size_t)p[i];
--        p[i] = cast(char*)p + pos;
--    }
--    return p;
--}
--
--
--extern (D) void backtrace_symbols_fd(const(void*)* buffer, int size, int fd)
--{
--    import core.sys.posix.unistd : write;
--    import core.stdc.stdlib : alloca;
--
--    if (size <= 0) return;
--
--    Dl_info info;
--    foreach (i, addr; buffer[0 .. size])
--    {
--        if (dladdr(addr, &info) == 0)
--            (cast(ubyte*)&info)[0 .. info.sizeof] = 0;
--        fixupDLInfo(addr, info);
--
--        enum maxAlloca = 1024;
--        enum min = (size_t a, size_t b) => a <= b ? a : b;
--        immutable len = min(formatStackFrame(null, 0, addr, info), maxAlloca);
--        assert(len > 0);
--
--        auto p = cast(char*)alloca(len);
--        if (p is null) return;
--
--        formatStackFrame(p, len, addr, info) >= len || assert(0);
--        p[len - 1] = '\n';
--        write(fd, p, len);
--    }
--}
--
-+int backtrace(void** buffer, size_t size);
-+char** backtrace_symbols(const(void*)* buffer, size_t size);
-+int backtrace_symbols_fd(const(void*)* buffer, size_t size, int fd);
- 
- private void fixupDLInfo(const(void)* addr, ref Dl_info info)
- {
diff --git a/gcc9snapshot/patches/patch-libphobos_src_Makefile.am b/gcc9snapshot/patches/patch-libphobos_src_Makefile.am
deleted file mode 100644
index e998c0a670..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_src_Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Create directories, because BSD install(1) -D doesn't create directories
-
---- libphobos/src/Makefile.am.orig	2019-01-01 12:31:55.000000000 +0000
-+++ libphobos/src/Makefile.am
-@@ -93,10 +93,13 @@ clean-local:
- # Handles generated files as well
- install-data-local:
- 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
-+	  dirname=$$(dirname $$file) ; \
- 	  if test -f $$file; then \
--	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  else \
--	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $(srcdir)/$$file \
- 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  fi ; \
- 	done
diff --git a/gcc9snapshot/patches/patch-libphobos_src_Makefile.in b/gcc9snapshot/patches/patch-libphobos_src_Makefile.in
deleted file mode 100644
index 302f622ca6..0000000000
--- a/gcc9snapshot/patches/patch-libphobos_src_Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Regen for Makefile.am
-
---- libphobos/src/Makefile.in.orig	2019-01-20 22:33:18.000000000 +0000
-+++ libphobos/src/Makefile.in
-@@ -610,7 +610,6 @@ phobos_compiler_shared_flag = @phobos_co
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -1648,10 +1647,13 @@ clean-local:
- # Handles generated files as well
- install-data-local:
- 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
-+	  dirname=$$(dirname $$file) ; \
- 	  if test -f $$file; then \
--	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  else \
--	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
-+	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
-+	    $(INSTALL_HEADER) $(srcdir)/$$file \
- 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
- 	  fi ; \
- 	done
diff --git a/gcc9snapshot/version.mk b/gcc9snapshot/version.mk
index fecd12308c..2752f6ec5f 100644
--- a/gcc9snapshot/version.mk
+++ b/gcc9snapshot/version.mk
@@ -1,2 +1,2 @@
 # $NetBSD: version.mk,v 1.21 2015/05/06 05:25:00 keckhardt Exp $
-GCC9S_DIST_VERSION:=	9-20190120
+GCC9S_DIST_VERSION:=	9.0.1-RC-20190426