cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't disable LTO for aarch64-gcc[69].

Browse Source 
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
This commit is contained in:
John Baldwin 2020-07-23 19:25:07 +00:00
parent d13180fb0b
commit fe247757ec
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=542956
5 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/gcc6/Makefile
View File

@ -68,8 +68,6 @@ CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
CONFIGURE_TARGET= ${HOSTARCH}-unknown-${OPSYS:tl}${OSREL} CONFIGURE_TARGET= ${HOSTARCH}-unknown-${OPSYS:tl}${OSREL}
.endif .endif
PLIST_SUB+= LTO=""
PLIST_SUB+= PLUGINS="" PLIST_SUB+= PLUGINS=""
.if ${ARCH} == "amd64" || ${ARCH} == "i386" .if ${ARCH} == "amd64" || ${ARCH} == "i386"

10
devel/freebsd-gcc6/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= gcc PORTNAME= gcc
PORTVERSION= 6.5.0 PORTVERSION= 6.5.0
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= GCC/releases/gcc-${DISTVERSION} MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMEPREFIX= ${TARGETARCH}- PKGNAMEPREFIX= ${TARGETARCH}-
@ -78,15 +79,6 @@ MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
. endif . endif
.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" .if ${ARCH} == "aarch64"
PLIST_SUB+= PLUGINS="@comment plugin does not build" PLIST_SUB+= PLUGINS="@comment plugin does not build"
.else .else

8
devel/freebsd-gcc6/pkg-plist.common
View File

@ -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/fixincl
libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders
libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkinstalldirs libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkinstalldirs
%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0 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.0.0.0
libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto-wrapper 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 %%PLUGINS%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype

10
devel/freebsd-gcc9/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= gcc PORTNAME= gcc
PORTVERSION= 9.2.0 PORTVERSION= 9.2.0
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= GCC/releases/gcc-${DISTVERSION} MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMEPREFIX= ${TARGETARCH}- PKGNAMEPREFIX= ${TARGETARCH}-
@ -77,15 +78,6 @@ MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
. endif . endif
.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" .if ${ARCH} == "aarch64"
PLIST_SUB+= PLUGINS="@comment plugin does not build" PLIST_SUB+= PLUGINS="@comment plugin does not build"
.else .else

8
devel/freebsd-gcc9/pkg-plist
View File

@ -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/fixincl
libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders
libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkinstalldirs libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkinstalldirs
%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0 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.0.0.0
libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto-wrapper 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 %%PLUGINS%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype
man/man1/%%GCC_TARGET%%-cpp%%SUFFIX%%.1.gz man/man1/%%GCC_TARGET%%-cpp%%SUFFIX%%.1.gz
man/man1/%%GCC_TARGET%%-g++%%SUFFIX%%.1.gz man/man1/%%GCC_TARGET%%-g++%%SUFFIX%%.1.gz