From fe247757ec1b6266da2c9b1bc2c0407caef9cdac Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 23 Jul 2020 19:25:07 +0000
Subject: [PATCH] Don't disable LTO for aarch64-gcc[69].

aarch64-binutils is no longer built static by default, so aarch64-gcc
can now enable LTO.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D25783
---
 base/gcc6/Makefile                  |  2 --
 devel/freebsd-gcc6/Makefile         | 10 +---------
 devel/freebsd-gcc6/pkg-plist.common |  8 ++++----
 devel/freebsd-gcc9/Makefile         | 10 +---------
 devel/freebsd-gcc9/pkg-plist        |  8 ++++----
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/base/gcc6/Makefile b/base/gcc6/Makefile
index b432af7a2c31..d23a71417d80 100644
--- a/base/gcc6/Makefile
+++ b/base/gcc6/Makefile
@@ -68,8 +68,6 @@ CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 CONFIGURE_TARGET=	${HOSTARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
-PLIST_SUB+=	LTO=""
-
 PLIST_SUB+=	PLUGINS=""
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
diff --git a/devel/freebsd-gcc6/Makefile b/devel/freebsd-gcc6/Makefile
index 8038ff6e3a64..e9f4b9cd7a5b 100644
--- a/devel/freebsd-gcc6/Makefile
+++ b/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}-
@@ -78,15 +79,6 @@ 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"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
diff --git a/devel/freebsd-gcc6/pkg-plist.common b/devel/freebsd-gcc6/pkg-plist.common
index cee82ff44898..8944e03fef41 100644
--- a/devel/freebsd-gcc6/pkg-plist.common
+++ b/devel/freebsd-gcc6/pkg-plist.common
@@ -389,9 +389,9 @@ libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixinc.sh
 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
diff --git a/devel/freebsd-gcc9/Makefile b/devel/freebsd-gcc9/Makefile
index 76446bcf64d8..00cfbbace03f 100644
--- a/devel/freebsd-gcc9/Makefile
+++ b/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}-
@@ -77,15 +78,6 @@ 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"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
diff --git a/devel/freebsd-gcc9/pkg-plist b/devel/freebsd-gcc9/pkg-plist
index ff1132f5b813..5b5516af9f69 100644
--- a/devel/freebsd-gcc9/pkg-plist
+++ b/devel/freebsd-gcc9/pkg-plist
@@ -443,11 +443,11 @@ libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixinc.sh
 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