diff --git a/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe b/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
index b40a325a6..ace15c1bf 100644
--- a/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
+++ b/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
 COPYRIGHT="1988-2018 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="3"
+REVISION="4"
 gccVersion="${portVersion%%_*}"
 SOURCE_URI="https://ftpmirror.gnu.org/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz
 	https://ftp.gnu.org/gnu/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz"
@@ -92,6 +92,7 @@ PROVIDES_syslibs="
 	lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 5
 	"
 REQUIRES_syslibs="
+	haiku$secondaryArchSuffix
 	"
 
 SUMMARY_syslibs_devel="C/C++-runtime static libraries and C++ headers, needed to build Haiku"
diff --git a/sys-devel/gcc/patches/gcc-7.3.0_2018_05_01.patchset b/sys-devel/gcc/patches/gcc-7.3.0_2018_05_01.patchset
index b7f549680..a190241ed 100644
--- a/sys-devel/gcc/patches/gcc-7.3.0_2018_05_01.patchset
+++ b/sys-devel/gcc/patches/gcc-7.3.0_2018_05_01.patchset
@@ -1,4 +1,4 @@
-From 5b67f720fb8ec4f0c6f788ab97b955aa340ad561 Mon Sep 17 00:00:00 2001
+From f079b889ac15702289eb126d1abba202061c7412 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
 Date: Sun, 19 Jul 2015 18:55:34 +0200
 Subject: Haiku patch
@@ -2403,7 +2403,7 @@ index 24d13f3..94d96d9 100644
 2.16.4
 
 
-From d87ea10224629c4d1fe4099df39a45e1a623db5f Mon Sep 17 00:00:00 2001
+From 8b403a6f08ef13c725e1185fcc218876a45e1e9e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 12 May 2017 23:49:00 +0200
 Subject: Haiku: regenerate configure.
@@ -3174,7 +3174,7 @@ index e70fdd6..1a8cd2d 100755
 2.16.4
 
 
-From d667f175f0c67bf475f4097f926f62df4d2b4938 Mon Sep 17 00:00:00 2001
+From d8fcd673a6b0e84ade0a6fb5ecb2a43d65ee2ac0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
 Date: Mon, 27 Jul 2015 16:32:32 +0200
 Subject: Haiku: disable -fno-PIE as this fails on x86_64.
@@ -3210,7 +3210,7 @@ index 9e99dc4..d2ae898 100644
 2.16.4
 
 
-From 224ed1ca0c98de8c9db4a2e30cc4813d20677a9d Mon Sep 17 00:00:00 2001
+From 777289c81992ddbb4b07f7fcb5351b30e5bf7cb3 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 5 May 2016 09:03:06 +0000
 Subject: fix for libstdc++/69506
@@ -3232,7 +3232,7 @@ index 4674f7b..02c8693 100644
 2.16.4
 
 
-From 5bd5f38e35a9693ed06fb68dfb4e90755db4d22d Mon Sep 17 00:00:00 2001
+From 602125c2cc1a3797cc51d9117474e43e2aba7142 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 5 May 2016 15:52:08 +0000
 Subject: rename x86_elf_aligned_common.
@@ -3259,7 +3259,7 @@ index 76ba48e..e2fa55a 100644
 2.16.4
 
 
-From a8fbdf24753ea2d37fd486467c67b0974ad56209 Mon Sep 17 00:00:00 2001
+From 2d840327dc8f00d11355cc7502eb098fc9f88d6d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 2 May 2018 08:37:20 +0200
 Subject: Enable libstdcxx_filesystem_ts for Haiku
@@ -3283,7 +3283,7 @@ index 805148d..e94dc11 100644
 2.16.4
 
 
-From 02411d8934d6c51d7a5149b6f38f7de183a9786c Mon Sep 17 00:00:00 2001
+From b39fc5be3ead2242fe3294ac3e6986fa62f85f4f Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Mon, 16 Jul 2018 12:31:18 +0000
 Subject: gcc: fix build configuration for libgcc.
@@ -3307,3 +3307,26 @@ index b0ec388..a3e4543 100644
 -- 
 2.16.4
 
+
+From 942069228a6ff7b59e0c8e1b900dcb951cda137a Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 14 Oct 2018 21:29:42 +0200
+Subject: Backport fix for std::is_trivially_constructible
+
+https://github.com/gcc-mirror/gcc/commit/57b9683f0ce55a410c567fcb2dc365a2cc848d6a
+
+diff --git a/gcc/cp/method.c b/gcc/cp/method.c
+index c7b6758..19e5b08 100644
+--- a/gcc/cp/method.c
++++ b/gcc/cp/method.c
+@@ -1165,6 +1165,7 @@ constructible_expr (tree to, tree from)
+     {
+       tree ctype = to;
+       vec<tree, va_gc> *args = NULL;
++	  cp_unevaluated cp_uneval_guard;
+       if (TREE_CODE (to) != REFERENCE_TYPE)
+ 	to = cp_build_reference_type (to, /*rval*/false);
+       tree ob = build_stub_object (to);
+-- 
+2.16.4
+