Changes from BZ PR 224217 plus minor changes to fix base/gcc fetch

3 files changed, 61 insertions, 28 deletions

diff --git a/base/gcc/Makefile b/base/gcc/Makefile
index 16459bac49c9..a2ca9d5143ff 100644
--- a/base/gcc/Makefile
+++ b/base/gcc/Makefile
@@ -1,15 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	5.4.0
-CATEGORIES=	devel
+PORTVERSION=	6.3.0
+CATEGORIES=	base
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION} \
+		http://www.mpfr.org/mpfr-3.1.6/:mpfr \
 		http://www.mpfr.org/mpfr-current/:mpfr \
 		GNU/gmp:gmp \
-		http://www.multiprecision.org/mpc/download/:mpc
+		https://ftp.gnu.org/gnu/mpc/:mpc
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		mpfr-3.1.4.tar.xz:mpfr \
-		gmp-5.1.3.tar.xz:gmp \
+		mpfr-3.1.6.tar.xz:mpfr \
+		gmp-6.1.2.tar.xz:gmp \
 		mpc-1.0.3.tar.gz:mpc
 PKGNAMEPREFIX=	${OPSYS:tl}-
 
@@ -30,7 +31,7 @@ LICENSE_COMB=	multi
 PREFIX=		/usr
 CONFIGURE_ENV=	gcc_gxx_include_dir="/usr/include/c++/v1"
 TARGET_ARCH=	${CROSS_TOOLCHAIN:C,-.*$,,}
-GCC_TARGET=	${TARGET_ARCH}-portbld-${OPSYS:tl}${OSREL}
+GCC_TARGET=	${TARGET_ARCH}-unknown-${OPSYS:tl}${OSREL}
 
 USES=	gmake libtool tar:bzip2 makeinfo
 PLIST_SUB=	TARGETARCH=${TARGET_ARCH} \
@@ -53,8 +54,8 @@ ALL_TARGET?=	all-gcc
 INSTALL_TARGET?=	install-gcc
 
 post-extract:
-	cd ${WRKSRC}; ${LN} -sf ../mpfr-3.1.4 mpfr ; \
-		${LN} -sf ../gmp-5.1.3 gmp ; \
+	cd ${WRKSRC}; ${LN} -sf ../mpfr-3.1.6 mpfr ; \
+		${LN} -sf ../gmp-6.1.2 gmp ; \
 		${LN} -sf ../mpc-1.0.3 mpc
 
 post-patch:
diff --git a/base/gcc/distinfo b/base/gcc/distinfo
index fe193e3cae54..9561c2f04b2b 100644
--- a/base/gcc/distinfo
+++ b/base/gcc/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1472596046
-SHA256 (gcc-5.4.0.tar.bz2) = 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
-SIZE (gcc-5.4.0.tar.bz2) = 95661481
-SHA256 (mpfr-3.1.4.tar.xz) = 761413b16d749c53e2bfd2b1dfaa3b027b0e793e404b90b5fbaeef60af6517f5
-SIZE (mpfr-3.1.4.tar.xz) = 1122152
-SHA256 (gmp-5.1.3.tar.xz) = dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071
-SIZE (gmp-5.1.3.tar.xz) = 1818812
+TIMESTAMP = 1508105556
+SHA256 (gcc-6.3.0.tar.bz2) = f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
+SIZE (gcc-6.3.0.tar.bz2) = 99903185
+SHA256 (mpfr-3.1.6.tar.xz) = 7a62ac1a04408614fccdc506e4844b10cf0ad2c2b1677097f8f35d3a1344a950
+SIZE (mpfr-3.1.6.tar.xz) = 1133672
+SHA256 (gmp-6.1.2.tar.xz) = 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
+SIZE (gmp-6.1.2.tar.xz) = 1946336
 SHA256 (mpc-1.0.3.tar.gz) = 617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
 SIZE (mpc-1.0.3.tar.gz) = 669925
diff --git a/base/gcc/pkg-plist b/base/gcc/pkg-plist
index 358fae885319..6158c633e6c0 100644
--- a/base/gcc/pkg-plist
+++ b/base/gcc/pkg-plist
@@ -15,6 +15,7 @@ bin/%%GCC_TARGET%%-gcc-ranlib
 bin/%%GCC_TARGET%%-gcov
 bin/%%GCC_TARGET%%-gcov-tool
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/README
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/libmilter/mfapi.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/limits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_fil.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_lookup.h
@@ -29,8 +30,17 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/sys/types.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/syslimits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/unistd.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/wchar.h
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/altivec.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.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/iso646.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/stdalign.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdarg.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdatomic.h
@@ -42,7 +52,7 @@ 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%%/include/visintrin.h
+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
@@ -61,6 +71,7 @@ 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
@@ -104,12 +115,15 @@ 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/config/sparc/%%OPSYS%%.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-opts.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-protos.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sysv4.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.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
 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
@@ -158,9 +172,11 @@ 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
@@ -179,6 +195,7 @@ 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
@@ -190,10 +207,7 @@ 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-isl-ast-to-gimple.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/graphite-poly.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/graphite-scop-detection.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/graphite-sese-to-poly.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
@@ -201,14 +215,18 @@ 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
@@ -254,20 +272,28 @@ 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/omega.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
@@ -312,9 +338,11 @@ 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
@@ -328,6 +356,7 @@ 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
@@ -337,9 +366,9 @@ 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-browser.def
 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
@@ -351,6 +380,7 @@ 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
@@ -375,7 +405,9 @@ 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