Update base/gcc to work with devel/freebsd-gcc6.

- Explicitly set all the toolchain <foo>_FOR_TARGET variables.
  GCC's default guess for CC, etc. happened to work with the
  powerpc64-gcc port, but fails when the binaries have a suffix
  like the '6' suffix in freebsd-gcc6.  Setting these variables
  explicitly keeps GCC's build from having to guess.
- Pull patches from freebsd6-gcc instead of powerpc64-gcc.
- Use per-arch plists.
- Simplify the post-install steps to keep the hard links the
  normal install performs and avoid renaming binaries.
  Keep links to 'cc' and 'c++'.

Reviewed by:	bapt (earlier version)
Differential Revision:	https://reviews.freebsd.org/D22594

6 files changed, 126 insertions, 138 deletions

diff --git a/base/gcc/Makefile b/base/gcc/Makefile
index 68ebde77ba15..bc6d25c44f54 100644
--- a/base/gcc/Makefile
+++ b/base/gcc/Makefile
@@ -25,19 +25,16 @@ TARGETARCH=	${ARCH:S/amd64/x86_64/}
 GCC_TARGET=	${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
 
 PREFIX=		/usr
-CONFIGURE_ENV=	NM=/usr/bin/nm \
-		AS_FOR_TARGET=/usr/bin/as \
-		LD_FOR_TARGET=/usr/bin/ld \
-		NM_FOR_TARGET=/usr/bin/nm
+.for _tool in CC CXX CPP AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
+CONFIGURE_ENV+= ${_tool}_FOR_TARGET="${${_tool}}"
+.endfor
+
 USES=	gmake libtool tar:xz makeinfo
-PLIST_SUB=	TARGETARCH=${TARGETARCH} \
-		OPSYS=${OPSYS:tl} \
+PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
-EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/freebsd-format-extensions
-EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/freebsd-libdir
-EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/patch-gcc-freebsd-mips
+EXTRA_PATCHES+= ${.CURDIR}/../../devel/freebsd-gcc6/files
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
@@ -67,26 +64,24 @@ CONFIGURE_TARGET=	${HOSTARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
-PLIST_SUB+=	I386="" \
-		FLOAT_H="@comment "
+PLIST_SUB+=	FLOAT_H="@comment "
 .else
-PLIST_SUB+=	I386="@comment " \
-		FLOAT_H=""
+PLIST_SUB+=	FLOAT_H=""
 .endif
+
+PLIST=		${.CURDIR}/pkg-plist
+
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64=""
-.else
-PLIST_SUB+=	AMD64="@comment "
+PLIST+=		${.CURDIR}/pkg-plist.amd64
+.endif
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
 .if ${ARCH:Mmips*}
-PLIST_SUB+=	MIPS=""
-.else
-PLIST_SUB+=	MIPS="@comment "
+PLIST+=		${.CURDIR}/pkg-plist.mips
 .endif
 .if ${ARCH:Mpowerpc*}
-PLIST_SUB+=	POWERPC=""
-.else
-PLIST_SUB+=	POWERPC="@comment "
+PLIST+=		${.CURDIR}/pkg-plist.powerpc
 .endif
 
 post-extract:
@@ -101,22 +96,13 @@ post-patch:
 		${WRKSRC}//gcc/Makefile.in
 
 post-install:
-	${MV} -f ${STAGEDIR}/usr/bin/gcov-tool ${STAGEDIR}/usr/bin/${GCC_TARGET}-gcov-tool ; \
-	for tool in cpp gcc g++ gcov; do \
-		${MV} -f ${STAGEDIR}/usr/bin/$${tool} ${STAGEDIR}/usr/bin/${GCC_TARGET}-$${tool} ; \
-		${LN} -sf ${GCC_TARGET}-$${tool}  ${STAGEDIR}/usr/bin/$${tool} ; \
-		${MV} -f ${STAGEDIR}/${MANDIR}1/$${tool}.1 ${STAGEDIR}/${MANDIR}1/${GCC_TARGET}-$${tool}.1 ; \
-		${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${GCC_TARGET}-$${tool}.1 ; \
-		${LN} -sf ${GCC_TARGET}-$${tool}.1.gz ${STAGEDIR}/${MANDIR}1/$${tool}.1.gz ; \
-	done ; \
-	${LN} -sf ${GCC_TARGET}-g++  ${STAGEDIR}/usr/bin/c++ ; \
-	${LN} -sf ${GCC_TARGET}-g++.1.gz ${STAGEDIR}/${MANDIR}1/c++.1.gz
-	${LN} -sf ${GCC_TARGET}-gcc  ${STAGEDIR}/usr/bin/cc ; \
-	${LN} -sf ${GCC_TARGET}-gcc.1.gz ${STAGEDIR}/${MANDIR}1/cc.1.gz
+	${LN} -f ${STAGEDIR}/usr/bin/gcc  ${STAGEDIR}/usr/bin/cc ; \
+	${LN} -sf gcc.1 ${STAGEDIR}/${MANDIR}1/cc.1
+	${LN} -sf g++.1 ${STAGEDIR}/${MANDIR}1/c++.1
 	${RM} -r ${STAGEDIR}/usr/share/info
 	${RM} -r ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 	${RM} ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/base/gcc/pkg-plist b/base/gcc/pkg-plist
index 25ea09461700..5f1882fe6a10 100644
--- a/base/gcc/pkg-plist
+++ b/base/gcc/pkg-plist
@@ -3,87 +3,21 @@ bin/cc
 bin/cpp
 bin/g++
 bin/gcc
+bin/gcc-ar
+bin/gcc-nm
+bin/gcc-ranlib
 bin/gcov
+bin/gcov-dump
+bin/gcov-tool
 bin/%%GCC_TARGET%%-c++
-bin/%%GCC_TARGET%%-cpp
 bin/%%GCC_TARGET%%-g++
 bin/%%GCC_TARGET%%-gcc
 bin/%%GCC_TARGET%%-gcc-%%GCC_VERSION%%
 bin/%%GCC_TARGET%%-gcc-ar
 bin/%%GCC_TARGET%%-gcc-nm
 bin/%%GCC_TARGET%%-gcc-ranlib
-bin/%%GCC_TARGET%%-gcov
-bin/%%GCC_TARGET%%-gcov-tool
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/adxintrin.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/altivec.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ammintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx2intrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512bwintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512cdintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512dqintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512erintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512fintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmaintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmavlintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512pfintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmiintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmivlintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlbwintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vldqintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avxintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmi2intrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmiintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clflushoptintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clwbintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clzerointrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cpuid.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cross-stdarg.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/emmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/f16cintrin.h
 %%FLOAT_H%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fma4intrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fmaintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fxsrintrin.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmintrin.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmxlintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ia32intrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/immintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/iso646.h
-%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/loongson.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lwpintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lzcntintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm3dnow.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm_malloc.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mwaitxintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/nmmintrin.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/paired.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pkuintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pmmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/popcntintrin.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppc-asm.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppu_intrinsics.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/prfchwintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rdseedintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rtmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/shaintrin.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/si2vmx.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/smmintrin.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spe.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spu2vmx.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tbmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tmmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/wmmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/x86intrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xmmintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xopintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavecintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveoptintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavesintrin.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xtestintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdalign.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdarg.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdatomic.h
@@ -95,7 +29,6 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdint.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdnoreturn.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tgmath.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/varargs.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/vec_types.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixinc_list
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/gsyslimits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/README
@@ -152,38 +85,11 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/collect2-aix.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/collect2.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/conditions.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/elfos.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-spec.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-stdint.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/att.h
-%%AMD64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/biarch64.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%.h
-%%AMD64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%64.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-opts.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-protos.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/stringop.def
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/unix.h
-%%AMD64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-64.h
-%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-tune.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/initfini-array.h
-%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/elf.h
-%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/%%OPSYS%%.h
-%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-opts.h
-%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-protos.h
-%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips.h
-%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
-%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/configargs.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/context.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/convert.h
@@ -513,10 +419,8 @@ share/man/man1/cpp.1.gz
 share/man/man1/g++.1.gz
 share/man/man1/gcc.1.gz
 share/man/man1/gcov.1.gz
-share/man/man1/%%GCC_TARGET%%-cpp.1.gz
-share/man/man1/%%GCC_TARGET%%-g++.1.gz
-share/man/man1/%%GCC_TARGET%%-gcc.1.gz
-share/man/man1/%%GCC_TARGET%%-gcov.1.gz
+share/man/man1/gcov-dump.1.gz
+share/man/man1/gcov-tool.1.gz
 share/man/man7/fsf-funding.7.gz
 share/man/man7/gfdl.7.gz
 share/man/man7/gpl.7.gz
diff --git a/base/gcc/pkg-plist.amd64 b/base/gcc/pkg-plist.amd64
new file mode 100644
index 000000000000..752d06e27d5b
--- /dev/null
+++ b/base/gcc/pkg-plist.amd64
@@ -0,0 +1,3 @@
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/biarch64.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%64.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-64.h
diff --git a/base/gcc/pkg-plist.i386 b/base/gcc/pkg-plist.i386
new file mode 100644
index 000000000000..7d9854e213aa
--- /dev/null
+++ b/base/gcc/pkg-plist.i386
@@ -0,0 +1,68 @@
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/adxintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ammintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx2intrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512bwintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512cdintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512dqintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512erintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512fintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmaintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmavlintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512pfintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmiintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmivlintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlbwintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vldqintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avxintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmi2intrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmiintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clflushoptintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clwbintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clzerointrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cpuid.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cross-stdarg.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/emmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/f16cintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fma4intrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fmaintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fxsrintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ia32intrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/immintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lwpintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lzcntintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm3dnow.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm_malloc.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mwaitxintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/nmmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pkuintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pmmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/popcntintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/prfchwintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rdseedintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rtmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/shaintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/smmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tbmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tmmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/wmmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/x86intrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xmmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xopintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavecintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveoptintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavesintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xtestintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/att.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-opts.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-protos.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/stringop.def
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/unix.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-tune.def
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
diff --git a/base/gcc/pkg-plist.mips b/base/gcc/pkg-plist.mips
new file mode 100644
index 000000000000..64fa3a132308
--- /dev/null
+++ b/base/gcc/pkg-plist.mips
@@ -0,0 +1,7 @@
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/loongson.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/elf.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/%%OPSYS%%.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-opts.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-protos.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
diff --git a/base/gcc/pkg-plist.powerpc b/base/gcc/pkg-plist.powerpc
new file mode 100644
index 000000000000..8994ca3bed3d
--- /dev/null
+++ b/base/gcc/pkg-plist.powerpc
@@ -0,0 +1,20 @@
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/altivec.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmxlintrin.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/paired.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppc-asm.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppu_intrinsics.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/si2vmx.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spe.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spu2vmx.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/vec_types.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h