diff --git a/sys-devel/gcc/gcc7-7.3.0_2018_05_01.recipe b/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
similarity index 95%
rename from sys-devel/gcc/gcc7-7.3.0_2018_05_01.recipe
rename to sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
index 3f91e2678..7ee8aa9e8 100644
--- a/sys-devel/gcc/gcc7-7.3.0_2018_05_01.recipe
+++ b/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
@@ -2,7 +2,7 @@ SUMMARY="C/C++ compiler for target ${effectiveTargetMachineTriple}"
 DESCRIPTION="The standard compiler for non-legacy Haiku (i.e. for all \
 architectures other than x86_gcc2)."
 HOMEPAGE="https://gcc.gnu.org/"
-COPYRIGHT="1988-2017 Free Software Foundation, Inc."
+COPYRIGHT="1988-2018 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
 REVISION="1"
@@ -13,8 +13,8 @@ CHECKSUM_SHA256="832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15
 SOURCE_DIR="gcc-$gccVersion"
 PATCHES="gcc-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm ?ppc"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
+SECONDARY_ARCHITECTURES="x86"
 
 libatomicSoVersion="1"
 libatomicLibVersion="1.2.0"
@@ -38,7 +38,7 @@ libstdcxxSoVersion="6"
 libstdcxxLibVersion="6.0.24"
 
 PROVIDES="
-	gcc7$secondaryArchSuffix = $portVersion compat >= 7
+	gcc$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:c++$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:cc$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:cpp$secondaryArchSuffix = $portVersion compat >= 7
@@ -65,7 +65,7 @@ DESCRIPTION_fortran="This package is not of general interest - it \
 contains the set of gcc's C/C++-runtime libraries and headers that is \
 required by gfortran to build fortran source code."
 PROVIDES_fortran="
-	gcc7${secondaryArchSuffix}_fortran = $portVersion compat >= 7
+	gcc${secondaryArchSuffix}_fortran = $portVersion compat >= 7
 	cmd:gfortran$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:f951$secondaryArchSuffix = $portVersion compat >= 7
 	devel:libgfortran$secondaryArchSuffix = $libgfortranLibVersion compat >= $libgfortranSoVersion
@@ -73,7 +73,7 @@ PROVIDES_fortran="
 	"
 REQUIRES_fortran="
 	haiku$secondaryArchSuffix
-	gcc7${secondaryArchSuffix}_syslibs == $portVersion base
+	gcc${secondaryArchSuffix}_syslibs == $portVersion base
 	"
 
 SUMMARY_syslibs="C/C++-runtime shared libraries, needed to execute C/C++ programs"
@@ -81,18 +81,17 @@ DESCRIPTION_syslibs="The C/C++-runtime libraries that are part of the gcc \
 distribution. This package contains the shared libraries for the runtime \
 loader, so it is required for executing most c/c++ programs."
 PROVIDES_syslibs="
-	gcc7${secondaryArchSuffix}_syslibs = $portVersion compat >= 7
+	gcc${secondaryArchSuffix}_syslibs = $portVersion compat >= 5
 	lib:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion
 	lib:libgcc_s$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion
 	lib:libgfortran$secondaryArchSuffix = $libgfortranLibVersion compat >= $libgfortranSoVersion
 	lib:libgomp$secondaryArchSuffix = $libgompLibVersion compat >= $libgompSoVersion
 	lib:libquadmath$secondaryArchSuffix = $libquadmathLibVersion compat >= $libquadmathSoVersion
 	lib:libssp$secondaryArchSuffix = $libsspLibVersion compat >= $libsspSoVersion
-	lib:libstdc++$secondaryArchSuffix = $libstdcxxLibVersion compat >= $libstdcxxSoVersion
-	lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 7
+	lib:libstdc++$secondaryArchSuffix = $libstdcxxLibVersion compat >= 5
+	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"
@@ -100,7 +99,7 @@ DESCRIPTION_syslibs_devel="This package is not of general interest - it \
 contains the set of gcc's C/C++-runtime libraries and headers that is \
 required by Haiku's build system when building Haiku."
 PROVIDES_syslibs_devel="
-	gcc7${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 7
+	gcc${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 7
 	devel:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion
 	devel:libgcc_kernel$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion
 	devel:libgcc$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion
@@ -140,13 +139,12 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
-sourceDir=$(pwd)
 relativeInstallDir="develop/tools$secondaryArchSubDir"
 installDir="$prefix/$relativeInstallDir"
-objectsDir=$(pwd)/../${portVersionedName}-obj
+objectsDir=$sourceDir/../${portVersionedName}-obj
 gccLibDir=lib/gcc/$effectiveTargetMachineTriple/$gccVersion
 
-defineDebugInfoPackage gcc7$secondaryArchSuffix \
+defineDebugInfoPackage gcc$secondaryArchSuffix \
 	"$gccLibDir"/cc1 \
 	"$gccLibDir"/cc1plus \
 	"$gccLibDir"/collect2 \
@@ -395,7 +393,7 @@ INSTALL()
 
 	packageEntries "fortran" \
 		$relativeBinDir/gfortran \
-		$developDir/tools/bin/*gfortran \
+		$developDir/tools$secondaryArchSubDir/bin/*gfortran \
 		$installDir/$gccLibDir/f951 \
 		$installDir/$gccLibDir/finclude \
 		$installDir/$gccLibDir/libcaf_single.a \