Rename base/gcc to base/gcc6.

This is in preparation for adding a base/gcc9 port.

While here, update to GCC 6.5.0.

Share packing lists with the freebsd-gcc6 port as much as posible.
Split most of the freebsd-gcc6 pkg-plist into a pkg-plist.common that
lists arch-independent files under lib/.  Change base/gcc6 to use the
arch-specific packing lists and pkg-list.common from freebsd-gcc6.  In
addition, hook up packing lists for the remaining archs supported by
freebsd-gcc6 but not base/gcc6: aarch64 and sparc64.

Reviewed by:	bapt
Differential Revision:	https://reviews.freebsd.org/D22900

10 files changed, 55 insertions, 536 deletions

diff --git a/base/gcc/pkg-plist b/base/gcc/pkg-plist
deleted file mode 100644
index 5f1882fe6a10..000000000000
--- a/base/gcc/pkg-plist
+++ /dev/null
@@ -1,426 +0,0 @@
-bin/c++
-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%%-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
-%%FLOAT_H%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/iso646.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
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdbool.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stddef.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdfix.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdint-gcc.h
-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
-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
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/limits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/macro_list
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders.conf
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gtype.state
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ada/gcc-interface/ada-tree.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/addresses.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/alias.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/all-tree.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/alloc-pool.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ansidecl.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/asan.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/attribs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/auto-host.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/auto-profile.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/b-header-vars
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/backend.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/basic-block.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/bb-reorder.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/bitmap.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/builtin-attrs.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/builtin-types.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/builtins.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/builtins.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/bversion.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/c-family/c-common.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/c-family/c-common.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/c-family/c-objc.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/c-family/c-pragma.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/c-family/c-pretty-print.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/c-tree.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/calls.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ccmp.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfg-flags.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfg.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfganal.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfgbuild.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfgcleanup.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfgexpand.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfghooks.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfgloop.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfgloopmanip.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cfgrtl.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cgraph.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/chkp-builtins.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cif-code.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cilk-builtins.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cilk.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cilkplus.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/collect-utils.h
-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
-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
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/initfini-array.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
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/coretypes.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/coverage.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cp/cp-tree.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cp/cp-tree.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cp/cxx-pretty-print.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cp/name-lookup.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cp/type-utils.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cppbuiltin.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cppdefault.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cpplib.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/cselib.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/data-streamer.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dbgcnt.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dbgcnt.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dbxout.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dce.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ddg.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/debug.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/defaults.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/df.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dfp.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/diagnostic-color.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/diagnostic-core.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/diagnostic.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/diagnostic.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dojump.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dominance.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/domwalk.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/double-int.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dumpfile.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dwarf2asm.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/dwarf2out.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/emit-rtl.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/errors.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/et-forest.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/except.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/explow.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/expmed.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/expr.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/fibonacci_heap.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/file-find.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/filenames.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/fixed-value.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/flag-types.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/flags.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/fold-const-call.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/fold-const.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/function.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcc-plugin.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcc-rich-location.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcc-symtab.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcc.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcov-counter.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcov-io.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcse-common.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gcse.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/generic-match.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gengtype.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/genrtl.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gensupport.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ggc-internal.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ggc.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-builder.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-expr.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-fold.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-iterator.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-low.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-match.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-predict.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-pretty-print.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-ssa.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-streamer.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-walk.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimple.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimplify-me.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gimplify.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/glimits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/graph.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/graphds.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/graphite.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gsstruct.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gstab.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gsyms.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gsyslimits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gtm-builtins.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/gtype-desc.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hard-reg-set.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hash-map-traits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hash-map.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hash-set.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hash-table.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hash-traits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hashtab.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/highlev-plugin-common.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hooks.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hosthooks-def.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hosthooks.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hsa-brig-format.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hsa.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hw-doloop.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/hwint.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ifcvt.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/inchash.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/incpath.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/input.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/insn-addr.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/insn-codes.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/insn-constants.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/insn-flags.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/insn-modes.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/insn-notes.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/internal-fn.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/internal-fn.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/intl.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-chkp.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-icf-gimple.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-icf.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-inline.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-prop.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-ref.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-reference.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ipa-utils.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ira-int.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ira.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/is-a.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/java/java-tree.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/langhooks-def.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/langhooks.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lcm.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/libfuncs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/libiberty.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/limitx.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/limity.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/line-map.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/loop-unroll.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lower-subreg.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lra-int.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lra.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lto-compress.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lto-section-names.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/lto-streamer.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/machmode.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/machmode.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/md5.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/mem-stats-traits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/mem-stats.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/memory-block.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/mode-classes.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/objc/objc-tree.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/obstack.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-builtins.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/omp-low.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs-libfuncs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs-query.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs-tree.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/optabs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/options.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/opts-diagnostic.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/opts.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/output.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params-enum.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params-list.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/params.list
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/pass-instances.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/pass_manager.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/passes.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/plugin-api.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/plugin-version.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/plugin.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/plugin.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/predict.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/predict.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/prefix.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/pretty-print.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/print-rtl.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/print-tree.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/profile.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/read-md.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/real.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/realmpfr.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/recog.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/reg-notes.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/regcprop.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/regrename.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/regs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/regset.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/reload.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/resource.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtl-chkp.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtl-error.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtl-iter.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtl.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtl.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtlhash.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/rtlhooks-def.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/safe-ctype.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sanitizer.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sbitmap.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sched-int.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sdbout.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sel-sched-dump.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sel-sched-ir.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sel-sched.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sese.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/shrink-wrap.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/signop.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sparseset.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/spellcheck.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/splay-tree.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sreal.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ssa-iterators.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ssa.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/stab.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/statistics.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/stmt.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/stor-layout.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/streamer-hooks.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/stringpool.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/symbol-summary.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/symtab.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/sync-builtins.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/system.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/target-def.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/target-globals.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/target-hooks-macros.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/target-insns.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/target.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/target.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/targhooks.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/timevar.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/timevar.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tm-preds.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tm.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tm_p.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/toplev.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tracer.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/trans-mem.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-affine.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-cfg.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-cfgcleanup.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-check.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-chkp.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-chrec.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-core.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-data-ref.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-dfa.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-diagnostic.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-dump.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-eh.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-hash-traits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-hasher.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-inline.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-into-ssa.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-iterator.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-nested.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-object-size.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-outof-ssa.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-parloops.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-pass.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-phinodes.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-pretty-print.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-scalar-evolution.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-address.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-alias.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-coalesce.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-dom.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-live.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-loop-ivopts.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-loop-manip.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-loop-niter.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-loop.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-operands.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-propagate.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-sccvn.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-scopedtables.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-ter.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-threadbackward.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-threadedge.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa-threadupdate.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssa.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-ssanames.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-stdarg.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-streamer.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree-vectorizer.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tree.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/treestruct.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tsan.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/tsystem.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/typeclass.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/typed-splay-tree.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ubsan.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/valtrack.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/value-prof.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/varasm.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/vec.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/version.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/vmsdbg.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/vtable-verify.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/wide-int-print.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/wide-int.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/xcoff.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/xcoffout.h
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/cc1
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/cc1plus
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/collect2
-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
-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
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype
-share/man/man1/c++.1.gz
-share/man/man1/cc.1.gz
-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/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
deleted file mode 100644
index 752d06e27d5b..000000000000
--- a/base/gcc/pkg-plist.amd64
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 7d9854e213aa..000000000000
--- a/base/gcc/pkg-plist.i386
+++ /dev/null
@@ -1,68 +0,0 @@
-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
deleted file mode 100644
index 64fa3a132308..000000000000
--- a/base/gcc/pkg-plist.mips
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 8994ca3bed3d..000000000000
--- a/base/gcc/pkg-plist.powerpc
+++ /dev/null
@@ -1,20 +0,0 @@
-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
diff --git a/base/gcc/Makefile b/base/gcc6/Makefile
index bc6d25c44f54..fa6f67d4e423 100644
--- a/base/gcc/Makefile
+++ b/base/gcc6/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	6.4.0
-PORTREVISION=	2
+PORTVERSION=	6.5.0
 CATEGORIES=	base
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION} \
 		http://www.mpfr.org/mpfr-3.1.6/:mpfr \
@@ -14,6 +13,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		gmp-6.1.2.tar.xz:gmp \
 		mpc-1.0.3.tar.gz:mpc
 PKGNAMEPREFIX=	${OPSYS:tl}-
+PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	GNU Compiler Collection
@@ -23,6 +23,7 @@ LICENSE_COMB=	multi
 
 TARGETARCH=	${ARCH:S/amd64/x86_64/}
 GCC_TARGET=	${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
+SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 
 PREFIX=		/usr
 .for _tool in CC CXX CPP AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
@@ -34,7 +35,8 @@ PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
-EXTRA_PATCHES+= ${.CURDIR}/../../devel/freebsd-gcc6/files
+GCC_PORTDIR=	${.CURDIR}/../../devel/freebsd-gcc${SUFFIX}
+EXTRA_PATCHES+= ${GCC_PORTDIR}/files
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
@@ -63,25 +65,38 @@ 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"
 PLIST_SUB+=	FLOAT_H="@comment "
 .else
 PLIST_SUB+=	FLOAT_H=""
 .endif
 
-PLIST=		${.CURDIR}/pkg-plist
+PLIST=		${.CURDIR}/pkg-plist ${GCC_PORTDIR}/pkg-plist.common
 
+.if ${TARGETARCH} == "aarch64"
+PLIST+=		${GCC_PORTDIR}/pkg-plist.aarch64
+.endif
+.if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
+PLIST+=		${GCC_PORTDIR}/pkg-plist.arm
+.endif
 .if ${ARCH} == "amd64"
-PLIST+=		${.CURDIR}/pkg-plist.amd64
+PLIST+=		${GCC_PORTDIR}/pkg-plist.amd64
 .endif
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
-PLIST+=		${.CURDIR}/pkg-plist.i386
+PLIST+=		${GCC_PORTDIR}/pkg-plist.i386
 .endif
 .if ${ARCH:Mmips*}
-PLIST+=		${.CURDIR}/pkg-plist.mips
+PLIST+=		${GCC_PORTDIR}/pkg-plist.mips
 .endif
 .if ${ARCH:Mpowerpc*}
-PLIST+=		${.CURDIR}/pkg-plist.powerpc
+PLIST+=		${GCC_PORTDIR}/pkg-plist.powerpc
+.endif
+.if ${TARGETARCH} == "sparc64"
+PLIST+=		${GCC_PORTDIR}/pkg-plist.sparc64
 .endif
 
 post-extract:
diff --git a/base/gcc/distinfo b/base/gcc6/distinfo
index 47f6c3519d27..3c646f558a46 100644
--- a/base/gcc/distinfo
+++ b/base/gcc6/distinfo
@@ -1,7 +1,6 @@
-TIMESTAMP = 1508105556
-TIMESTAMP = 1514072608
-SHA256 (gcc-6.4.0.tar.xz) = 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4
-SIZE (gcc-6.4.0.tar.xz) = 76156220
+TIMESTAMP = 1576890855
+SHA256 (gcc-6.5.0.tar.xz) = 7ef1796ce497e89479183702635b14bb7a46b53249209a5e0f999bebf4740945
+SIZE (gcc-6.5.0.tar.xz) = 74355588
 SHA256 (mpfr-3.1.6.tar.xz) = 7a62ac1a04408614fccdc506e4844b10cf0ad2c2b1677097f8f35d3a1344a950
 SIZE (mpfr-3.1.6.tar.xz) = 1133672
 SHA256 (gmp-6.1.2.tar.xz) = 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
diff --git a/base/gcc/files/patch-configure b/base/gcc6/files/patch-configure
index 447a76f2b251..447a76f2b251 100644
--- a/base/gcc/files/patch-configure
+++ b/base/gcc6/files/patch-configure
diff --git a/base/gcc/pkg-descr b/base/gcc6/pkg-descr
index 57f620606762..57f620606762 100644
--- a/base/gcc/pkg-descr
+++ b/base/gcc6/pkg-descr
diff --git a/base/gcc6/pkg-plist b/base/gcc6/pkg-plist
new file mode 100644
index 000000000000..933abadcbe64
--- /dev/null
+++ b/base/gcc6/pkg-plist
@@ -0,0 +1,29 @@
+bin/c++
+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%%-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
+share/man/man1/c++.1.gz
+share/man/man1/cc.1.gz
+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/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