7 files changed, 266 insertions, 62 deletions

diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 70a7dd964419..ace86c6597e8 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -6,39 +6,59 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	${GCCVERSION}.${PATCHVERSION}
+PORTVERSION=	${GCCVERSION}.${MSPGCCVERSION}
 PORTEPOCH=	2
 CATEGORIES=	devel
+DISTNAME=	${PORTNAME}-${GCCVERSION}
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
-		http://lev.serebryakov.spb.ru/download/msp430/:patches
+		SF/mspgcc/mspgcc:mspgcc
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
 PKGNAMEPREFIX=	msp430-
 DISTFILES=	${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
-		${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}.${PATCHVERSION}${EXTRACT_SUFX}:patches
+		${PORTNAME}-g++-${GCCVERSION}${EXTRACT_SUFX} \
+		mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
 
 MAINTAINER=	lev@FreeBSD.org
-COMMENT=	FSF gcc-3.4 for TI's msp430 MCUs cross-development
+COMMENT=	FSF gcc-4.5 for TI's msp430 MCUs cross-development
+LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
+LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
+		mpfr.4:${PORTSDIR}/math/mpfr \
+		mpc.2:${PORTSDIR}/math/mpc
 
-GCCVERSION=	3.4.4
-PATCHVERSION=	20050317
+CONFLICTS=	msp430-gcc-3.*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
+GCCVERSION=	4.5.3
+MSPGCCVERSION=	20110716
+PATCHVERSION=	20110706
+
+SRCDIR=         ${WRKDIR}/${PORTNAME}-${GCCVERSION}
+WRKSRC=         ${WRKDIR}/build
+PATCH_WRKSRC=	${SRCDIR}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_BISON=	build
+USE_ICONV=	yes
 USE_PERL5_BUILD=yes
+MAKE_JOBS_SAFE=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
-		--with-gcc --with-gnu-ld --with-gnu-as \
-		--enable-languages=c --disable-nls
+CONFIGURE_SCRIPT=../${SRCDIR:S/${WRKDIR}\///}/configure
+CONFIGURE_ARGS+=--target=${PKGNAMEPREFIX:S/-$//} \
+		--enable-languages=c,c++ \
+		--with-gmp=${LOCALBASE} --with-mpfr=${LOCALBASE} \
+		--with-mpc=${LOCALBASE} --with-libiconv-prefix=${LOCALBASE} \
+		--with-system-zlib --disable-nls \
+		--with-pkgversion="MSPGCC_${MSPGCCVERSION}"
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
-MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
+MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 \
+		${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 		GCC_REV=${GCCVERSION}
@@ -46,13 +66,19 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 INFO=		cpp cppinternals gcc gccinstall gccint
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
-BINARIES=	gcc gcc-${GCCVERSION} gcov cpp
+BINARIES=	gcc gcc-${GCCVERSION} c++ g++ gcov cpp
 
 .include <bsd.port.pre.mk>
 
+pre-patch:
+	@cd ${SRCDIR} && ${PATCH} -s -p1 < ../mspgcc-${MSPGCCVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}-${PATCHVERSION}.patch
+
+pre-configure:
+	cd ${SRCDIR} ; contrib/gcc_update --touch
+	@${MKDIR} ${CONFIGURE_WRKSRC}
+
 post-configure:
 	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile
-#	@${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,' ${WRKSRC}/gcc/Makefile
 
 post-install:
 .for F in ${BINARIES}
diff --git a/devel/msp430-gcc/distinfo b/devel/msp430-gcc/distinfo
index ddfdf62c312a..deb01c567712 100644
--- a/devel/msp430-gcc/distinfo
+++ b/devel/msp430-gcc/distinfo
@@ -1,4 +1,6 @@
-SHA256 (gcc-core-3.4.4.tar.bz2) = a390ca6123fe71c665f4422e124ced31efbbe98dd08e8f8d171caeba892ab472
-SIZE (gcc-core-3.4.4.tar.bz2) = 13153342
-SHA256 (msp430-gcc-3.4.4.20050317.tar.bz2) = 3ea247fea72b2a4280ae6bbb9028bda84b48fbaae23a1e8332a87f3e16d31ffe
-SIZE (msp430-gcc-3.4.4.20050317.tar.bz2) = 139578
+SHA256 (gcc-core-4.5.3.tar.bz2) = fef7ef1396d41f4af2dacbea8826a895060a8a72d9f05546c091085b036f1f87
+SIZE (gcc-core-4.5.3.tar.bz2) = 28252641
+SHA256 (gcc-g++-4.5.3.tar.bz2) = e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb09210ab7bad080804b
+SIZE (gcc-g++-4.5.3.tar.bz2) = 6475820
+SHA256 (mspgcc-20110716.tar.bz2) = 6e28c2f4976933fc2663751192bc365c68705071908c1c92c03dad2667d74044
+SIZE (mspgcc-20110716.tar.bz2) = 371880
diff --git a/devel/msp430-gcc/files/patch-Makefile.in b/devel/msp430-gcc/files/patch-Makefile.in
index 02ba348652f8..fbfae99c1dbb 100644
--- a/devel/msp430-gcc/files/patch-Makefile.in
+++ b/devel/msp430-gcc/files/patch-Makefile.in
@@ -1,17 +1,37 @@
---- Makefile.in.orig	Tue Aug  3 13:53:30 2004
-+++ Makefile.in	Tue Aug  3 13:53:56 2004
-@@ -19885,10 +19885,10 @@
- maybe-install-libiberty:
+--- Makefile.in.orig	2009-04-25 08:10:29.000000000 +0400
++++ Makefile.in	2011-06-22 00:04:31.000000000 +0400
+@@ -2611,7 +2611,6 @@
+     maybe-install-libcpp \
+     maybe-install-libdecnumber \
+     maybe-install-libgui \
+-    maybe-install-libiberty \
+     maybe-install-libiconv \
+     maybe-install-libtool \
+     maybe-install-m4 \
+@@ -2688,7 +2687,6 @@
+     maybe-install-libcpp \
+     maybe-install-libdecnumber \
+     maybe-install-libgui \
+-    maybe-install-libiberty \
+     maybe-install-libiconv \
+     maybe-install-libtool \
+     maybe-install-m4 \
+@@ -28741,12 +28739,12 @@
+ maybe-install-libiberty: install-libiberty
  
  install-libiberty: installdirs
+-	@: $(MAKE); $(unstage)
 -	@r=`${PWD_COMMAND}`; export r; \
 -	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(SET_LIB_PATH) \
--	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
+-	$(HOST_EXPORTS) \
+-	(cd $(HOST_SUBDIR)/libiberty && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  install)
++#	@: $(MAKE); $(unstage)
 +#	@r=`${PWD_COMMAND}`; export r; \
 +#	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+#	$(SET_LIB_PATH) \
-+#	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
++#	$(HOST_EXPORTS) \
++#	(cd $(HOST_SUBDIR)/libiberty && \
++#	  $(MAKE) $(FLAGS_TO_PASS)  install)
  
+ @endif libiberty
  
- .PHONY: configure-libtool maybe-configure-libtool
diff --git a/devel/msp430-gcc/files/patch-gcc-Makefile.in b/devel/msp430-gcc/files/patch-gcc-Makefile.in
index e27352523b1b..307638274676 100644
--- a/devel/msp430-gcc/files/patch-gcc-Makefile.in
+++ b/devel/msp430-gcc/files/patch-gcc-Makefile.in
@@ -1,12 +1,23 @@
---- gcc/Makefile.in.orig	Tue Aug  3 13:57:27 2004
-+++ gcc/Makefile.in	Tue Aug  3 13:57:39 2004
-@@ -2963,9 +2963,6 @@
+--- gcc/Makefile.in.orig	2011-07-11 19:12:56.000000000 +0400
++++ gcc/Makefile.in	2011-07-11 19:14:01.000000000 +0400
+@@ -4103,7 +4103,7 @@
+ 	DESTDIR=$(@D) \
+ 	$(SHELL) $(srcdir)/doc/install.texi2html
+ 
+-MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 doc/fsf-funding.7
++MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1
+ 
+ generated-manpages: man
+ 
+@@ -4438,10 +4438,7 @@
+ install-man: lang.install-man \
  	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
  	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
- 	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
+-	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
 -	$(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
 -	$(DESTDIR)$(man7dir)/gfdl$(man7ext) \
 -	$(DESTDIR)$(man7dir)/gpl$(man7ext)
++	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
  
- $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
+ $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7 installdirs
  	-rm -f $@
diff --git a/devel/msp430-gcc/files/patch-gcc-config-msp430-msp430.c b/devel/msp430-gcc/files/patch-gcc-config-msp430-msp430.c
deleted file mode 100644
index 4eae66bf7d65..000000000000
--- a/devel/msp430-gcc/files/patch-gcc-config-msp430-msp430.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc/config/msp430/msp430.c.orig	Mon Sep 19 17:03:53 2005
-+++ gcc/config/msp430/msp430.c	Mon Sep 19 17:04:11 2005
-@@ -149,6 +149,7 @@
-   MSP430_ISA_14 = 14,
-   MSP430_ISA_15 = 15,
-   MSP430_ISA_16 = 16,
-+  MSP430_ISA_210 = 210,
-   MSP430_ISA_31 = 31,
-   MSP430_ISA_32 = 32,
-   MSP430_ISA_33 = 33,
diff --git a/devel/msp430-gcc/pkg-descr b/devel/msp430-gcc/pkg-descr
index d0fd961be09d..caf7284a19ab 100644
--- a/devel/msp430-gcc/pkg-descr
+++ b/devel/msp430-gcc/pkg-descr
@@ -1,4 +1,4 @@
-FSF gcc-3.3 for TI's msp430 MCUs cross-development
+FSF gcc-4.5 for TI's msp430 MCUs cross-development
 
 This brings the gcc compiler for the Texas Instruments MSP430 16-bit
 RISC-like family of microcontrollers.
diff --git a/devel/msp430-gcc/pkg-plist b/devel/msp430-gcc/pkg-plist
index 7615dabc3079..a9462e31ca1c 100644
--- a/devel/msp430-gcc/pkg-plist
+++ b/devel/msp430-gcc/pkg-plist
@@ -1,50 +1,205 @@
+%%GCC_TARG%%/bin/c++
 %%GCC_TARG%%/bin/cpp
 %%GCC_TARG%%/bin/gcc
 %%GCC_TARG%%/bin/gcc-%%GCC_REV%%
+%%GCC_TARG%%/bin/g++
 %%GCC_TARG%%/bin/gcov
+bin/%%GCC_TARG%%-c++
 bin/%%GCC_TARG%%-cpp
 bin/%%GCC_TARG%%-gcc
 bin/%%GCC_TARG%%-gcc-%%GCC_REV%%
+bin/%%GCC_TARG%%-g++
 bin/%%GCC_TARG%%-gccbug
 bin/%%GCC_TARG%%-gcov
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/README
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/crt0ivtbl16.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/crt0ivtbl32.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/crt0ivtbl64.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include-fixed/README
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include-fixed/limits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include-fixed/syslimits.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/float.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/iso646.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/limits.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stdarg.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stdbool.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stddef.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stdfix.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/tgmath.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/unwind.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/varargs.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders.conf
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/float.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/iso646.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/fixinc_list
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/gsyslimits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/README
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/limits.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdarg.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdbool.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stddef.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/unwind.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/varargs.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/macro_list
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders.conf
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libcrt0.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libcrt0dwdt.a
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libgcov.a
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcc.a
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcov.a
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcc.a
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcov.a
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/specs
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/crt0ivtbl16.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/crt0ivtbl32.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/crt0ivtbl64.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/libcrt0.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/libcrt0dwdt.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16/crt0ivtbl16.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16/crt0ivtbl32.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16/crt0ivtbl64.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16/libcrt0.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16/libcrt0dwdt.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16/crt0ivtbl16.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16/crt0ivtbl32.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16/crt0ivtbl64.o
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16/libcrt0.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16/libcrt0dwdt.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/alias.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/all-tree.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ansidecl.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/auto-host.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/b-header-vars
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/basic-block.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/bitmap.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/builtins.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/bversion.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-common.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-common.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-pragma.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-pretty-print.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cfghooks.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cfgloop.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cgraph.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cif-code.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config/%%GCC_TARG%%/%%GCC_TARG%%-protos.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config/%%GCC_TARG%%/%%GCC_TARG%%.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config/dbxelf.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/configargs.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/coretypes.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cp/cp-tree.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cp/cp-tree.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cp/cxx-pretty-print.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cp/name-lookup.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cppdefault.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cpplib.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/debug.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/defaults.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/diagnostic.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/diagnostic.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/double-int.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/emit-rtl.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/except.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/filenames.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/fixed-value.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/flags.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/function.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/gcc-plugin.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/genrtl.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ggc.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/gimple.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/gimple.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/gsstruct.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/gtype-desc.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/hard-reg-set.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/hashtab.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/highlev-plugin-common.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/hwint.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/incpath.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/input.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/insn-constants.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/insn-flags.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/insn-modes.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/insn-notes.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/intl.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-prop.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-reference.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-utils.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/langhooks.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/libiberty.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/line-map.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/machmode.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/md5.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/mode-classes.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/obstack.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/omp-builtins.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/options.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/opts.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/output.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/params.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/params.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/partition.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/plugin-version.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/plugin.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/plugin.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/pointer-set.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/predict.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/predict.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/prefix.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/pretty-print.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/real.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/reg-notes.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/rtl.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/rtl.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/safe-ctype.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/sbitmap.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/splay-tree.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/statistics.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/symtab.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/sync-builtins.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/system.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/target.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/timevar.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/timevar.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tm-preds.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tm.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tm_p.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/toplev.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-check.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-dump.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-flow-inline.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-flow.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-inline.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-iterator.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-pass.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-ssa-alias.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-ssa-operands.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-ssa-sccvn.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/treestruct.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/varray.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/vec.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/vecprim.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/version.h
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/cc1
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/cc1plus
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/collect2
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/lto-wrapper
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/lto1
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/fixinc.sh
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/fixincl
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkinstalldirs
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include-fixed
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
-@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1
-@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config/%%GCC_TARG%%
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cp
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%
-@dirrm lib/gcc/%%GCC_TARG%%
+@dirrmtry lib/gcc/%%GCC_TARG%%
 @dirrmtry lib/gcc
 @dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
 @dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%
-@dirrm libexec/gcc/%%GCC_TARG%%
+@dirrmtry libexec/gcc/%%GCC_TARG%%
 @dirrmtry libexec/gcc
-