Index: head/devel/freebsd-gcc6/Makefile
===================================================================
--- head/devel/freebsd-gcc6/Makefile
+++ head/devel/freebsd-gcc6/Makefile
@@ -92,39 +92,34 @@
 PLIST_SUB+=	PLUGINS=""
 .endif
 
-.if ${TARGETARCH} == "aarch64"
-PLIST_SUB+=	ARM=""
-PLIST_SUB+=	AARCH64=""
-.else
-PLIST_SUB+=	ARM="@comment "
-PLIST_SUB+=	AARCH64="@comment "
-.endif
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "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 ${TARGETARCH} == "aarch64"
+PLIST+=		${.CURDIR}/pkg-plist.aarch64
+.endif
+.if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
+PLIST+=		${.CURDIR}/pkg-plist.arm
+.endif
 .if ${TARGETARCH} == "amd64"
-PLIST_SUB+=	AMD64=""
-.else
-PLIST_SUB+=	AMD64="@comment "
+PLIST+=		${.CURDIR}/pkg-plist.amd64
 .endif
+.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
+PLIST+=		${.CURDIR}/pkg-plist.i386
+.endif
 .if ${TARGETARCH:Mmips*}
-PLIST_SUB+=	MIPS=""
-.else
-PLIST_SUB+=	MIPS="@comment "
+PLIST+=		${.CURDIR}/pkg-plist.mips
 .endif
 .if ${TARGETARCH:Mpowerpc*}
-PLIST_SUB+=	POWERPC=""
-.else
-PLIST_SUB+=	POWERPC="@comment "
+PLIST+=		${.CURDIR}/pkg-plist.powerpc
 .endif
 .if ${TARGETARCH} == "sparc64"
-PLIST_SUB+=	SPARC64=""
-.else
-PLIST_SUB+=	SPARC64="@comment "
+PLIST+=		${.CURDIR}/pkg-plist.sparc64
 .endif
 
 post-install:
Index: head/devel/freebsd-gcc6/pkg-plist
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist
+++ head/devel/freebsd-gcc6/pkg-plist
@@ -9,78 +9,8 @@
 bin/%%GCC_TARGET%%-gcov%%SUFFIX%%
 bin/%%GCC_TARGET%%-gcov-dump%%SUFFIX%%
 bin/%%GCC_TARGET%%-gcov-tool%%SUFFIX%%
-%%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
-%%ARM%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_acle.h
-%%ARM%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_neon.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
@@ -92,8 +22,6 @@
 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
-%%SPARC64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/visintrin.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
@@ -150,54 +78,11 @@
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/collect2.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/conditions.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config.h
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-arches.def
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-cores.def
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-elf.h
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-%%OPSYS%%.h
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-fusion-pairs.def
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-opts.h
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-protos.h
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-tuning-flags.def
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64.h
-%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/biarchlp64.h
-%%ARM%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/aarch-common-protos.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/elfos.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-spec.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-stdint.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%.h
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/att.h
-%%AMD64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/biarch64.h
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%.h
-%%AMD64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%64.h
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-opts.h
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-protos.h
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386.h
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/stringop.def
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/unix.h
-%%AMD64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-64.h
-%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-tune.def
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/initfini-array.h
-%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/elf.h
-%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/%%OPSYS%%.h
-%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-opts.h
-%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-protos.h
-%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips.h
-%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
-%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h
-%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/%%OPSYS%%.h
-%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-opts.h
-%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-protos.h
-%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc.h
-%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sysv4.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/configargs.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/context.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/convert.h
Index: head/devel/freebsd-gcc6/pkg-plist.aarch64
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.aarch64
+++ head/devel/freebsd-gcc6/pkg-plist.aarch64
@@ -0,0 +1,10 @@
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-arches.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-cores.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-elf.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-%%OPSYS%%.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-fusion-pairs.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-opts.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-protos.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-tuning-flags.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/biarchlp64.h
Index: head/devel/freebsd-gcc6/pkg-plist.amd64
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.amd64
+++ head/devel/freebsd-gcc6/pkg-plist.amd64
@@ -0,0 +1,3 @@
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/biarch64.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%64.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-64.h
Index: head/devel/freebsd-gcc6/pkg-plist.arm
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.arm
+++ head/devel/freebsd-gcc6/pkg-plist.arm
@@ -0,0 +1,4 @@
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_acle.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_neon.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/aarch-common-protos.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
Index: head/devel/freebsd-gcc6/pkg-plist.i386
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.i386
+++ head/devel/freebsd-gcc6/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
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/att.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-opts.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-protos.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/stringop.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/unix.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-tune.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
Index: head/devel/freebsd-gcc6/pkg-plist.mips
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.mips
+++ head/devel/freebsd-gcc6/pkg-plist.mips
@@ -0,0 +1,7 @@
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/loongson.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/elf.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/%%OPSYS%%.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-opts.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-protos.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
Index: head/devel/freebsd-gcc6/pkg-plist.powerpc
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.powerpc
+++ head/devel/freebsd-gcc6/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
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h
Index: head/devel/freebsd-gcc6/pkg-plist.sparc64
===================================================================
--- head/devel/freebsd-gcc6/pkg-plist.sparc64
+++ head/devel/freebsd-gcc6/pkg-plist.sparc64
@@ -0,0 +1,8 @@
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/visintrin.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/%%OPSYS%%.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-opts.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-protos.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sysv4.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h