From 54d040fb9c39a89d68d8de77e2da6b96b8c3c6ac Mon Sep 17 00:00:00 2001
From: "Lev A. Serebryakov" <lev@FreeBSD.org>
Date: Mon, 19 Sep 2005 12:48:52 +0000
Subject: [PATCH]   Update to version 2.16.1   Unbroke.

---
 devel/msp430-binutils/Makefile                |  25 ++--
 devel/msp430-binutils/distinfo                |   4 +-
 devel/msp430-binutils/files/patch-Makefile.in |  18 ++-
 .../files/patch-gas::config::tc-msp430.c      |  21 ---
 .../files/patch-ld::Makefile.am               |  55 -------
 .../files/patch-ld::Makefile.in               |  55 -------
 .../files/patch-ld::configure.tgt             |  11 --
 .../files/patch-ld::emulparams::msp430all.sh  | 101 -------------
 devel/msp430-binutils/pkg-plist               | 135 ++++++++++--------
 9 files changed, 101 insertions(+), 324 deletions(-)
 delete mode 100644 devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
 delete mode 100644 devel/msp430-binutils/files/patch-ld::Makefile.am
 delete mode 100644 devel/msp430-binutils/files/patch-ld::Makefile.in
 delete mode 100644 devel/msp430-binutils/files/patch-ld::configure.tgt
 delete mode 100644 devel/msp430-binutils/files/patch-ld::emulparams::msp430all.sh

diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 3fb050a91698..9d68b857a1d6 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -15,11 +15,7 @@ PKGNAMEPREFIX=	msp430-
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	GNU binutils for TI's msp430 MCUs cross-development
 
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	"${BROKEN}"
-EXPIRATION_DATE=2005-09-22
-
-BINUTILVERSION=	2.15
+BINUTILVERSION=	2.16.1
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -50,16 +46,21 @@ pre-configure:
 	${CHMOD} 755 ${WRKSRC}/configure
 
 post-install:
-# Register these too
-	install-info ${PREFIX}/${INFO_PATH}/configure.info ${PREFIX}/${INFO_PATH}/dir
-	install-info ${PREFIX}/${INFO_PATH}/standards.info ${PREFIX}/${INFO_PATH}/dir
-# This should go after all *.info stuff
-	${ECHO} "@unexec rm %D/${PKGNAMEPREFIX:S/-$//}/info/dir" >> ${TMPPLIST}
-	${ECHO} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
-	${ECHO} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
 .for F in ${BINARIES}
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
 
+#
+# UGLY HACK
+#
+add-plist-post:
+	@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
+.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
+.else
+	@${DO_NADA}
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/msp430-binutils/distinfo b/devel/msp430-binutils/distinfo
index c0456547f495..91d21b00ac1a 100644
--- a/devel/msp430-binutils/distinfo
+++ b/devel/msp430-binutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (binutils-2.15.tar.bz2) = 624e6b74983ac6b2960edaf2d522ca58
-SIZE (binutils-2.15.tar.bz2) = 11515075
+MD5 (binutils-2.16.1.tar.bz2) = 6a9d529efb285071dad10e1f3d2b2967
+SIZE (binutils-2.16.1.tar.bz2) = 12549917
diff --git a/devel/msp430-binutils/files/patch-Makefile.in b/devel/msp430-binutils/files/patch-Makefile.in
index 7d5d6c56f85f..0605e92ce38a 100644
--- a/devel/msp430-binutils/files/patch-Makefile.in
+++ b/devel/msp430-binutils/files/patch-Makefile.in
@@ -1,17 +1,21 @@
---- Makefile.in.orig	Mon May 17 23:38:54 2004
-+++ Makefile.in	Tue Aug  3 12:30:08 2004
-@@ -20126,10 +20126,10 @@
- maybe-install-libiberty:
+--- Makefile.in.orig	Mon Sep 19 15:59:39 2005
++++ Makefile.in	Mon Sep 19 15:59:54 2005
+@@ -13934,12 +13934,12 @@
+ maybe-install-libiberty: install-libiberty
  
  install-libiberty: installdirs
 -	@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)
 +#	@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-binutils/files/patch-gas::config::tc-msp430.c b/devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
deleted file mode 100644
index a0fe86af0654..000000000000
--- a/devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- gas/config/tc-msp430.c.orig	Tue Aug  3 12:55:44 2004
-+++ gas/config/tc-msp430.c	Tue Aug  3 12:55:52 2004
-@@ -119,6 +119,9 @@
-   {"msp430x167", MSP430_ISA_16, bfd_mach_msp16},
-   {"msp430x168", MSP430_ISA_16, bfd_mach_msp16},
-   {"msp430x169", MSP430_ISA_16, bfd_mach_msp16},
-+  {"msp430x1610", MSP430_ISA_16, bfd_mach_msp16},
-+  {"msp430x1611", MSP430_ISA_16, bfd_mach_msp16},
-+  {"msp430x1612", MSP430_ISA_16, bfd_mach_msp16},
- 
-   {"msp430x311", MSP430_ISA_31, bfd_mach_msp31},
-   {"msp430x312", MSP430_ISA_31, bfd_mach_msp31},
-@@ -132,6 +135,8 @@
- 
-   {"msp430x412", MSP430_ISA_41, bfd_mach_msp41},
-   {"msp430x413", MSP430_ISA_41, bfd_mach_msp41},
-+  {"msp430x415", MSP430_ISA_41, bfd_mach_msp41},
-+  {"msp430x417", MSP430_ISA_41, bfd_mach_msp41},
- 
-   {"msp430xE423", MSP430_ISA_42, bfd_mach_msp42},
-   {"msp430xE425", MSP430_ISA_42, bfd_mach_msp42},
diff --git a/devel/msp430-binutils/files/patch-ld::Makefile.am b/devel/msp430-binutils/files/patch-ld::Makefile.am
deleted file mode 100644
index 51f6cdab8210..000000000000
--- a/devel/msp430-binutils/files/patch-ld::Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
---- ld/Makefile.am.orig	Tue Aug  3 13:00:11 2004
-+++ ld/Makefile.am	Tue Aug  3 13:06:46 2004
-@@ -280,6 +280,9 @@
- 	emsp430x167.o \
- 	emsp430x168.o \
- 	emsp430x169.o \
-+	emsp430x1610.o \
-+	emsp430x1611.o \
-+	emsp430x1612.o \
- 	emsp430x311.o \
- 	emsp430x312.o \
- 	emsp430x313.o \
-@@ -291,6 +294,8 @@
- 	emsp430x337.o \
- 	emsp430x412.o \
- 	emsp430x413.o \
-+	emsp430x415.o \
-+	emsp430x417.o \
- 	emsp430xE423.o \
- 	emsp430xE425.o \
- 	emsp430xE427.o \
-@@ -1149,6 +1154,18 @@
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-   ${GEN_DEPENDS}
- 	${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)" msp430all
-+emsp430x1610.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x1610 "$(tdir_msp430x1610)" msp430all
-+emsp430x1611.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x1611 "$(tdir_msp430x1611)" msp430all
-+emsp430x1612.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x1612 "$(tdir_msp430x1612)" msp430all
- emsp430x311.c: $(srcdir)/emulparams/msp430all.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \
-   ${GEN_DEPENDS}
-@@ -1193,6 +1210,14 @@
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-   ${GEN_DEPENDS}
- 	${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)" msp430all
-+emsp430x415.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x415 "$(tdir_msp430x415)" msp430all
-+emsp430x417.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x417 "$(tdir_msp430x417)" msp430all
- emsp430xE423.c: $(srcdir)/emulparams/msp430all.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-   ${GEN_DEPENDS}
diff --git a/devel/msp430-binutils/files/patch-ld::Makefile.in b/devel/msp430-binutils/files/patch-ld::Makefile.in
deleted file mode 100644
index 7fa5d09ec2f4..000000000000
--- a/devel/msp430-binutils/files/patch-ld::Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
---- ld/Makefile.in.orig	Tue Aug  3 12:54:33 2004
-+++ ld/Makefile.in	Tue Aug  3 13:08:04 2004
-@@ -394,6 +394,9 @@
- 	emsp430x167.o \
- 	emsp430x168.o \
- 	emsp430x169.o \
-+	emsp430x1610.o \
-+	emsp430x1611.o \
-+	emsp430x1612.o \
- 	emsp430x311.o \
- 	emsp430x312.o \
- 	emsp430x313.o \
-@@ -405,6 +408,8 @@
- 	emsp430x337.o \
- 	emsp430x412.o \
- 	emsp430x413.o \
-+	emsp430x415.o \
-+	emsp430x417.o \
- 	emsp430xE423.o \
- 	emsp430xE425.o \
- 	emsp430xE427.o \
-@@ -1875,6 +1880,18 @@
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-   ${GEN_DEPENDS}
- 	${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)" msp430all
-+emsp430x1610.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x1610 "$(tdir_msp430x1610)" msp430all
-+emsp430x1611.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x1611 "$(tdir_msp430x1611)" msp430all
-+emsp430x1612.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x1612 "$(tdir_msp430x1612)" msp430all
- emsp430x311.c: $(srcdir)/emulparams/msp430all.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \
-   ${GEN_DEPENDS}
-@@ -1919,6 +1936,14 @@
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-   ${GEN_DEPENDS}
- 	${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)" msp430all
-+emsp430x415.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x415 "$(tdir_msp430x415)" msp430all
-+emsp430x417.c: $(srcdir)/emulparams/msp430all.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-+  ${GEN_DEPENDS}
-+	${GENSCRIPTS} msp430x417 "$(tdir_msp430x417)" msp430all
- emsp430xE423.c: $(srcdir)/emulparams/msp430all.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
-   ${GEN_DEPENDS}
diff --git a/devel/msp430-binutils/files/patch-ld::configure.tgt b/devel/msp430-binutils/files/patch-ld::configure.tgt
deleted file mode 100644
index 32487251871f..000000000000
--- a/devel/msp430-binutils/files/patch-ld::configure.tgt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ld/configure.tgt.orig	Tue Aug  3 13:08:56 2004
-+++ ld/configure.tgt	Tue Aug  3 13:14:06 2004
-@@ -449,7 +449,7 @@
- mn10200-*-*)		targ_emul=mn10200 ;;
- mn10300-*-*)		targ_emul=mn10300 ;;
- msp430-*-*)             targ_emul=msp430x110
--                        targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449" ;;
-+                        targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x1610 msp430x1611 msp430x1612 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430x415 msp430x417 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449" ;;
- alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 		        targ_emul=elf64alpha_fbsd
- 			targ_extra_emuls="elf64alpha alpha"
diff --git a/devel/msp430-binutils/files/patch-ld::emulparams::msp430all.sh b/devel/msp430-binutils/files/patch-ld::emulparams::msp430all.sh
deleted file mode 100644
index 1e3656face19..000000000000
--- a/devel/msp430-binutils/files/patch-ld::emulparams::msp430all.sh
+++ /dev/null
@@ -1,101 +0,0 @@
---- ld/emulparams/msp430all.sh.orig	Tue Aug  3 13:18:33 2004
-+++ ld/emulparams/msp430all.sh	Tue Aug  3 13:26:30 2004
-@@ -412,6 +412,57 @@
- STACK=0xa00
- fi
- 
-+if [ "${MSP430_NAME}" = "msp430x1610" ] ; then
-+ARCH=msp:16
-+MACHINE=
-+SCRIPT_NAME=elf32msp430
-+OUTPUT_FORMAT="elf32-msp430"
-+MAXPAGESIZE=1
-+EMBEDDED=yes
-+TEMPLATE_NAME=generic
-+
-+ROM_START=0x8000
-+ROM_SIZE=0x7fe0
-+RAM_START=0x1100
-+RAM_SIZE=0x13ff
-+
-+STACK=0x1400
-+fi
-+
-+if [ "${MSP430_NAME}" = "msp430x1611" ] ; then
-+ARCH=msp:16
-+MACHINE=
-+SCRIPT_NAME=elf32msp430
-+OUTPUT_FORMAT="elf32-msp430"
-+MAXPAGESIZE=1
-+EMBEDDED=yes
-+TEMPLATE_NAME=generic
-+
-+ROM_START=0x4000
-+ROM_SIZE=0xbfe0
-+RAM_START=0x1100
-+RAM_SIZE=0x27ff
-+
-+STACK=0x2800
-+fi
-+
-+if [ "${MSP430_NAME}" = "msp430x1612" ] ; then
-+ARCH=msp:16
-+MACHINE=
-+SCRIPT_NAME=elf32msp430
-+OUTPUT_FORMAT="elf32-msp430"
-+MAXPAGESIZE=1
-+EMBEDDED=yes
-+TEMPLATE_NAME=generic
-+
-+ROM_START=0x2800
-+ROM_SIZE=0xd7e0
-+RAM_START=0x1100
-+RAM_SIZE=0x13ff
-+
-+STACK=0x1400
-+fi
-+
- if [ "${MSP430_NAME}" = "msp430x311" ] ; then
- ARCH=msp:31
- MACHINE=
-@@ -597,6 +648,40 @@
- RAM_SIZE=256
- 
- STACK=0x300
-+fi
-+
-+if [ "${MSP430_NAME}" = "msp430x415" ] ; then
-+ARCH=msp:41
-+MACHINE=
-+SCRIPT_NAME=elf32msp430
-+OUTPUT_FORMAT="elf32-msp430"
-+MAXPAGESIZE=1
-+EMBEDDED=yes
-+TEMPLATE_NAME=generic
-+
-+ROM_START=0xc000
-+ROM_SIZE=0x3fe0
-+RAM_START=0x0200
-+RAM_SIZE=512
-+
-+STACK=0x400
-+fi
-+
-+if [ "${MSP430_NAME}" = "msp430x417" ] ; then
-+ARCH=msp:41
-+MACHINE=
-+SCRIPT_NAME=elf32msp430
-+OUTPUT_FORMAT="elf32-msp430"
-+MAXPAGESIZE=1
-+EMBEDDED=yes
-+TEMPLATE_NAME=generic
-+
-+ROM_START=0x8000
-+ROM_SIZE=0x7fe0
-+RAM_START=0x0200
-+RAM_SIZE=1024
-+
-+STACK=0x600
- fi
- 
- if [ "${MSP430_NAME}" = "msp430x435" ] ; then
diff --git a/devel/msp430-binutils/pkg-plist b/devel/msp430-binutils/pkg-plist
index cec58dc13d98..4b1e488d4aa9 100644
--- a/devel/msp430-binutils/pkg-plist
+++ b/devel/msp430-binutils/pkg-plist
@@ -1,4 +1,17 @@
-@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.8 2004-04-06 08:55:48 lev Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.9 2005-09-19 12:48:51 lev Exp $
+bin/%%BINUTILS_TARG%%-addr2line
+bin/%%BINUTILS_TARG%%-ar
+bin/%%BINUTILS_TARG%%-as
+bin/%%BINUTILS_TARG%%-c++filt
+bin/%%BINUTILS_TARG%%-ld
+bin/%%BINUTILS_TARG%%-nm
+bin/%%BINUTILS_TARG%%-objcopy
+bin/%%BINUTILS_TARG%%-objdump
+bin/%%BINUTILS_TARG%%-ranlib
+bin/%%BINUTILS_TARG%%-readelf
+bin/%%BINUTILS_TARG%%-size
+bin/%%BINUTILS_TARG%%-strings
+bin/%%BINUTILS_TARG%%-strip
 %%BINUTILS_TARG%%/bin/addr2line
 %%BINUTILS_TARG%%/bin/ar
 %%BINUTILS_TARG%%/bin/as
@@ -9,9 +22,9 @@
 %%BINUTILS_TARG%%/bin/objdump
 %%BINUTILS_TARG%%/bin/ranlib
 %%BINUTILS_TARG%%/bin/readelf
-%%BINUTILS_TARG%%/bin/strip
 %%BINUTILS_TARG%%/bin/size
 %%BINUTILS_TARG%%/bin/strings
+%%BINUTILS_TARG%%/bin/strip
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x110.x
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x110.xbn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x110.xn
@@ -117,21 +130,6 @@
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x157.xn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x157.xr
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x157.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xu
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1610.x
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1610.xbn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1610.xn
@@ -147,6 +145,21 @@
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1612.xn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1612.xr
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1612.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x167.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x168.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x169.xu
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x311.x
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x311.xbn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x311.xn
@@ -212,36 +225,6 @@
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x417.xn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x417.xr
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x417.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xu
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.x
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xn
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xr
-%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xu
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x435.x
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x435.xbn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x435.xn
@@ -272,19 +255,51 @@
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x449.xn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x449.xr
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x449.xu
-bin/%%BINUTILS_TARG%%-addr2line
-bin/%%BINUTILS_TARG%%-ar
-bin/%%BINUTILS_TARG%%-as
-bin/%%BINUTILS_TARG%%-c++filt
-bin/%%BINUTILS_TARG%%-ld
-bin/%%BINUTILS_TARG%%-nm
-bin/%%BINUTILS_TARG%%-objcopy
-bin/%%BINUTILS_TARG%%-objdump
-bin/%%BINUTILS_TARG%%-ranlib
-bin/%%BINUTILS_TARG%%-readelf
-bin/%%BINUTILS_TARG%%-strip
-bin/%%BINUTILS_TARG%%-size
-bin/%%BINUTILS_TARG%%-strings
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE423.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE425.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xE427.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG437.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG437.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG437.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG437.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG437.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG438.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG438.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG438.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG438.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG438.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG439.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG439.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG439.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG439.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xG439.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW423.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW425.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430xW427.xu
 @dirrm %%BINUTILS_TARG%%/bin
 @dirrm %%BINUTILS_TARG%%/lib/ldscripts
 @dirrm %%BINUTILS_TARG%%/lib