Update binutils to 2.13.2.1. "gasp" is gone; "strings" accepts an

argument of "--encoding", to help it to look for wide strings; plus
a few other obscure additions. Most importantly, "gas" now generates
correct code when used with gcc-3.x at high optimization levels.
(See gcc bugzilla: optimization/10877.)

8 files changed, 119 insertions, 95 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 8e2b06ff297..9541a43f037 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/06/02 01:20:58 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/08 20:17:13 fredb Exp $
 #
 
-DISTNAME=	binutils-2.11.2
+DISTNAME=	binutils-2.13.2.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
 
@@ -9,16 +9,9 @@ MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www.gnu.org/directory/binutils.html
 COMMENT=	GNU binary utilities
 
-CONFLICTS=	ddd<=3.3	# libiberty.a
-
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-PATCHFILES=	binutils-NetBSD-diff-20020418.patch.bz2
-PATCH_SITES=	${MASTER_SITE_LOCAL}
 PLIST_SRC=	${PKGDIR}/PLIST.common
 PLIST_SRC+=	${WRKDIR}/PLIST_DYNAMIC
 PLIST_SRC+=	${PKGDIR}/PLIST.common_end
@@ -27,6 +20,5 @@ post-install:
 	${FIND} ${PREFIX}/${MACHINE_GNU_PLATFORM}/lib/ldscripts -type f -print | \
 		${SORT} -r | ${SED} 's;${PREFIX}/;;g' > ${WRKDIR}/PLIST_DYNAMIC
 
-.endif
-
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/binutils/PLIST b/devel/binutils/PLIST
deleted file mode 100644
index 8db5800cfa3..00000000000
--- a/devel/binutils/PLIST
+++ /dev/null
@@ -1,48 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/25 16:53:51 grant Exp $
-${MACHINE_GNU_PLATFORM}/bin/ar
-${MACHINE_GNU_PLATFORM}/bin/as
-${MACHINE_GNU_PLATFORM}/bin/ld
-${MACHINE_GNU_PLATFORM}/bin/nm
-${MACHINE_GNU_PLATFORM}/bin/ranlib
-${MACHINE_GNU_PLATFORM}/bin/strip
-bin/addr2line
-bin/ar
-bin/as
-bin/c++filt
-bin/gasp
-bin/gprof
-bin/ld
-bin/nm
-bin/objcopy
-bin/objdump
-bin/ranlib
-bin/readelf
-bin/size
-bin/strings
-bin/strip
-include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
-lib/libbfd.a
-lib/libbfd.la
-lib/libiberty.a
-lib/libopcodes.a
-lib/libopcodes.la
-man/man1/addr2line.1
-man/man1/ar.1
-man/man1/as.1
-man/man1/c++filt.1
-man/man1/gprof.1
-man/man1/ld.1
-man/man1/nlmconv.1
-man/man1/nm.1
-man/man1/objcopy.1
-man/man1/objdump.1
-man/man1/ranlib.1
-man/man1/size.1
-man/man1/strings.1
-man/man1/strip.1
-@dirrm ${MACHINE_GNU_PLATFORM}/lib/ldscripts
-@dirrm ${MACHINE_GNU_PLATFORM}/lib
-@dirrm ${MACHINE_GNU_PLATFORM}/bin
-@dirrm ${MACHINE_GNU_PLATFORM}
diff --git a/devel/binutils/PLIST.Linux b/devel/binutils/PLIST.Linux
deleted file mode 100644
index b0727e5c9ae..00000000000
--- a/devel/binutils/PLIST.Linux
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2003/02/16 19:56:06 jschauma Exp $
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf_${MACHINE_ARCH}.x
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf_${MACHINE_ARCH}.xbn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf_${MACHINE_ARCH}.xn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf_${MACHINE_ARCH}.xr
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf_${MACHINE_ARCH}.xs
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf_${MACHINE_ARCH}.xu
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/${MACHINE_ARCH}${LOWER_OPSYS}.x
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/${MACHINE_ARCH}${LOWER_OPSYS}.xbn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/${MACHINE_ARCH}${LOWER_OPSYS}.xn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/${MACHINE_ARCH}${LOWER_OPSYS}.xr
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/${MACHINE_ARCH}${LOWER_OPSYS}.xu
diff --git a/devel/binutils/PLIST.SunOS b/devel/binutils/PLIST.SunOS
deleted file mode 100644
index 8b57f8eec9c..00000000000
--- a/devel/binutils/PLIST.SunOS
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.3 2002/12/25 16:53:51 grant Exp $
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.x
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.xbn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.xn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.xr
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.xs
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.xu
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.x
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xbn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xn
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xr
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xs
-${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xu
diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common
index 0b927bbd3da..d018039bfce 100644
--- a/devel/binutils/PLIST.common
+++ b/devel/binutils/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2002/12/25 16:53:51 grant Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2003/06/08 20:17:14 fredb Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
@@ -9,7 +9,6 @@ bin/addr2line
 bin/ar
 bin/as
 bin/c++filt
-bin/gasp
 bin/gprof
 bin/ld
 bin/nm
@@ -23,15 +22,66 @@ bin/strip
 include/ansidecl.h
 include/bfd.h
 include/bfdlink.h
+include/dis-asm.h
+include/symcat.h
+@unexec ${INSTALL_INFO} --delete %D/info/as.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/bfd.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/binutils.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gprof.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/ld.info %D/info/dir
+info/as.info
+info/as.info-1
+info/as.info-10
+info/as.info-11
+info/as.info-2
+info/as.info-3
+info/as.info-4
+info/as.info-5
+info/as.info-6
+info/as.info-7
+info/as.info-8
+info/as.info-9
+info/bfd.info
+info/bfd.info-1
+info/bfd.info-2
+info/bfd.info-3
+info/bfd.info-4
+info/bfd.info-5
+info/bfd.info-6
+info/bfd.info-7
+info/bfd.info-8
+info/bfd.info-9
+info/binutils.info
+info/binutils.info-1
+info/binutils.info-2
+info/binutils.info-3
+info/gprof.info
+info/gprof.info-1
+info/gprof.info-2
+info/gprof.info-3
+info/ld.info
+info/ld.info-1
+info/ld.info-2
+info/ld.info-3
+info/ld.info-4
+info/ld.info-5
+info/ld.info-6
+@exec ${INSTALL_INFO} %D/info/as.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/bfd.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/binutils.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/configure.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gprof.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/ld.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/standards.info %D/info/dir
 lib/libbfd.a
 lib/libbfd.la
-lib/libiberty.a
 lib/libopcodes.a
 lib/libopcodes.la
 man/man1/addr2line.1
 man/man1/ar.1
 man/man1/as.1
 man/man1/c++filt.1
+man/man1/dlltool.1
 man/man1/gprof.1
 man/man1/ld.1
 man/man1/nlmconv.1
@@ -39,6 +89,42 @@ man/man1/nm.1
 man/man1/objcopy.1
 man/man1/objdump.1
 man/man1/ranlib.1
+man/man1/readelf.1
 man/man1/size.1
 man/man1/strings.1
 man/man1/strip.1
+man/man1/windres.1
+share/locale/da/LC_MESSAGES/bfd.mo
+share/locale/da/LC_MESSAGES/binutils.mo
+share/locale/da/LC_MESSAGES/gprof.mo
+share/locale/da/LC_MESSAGES/opcodes.mo
+share/locale/de/LC_MESSAGES/opcodes.mo
+share/locale/es/LC_MESSAGES/bfd.mo
+share/locale/es/LC_MESSAGES/binutils.mo
+share/locale/es/LC_MESSAGES/gas.mo
+share/locale/es/LC_MESSAGES/gprof.mo
+share/locale/es/LC_MESSAGES/ld.mo
+share/locale/es/LC_MESSAGES/opcodes.mo
+share/locale/fr/LC_MESSAGES/bfd.mo
+share/locale/fr/LC_MESSAGES/binutils.mo
+share/locale/fr/LC_MESSAGES/gas.mo
+share/locale/fr/LC_MESSAGES/gprof.mo
+share/locale/fr/LC_MESSAGES/ld.mo
+share/locale/fr/LC_MESSAGES/opcodes.mo
+share/locale/id/LC_MESSAGES/gprof.mo
+share/locale/id/LC_MESSAGES/opcodes.mo
+share/locale/ja/LC_MESSAGES/bfd.mo
+share/locale/ja/LC_MESSAGES/binutils.mo
+share/locale/pt_BR/LC_MESSAGES/gprof.mo
+share/locale/pt_BR/LC_MESSAGES/opcodes.mo
+share/locale/sv/LC_MESSAGES/bfd.mo
+share/locale/sv/LC_MESSAGES/binutils.mo
+share/locale/sv/LC_MESSAGES/gprof.mo
+share/locale/sv/LC_MESSAGES/ld.mo
+share/locale/sv/LC_MESSAGES/opcodes.mo
+share/locale/tr/LC_MESSAGES/bfd.mo
+share/locale/tr/LC_MESSAGES/binutils.mo
+share/locale/tr/LC_MESSAGES/gas.mo
+share/locale/tr/LC_MESSAGES/gprof.mo
+share/locale/tr/LC_MESSAGES/ld.mo
+share/locale/tr/LC_MESSAGES/opcodes.mo
diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
index 14fecc96999..7b0c08ae70b 100644
--- a/devel/binutils/buildlink2.mk
+++ b/devel/binutils/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/10/29 06:53:45 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/06/08 20:17:14 fredb Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILDLINK_DEPENDS.binutils?=		binutils>=2.11.2
+BUILDLINK_DEPENDS.binutils?=		binutils>=2.13.2.1
 BUILDLINK_PKGSRCDIR.binutils?=		../../devel/binutils
 BUILDLINK_DEPMETHOD.binutils?=		build
 
@@ -50,7 +50,7 @@ BUILDLINK_FILES.binutils+=	include/ansidecl.h
 BUILDLINK_FILES.binutils+=	include/bfd.h
 BUILDLINK_FILES.binutils+=	include/bfdlink.h
 BUILDLINK_FILES.binutils+=	lib/libbfd.*
-BUILDLINK_FILES.binutils+=	lib/libiberty.*
+#BUILDLINK_FILES.binutils+=	lib/libiberty.*
 BUILDLINK_FILES.binutils+=	lib/libopcodes.*
 
 binutils-buildlink: _BUILDLINK_USE
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index 333d267e352..72f59ee8f5a 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/04/30 12:33:29 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/06/08 20:17:14 fredb Exp $
 
-SHA1 (binutils-2.11.2.tar.gz) = 4095688f3478e8d4693ad2b965008a49f033e08f
-Size (binutils-2.11.2.tar.gz) = 9934295 bytes
-SHA1 (binutils-NetBSD-diff-20020418.patch.bz2) = d3a2f7c22c0168821c2544a7485dc886bc3ad07c
-Size (binutils-NetBSD-diff-20020418.patch.bz2) = 121943 bytes
+SHA1 (binutils-2.13.2.1.tar.gz) = d13624807c6b47fec870096a65d47cce4cf82370
+Size (binutils-2.13.2.1.tar.gz) = 12980018 bytes
+SHA1 (patch-aa) = 21274b6e870338ec2c56ddc1ba91ffa39d536118
diff --git a/devel/binutils/patches/patch-aa b/devel/binutils/patches/patch-aa
new file mode 100644
index 00000000000..be8fb33d41c
--- /dev/null
+++ b/devel/binutils/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2003/06/08 20:17:14 fredb Exp $
+
+--- Makefile.in.orig	Wed Jan  1 19:24:13 2003
++++ Makefile.in
+@@ -678,7 +678,6 @@ INSTALL_MODULES = \
+ 	install-dejagnu \
+ 	install-diff \
+ 	install-dosutils \
+-	install-etc \
+ 	install-fastjar \
+ 	install-fileutils \
+ 	install-findutils \
+@@ -698,7 +697,6 @@ INSTALL_MODULES = \
+ 	install-itcl \
+ 	install-ld \
+ 	install-libgui \
+-	install-libiberty \
+ 	install-libtool \
+ 	install-m4 \
+ 	install-make \