Date: Thu, 23 Jul 2020 19:25:07 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542956 - in head: base/gcc6 devel/freebsd-gcc6 devel/freebsd-gcc9 Message-ID: <202007231925.06NJP7gL002963@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb (src,doc committer) Date: Thu Jul 23 19:25:07 2020 New Revision: 542956 URL: https://svnweb.freebsd.org/changeset/ports/542956 Log: 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 Modified: head/base/gcc6/Makefile head/devel/freebsd-gcc6/Makefile head/devel/freebsd-gcc6/pkg-plist.common head/devel/freebsd-gcc9/Makefile head/devel/freebsd-gcc9/pkg-plist Modified: head/base/gcc6/Makefile ============================================================================== --- head/base/gcc6/Makefile Thu Jul 23 19:23:58 2020 (r542955) +++ head/base/gcc6/Makefile Thu Jul 23 19:25:07 2020 (r542956) @@ -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" Modified: head/devel/freebsd-gcc6/Makefile ============================================================================== --- head/devel/freebsd-gcc6/Makefile Thu Jul 23 19:23:58 2020 (r542955) +++ head/devel/freebsd-gcc6/Makefile Thu Jul 23 19:25:07 2020 (r542956) @@ -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 @@ CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} . 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" Modified: head/devel/freebsd-gcc6/pkg-plist.common ============================================================================== --- head/devel/freebsd-gcc6/pkg-plist.common Thu Jul 23 19:23:58 2020 (r542955) +++ head/devel/freebsd-gcc6/pkg-plist.common Thu Jul 23 19:25:07 2020 (r542956) @@ -389,9 +389,9 @@ libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-too 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 Modified: head/devel/freebsd-gcc9/Makefile ============================================================================== --- head/devel/freebsd-gcc9/Makefile Thu Jul 23 19:23:58 2020 (r542955) +++ head/devel/freebsd-gcc9/Makefile Thu Jul 23 19:25:07 2020 (r542956) @@ -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 @@ CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} . 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" Modified: head/devel/freebsd-gcc9/pkg-plist ============================================================================== --- head/devel/freebsd-gcc9/pkg-plist Thu Jul 23 19:23:58 2020 (r542955) +++ head/devel/freebsd-gcc9/pkg-plist Thu Jul 23 19:25:07 2020 (r542956) @@ -443,11 +443,11 @@ libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-too 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007231925.06NJP7gL002963>