Index: head/base/gcc6/Makefile
===================================================================
--- head/base/gcc6/Makefile
+++ head/base/gcc6/Makefile
@@ -68,8 +68,6 @@
 CONFIGURE_TARGET=	${HOSTARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
-PLIST_SUB+=	LTO=""
-
 PLIST_SUB+=	PLUGINS=""
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
Index: head/devel/freebsd-gcc6/Makefile
===================================================================
--- head/devel/freebsd-gcc6/Makefile
+++ head/devel/freebsd-gcc6/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.5.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMEPREFIX=	${TARGETARCH}-
@@ -76,15 +77,6 @@
 . if ${COMPILER_TYPE} == clang
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 . endif
-.endif
-
-# Disable LTO on aarch64 since we force aarch64-binutils to
-# use STATIC
-.if ${TARGETARCH} == "aarch64"
-CONFIGURE_ARGS+= --disable-lto
-PLIST_SUB+=	LTO="@comment "
-.else
-PLIST_SUB+=	LTO=""
 .endif
 
 .if ${ARCH} == "aarch64"
Index: head/devel/freebsd-gcc6/pkg-plist.common
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.common
+++ head/devel/freebsd-gcc6/pkg-plist.common
@@ -389,9 +389,9 @@
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixincl
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkinstalldirs
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0.0.0
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0.0.0
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto-wrapper
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
 %%PLUGINS%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype
Index: head/devel/freebsd-gcc9/Makefile
===================================================================
--- head/devel/freebsd-gcc9/Makefile
+++ head/devel/freebsd-gcc9/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	9.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMEPREFIX=	${TARGETARCH}-
@@ -75,15 +76,6 @@
 . if ${COMPILER_TYPE} == clang
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 . endif
-.endif
-
-# Disable LTO on aarch64 since we force aarch64-binutils to
-# use STATIC
-.if ${TARGETARCH} == "aarch64"
-CONFIGURE_ARGS+= --disable-lto
-PLIST_SUB+=	LTO="@comment "
-.else
-PLIST_SUB+=	LTO=""
 .endif
 
 .if ${ARCH} == "aarch64"
Index: head/devel/freebsd-gcc9/pkg-plist
===================================================================
--- head/devel/freebsd-gcc9/pkg-plist
+++ head/devel/freebsd-gcc9/pkg-plist
@@ -443,11 +443,11 @@
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixincl
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkinstalldirs
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0.0.0
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0.0.0
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto-wrapper
-%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
+libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
 %%PLUGINS%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype
 man/man1/%%GCC_TARGET%%-cpp%%SUFFIX%%.1.gz
 man/man1/%%GCC_TARGET%%-g++%%SUFFIX%%.1.gz