Adjust after update of cross/binutils, and bump PKGREVISION

for the packages depending on it.

15 files changed, 35 insertions, 603 deletions

diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index b82868e8aa6..a4505daf5b6 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: cross.mk,v 1.28 2004/07/06 22:51:34 wiz Exp $
+#	$NetBSD: cross.mk,v 1.29 2004/07/09 20:48:15 kristerw Exp $
 
 # Shared definitions for building a cross-compile environment.
 
@@ -27,7 +27,7 @@ pre-install-dirs:
 	${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
 
 .if defined(USE_CROSS_BINUTILS)
-BINUTILS_DISTNAME=	binutils-2.9.1
+BINUTILS_DISTNAME=	binutils-2.15
 BINUTILS_WRKSRC=	${WRKDIR}/${BINUTILS_DISTNAME}
 
 # Don't use optimizations taken from /etc/mk.conf for the native compiler
@@ -37,7 +37,7 @@ CXXFLAGS=		# empty
 CROSS_DISTFILES+=	${BINUTILS_DISTNAME}.tar.gz
 MASTER_SITES+=		${MASTER_SITE_GNU:=binutils/}
 CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
-DEPENDS+=		cross-binutils>=2.9.1.1:../../cross/binutils
+DEPENDS+=		cross-binutils>=2.15.0.0:../../cross/binutils
 PLIST_PRE+=		${COMMON_DIR}/PLIST-binutils
 
 AS_FOR_TARGET=		${BINUTILS_WRKSRC}/gas/as-new
@@ -63,12 +63,18 @@ binutils-configure:
 		CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} ./configure \
 		--prefix=${PREFIX} --host=${MACHINE_GNU_ARCH}--netbsd \
 		--target=${TARGET_ARCH} ${BFD64ARG}
+	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-bfd
+	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-libiberty
+	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-intl
+	cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-gas
 
 binutils-build:
 	@cd ${BINUTILS_WRKSRC}/bfd && ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} bfd.h
 	@cd ${BINUTILS_WRKSRC}/libiberty && ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} all
+	@cd ${BINUTILS_WRKSRC}/intl && ${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} all
 	@cd ${BINUTILS_WRKSRC}/gas && ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} as-new
 	${TEST} -x ${WRKDIR}/ar || ${LINK.c} -o ${WRKDIR}/ar \
diff --git a/cross/COMMON/patches-binutils/patch-aa b/cross/COMMON/patches-binutils/patch-aa
index 6201c47aacc..74d3e29a9f1 100644
--- a/cross/COMMON/patches-binutils/patch-aa
+++ b/cross/COMMON/patches-binutils/patch-aa
@@ -1,21 +1,13 @@
-$NetBSD: patch-aa,v 1.1 1999/01/04 22:37:30 tv Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/09 20:48:15 kristerw Exp $
 
---- gas/Makefile.in.orig	Mon Jan  4 00:34:23 1999
-+++ gas/Makefile.in	Mon Jan  4 00:37:14 1999
-@@ -452,14 +452,14 @@
+--- gas/Makefile.in.orig	Sat Jul  3 02:57:14 2004
++++ gas/Makefile.in	Sat Jul  3 03:00:33 2004
+@@ -710,7 +710,7 @@
+ 
  # How to link with both our special library facilities
  # and the system's installed libraries.
- 
 -GASLIBS = @OPCODES_LIB@ @BFDLIB@ ../libiberty/libiberty.a
-+GASLIBS = ../libiberty/libiberty.a
++GASLIBS = ${PREFIX}/lib/libbfd.a ${PREFIX}/lib/libiberty.a
  
  # Files to be copied away after each stage in building.
  STAGESTUFF = *.o $(noinst_PROGRAMS)
- 
- as_new_SOURCES = $(GAS_CFILES)
- as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
--	$(extra_objects) $(GASLIBS)
-+	$(extra_objects) -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lopcodes-2.9.1 -lbfd-2.9.1 $(GASLIBS)
- as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
- 	$(extra_objects) $(GASLIBS)
- 
diff --git a/cross/COMMON/patches-binutils/patch-ab b/cross/COMMON/patches-binutils/patch-ab
deleted file mode 100644
index d2770a2a991..00000000000
--- a/cross/COMMON/patches-binutils/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/01/06 17:02:39 tv Exp $
-
---- libiberty/strerror.c.orig	Fri May  1 11:47:54 1998
-+++ libiberty/strerror.c	Wed Jan  6 12:03:36 1999
-@@ -7,21 +7,12 @@
- 
- #include "config.h"
- 
--#ifndef NEED_sys_errlist
--/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
--   might declare sys_errlist in a way that the compiler might consider
--   incompatible with our later declaration, perhaps by using const
--   attributes.  So we hide the declaration in errno.h (if any) using a
--   macro. */
--#define sys_errlist sys_errlist__
--#endif
--
- #include <stdio.h>
- #include <errno.h>
- 
--#ifndef NEED_sys_errlist
--#undef sys_errlist
--#endif
-+/* Bogus: we have these! */
-+#undef NEED_sys_errlist
-+#undef NEED_sys_nerr
- 
- /*  Routines imported from standard C runtime libraries. */
- 
-@@ -459,11 +450,6 @@
- 
- static int sys_nerr;
- static const char **sys_errlist;
--
--#else
--
--extern int sys_nerr;
--extern char *sys_errlist[];
- 
- #endif
- 
diff --git a/cross/COMMON/patches-binutils/patch-arrays b/cross/COMMON/patches-binutils/patch-arrays
deleted file mode 100644
index f283f155c63..00000000000
--- a/cross/COMMON/patches-binutils/patch-arrays
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./bfd/libbfd-in.h.orig	Fri May  1 11:48:12 1998
-+++ ./bfd/libbfd-in.h	Mon Dec 28 17:43:21 1998
-@@ -496,7 +498,7 @@
- 
- /* List of supported target vectors, and the default vector (if
-    bfd_default_vector[0] is NULL, there is no default).  */
--extern const bfd_target * const bfd_target_vector[];
-+extern const bfd_target * const *bfd_target_vector;
- extern const bfd_target *bfd_default_vector[];
- 
- /* Functions shared by the ECOFF and MIPS ELF backends, which have no
---- ./bfd/libbfd.h.orig	Fri May  1 11:48:12 1998
-+++ ./bfd/libbfd.h	Mon Dec 28 17:43:21 1998
-@@ -496,7 +498,7 @@
- 
- /* List of supported target vectors, and the default vector (if
-    bfd_default_vector[0] is NULL, there is no default).  */
--extern const bfd_target * const bfd_target_vector[];
-+extern const bfd_target * const *bfd_target_vector;
- extern const bfd_target *bfd_default_vector[];
- 
- /* Functions shared by the ECOFF and MIPS ELF backends, which have no
diff --git a/cross/COMMON/patches-binutils/patch-mips b/cross/COMMON/patches-binutils/patch-mips
deleted file mode 100644
index c481f6c6f90..00000000000
--- a/cross/COMMON/patches-binutils/patch-mips
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-mips,v 1.1 2000/02/19 00:50:46 tsutsui Exp $
-
---- config.sub.orig	Sat May  2 00:48:46 1998
-+++ config.sub	Thu Feb 17 01:17:57 2000
-@@ -177,7 +177,7 @@
- 		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
- 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
- 		| 1750a | dsp16xx | pdp11 \
--		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-+		| mips64 | mipsel | mipseb | mips64el | mips64orion | mips64orionel \
- 		| mipstx39 | mipstx39el \
- 		| sparc | sparclet | sparclite | sparc64 | v850)
- 		basic_machine=$basic_machine-unknown
-@@ -230,7 +230,7 @@
- 	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
- 	      | xps100-* | clipper-* | orion-* \
- 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
--	      | sparc64-* | mips64-* | mipsel-* \
-+	      | sparc64-* | mips64-* | mipsel-* | mipseb-* \
- 	      | mips64el-* | mips64orion-* | mips64orionel-* \
- 	      | mipstx39-* | mipstx39el-* \
- 	      | f301-*)
---- ld/configure.tgt.orig	Sat May  2 00:48:48 1998
-+++ ld/configure.tgt	Thu Feb 17 01:22:49 2000
-@@ -147,7 +147,8 @@
- mips*el-*-ecoff*)	targ_emul=mipsidtl ;;
- mips*-*-ecoff*)		targ_emul=mipsidt ;;
- mips*-dec-bsd*)		targ_emul=mipsbsd ;;
--mips*-dec-netbsd*)	targ_emul=elf32lmip ;;
-+mips*el-*-netbsd* | mips*-dec-netbsd*)	targ_emul=elf32lmip ;;
-+mips*eb-*-netbsd*)	targ_emul=elf32ebmip ;;
- mips*-*-bsd*)		targ_emul=mipsbig ;;
- mips*vr4300el-*-elf*)	targ_emul=elf32l4300 ;;
- mips*vr4300-*-elf*)	targ_emul=elf32b4300 ;;
---- gas/configure.orig	Sat May  2 00:45:07 1998
-+++ gas/configure	Thu Feb 17 01:41:20 2000
-@@ -1544,7 +1544,7 @@
-       m88k-*-coff*)         fmt=coff ;;
- 
-       # don't change em like *-*-bsd does
--      mips-dec-netbsd*)	    fmt=elf endian=little ;;
-+      mips-*-netbsd*)	    fmt=elf ;;
-       mips-dec-openbsd*)    fmt=elf endian=little ;;
-       mips-dec-bsd*)        fmt=aout ;;
-       mips-sony-bsd*)       fmt=ecoff ;;
diff --git a/cross/COMMON/patches-binutils/patch-sh b/cross/COMMON/patches-binutils/patch-sh
deleted file mode 100644
index 4f166a9347e..00000000000
--- a/cross/COMMON/patches-binutils/patch-sh
+++ /dev/null
@@ -1,451 +0,0 @@
-$NetBSD: patch-sh,v 1.1 2001/01/04 01:19:29 itojun Exp $
-
-ftp://ftp.netbsd.org/pub/NetBSD/arch/sh3/crosskit/
-
-diff -u -r -N -x *.orig -x CVS old/bfd/Makefile.am binutils-2.9.1/bfd/Makefile.am
---- bfd/Makefile.am	Wed Jan  3 20:40:59 2001
-+++ bfd/Makefile.am	Wed Jan  3 20:44:17 2001
-@@ -153,6 +153,7 @@
- 	elf-m10200.lo \
- 	elf-m10300.lo \
- 	elf32-ppc.lo \
-+	elf32-shunx.lo \
- 	elf32-sh.lo \
- 	elf32-sparc.lo \
- 	elf32-v850.lo \
-@@ -260,6 +261,7 @@
- 	elf-m10200.c \
- 	elf-m10300.c \
- 	elf32-ppc.c \
-+	elf32-shunx.c \
- 	elf32-sh.c \
- 	elf32-sparc.c \
- 	elf32-v850.c \
-@@ -797,6 +799,9 @@
- elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \
-   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-   $(INCDIR)/elf/ppc.h elf32-target.h
-+elf32-shunx.lo: elf32-shunx.c $(INCDIR)/bfdlink.h elf-bfd.h \
-+  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-+  elf32-target.h
- elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \
-   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-   elf32-target.h
-diff -u -r -N -x *.orig -x CVS old/bfd/Makefile.in binutils-2.9.1/bfd/Makefile.in
---- bfd/Makefile.in	Wed Jan  3 20:40:59 2001
-+++ bfd/Makefile.in	Wed Jan  3 20:44:04 2001
-@@ -242,6 +242,7 @@
- 	elf-m10200.lo \
- 	elf-m10300.lo \
- 	elf32-ppc.lo \
-+	elf32-shunx.lo \
- 	elf32-sh.lo \
- 	elf32-sparc.lo \
- 	elf32-v850.lo \
-@@ -349,6 +350,7 @@
- 	elf-m10200.c \
- 	elf-m10300.c \
- 	elf32-ppc.c \
-+	elf32-shunx.c \
- 	elf32-sh.c \
- 	elf32-sparc.c \
- 	elf32-v850.c \
-@@ -1254,6 +1256,9 @@
- elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \
-   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-   $(INCDIR)/elf/ppc.h elf32-target.h
-+elf32-shunx.lo: elf32-shunx.c $(INCDIR)/bfdlink.h elf-bfd.h \
-+  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-+  elf32-target.h
- elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \
-   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-   elf32-target.h
-diff -u -r -N -x *.orig -x CVS old/bfd/config.bfd binutils-2.9.1/bfd/config.bfd
---- bfd/config.bfd	Wed Jan  3 20:55:42 2001
-+++ bfd/config.bfd	Wed Jan  3 20:46:00 2001
-@@ -40,6 +40,7 @@
- powerpc*) targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
- rs6000)	targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
- sparc*)	targ_archs=bfd_sparc_arch ;;
-+sh*)	targ_archs=bfd_sh_arch ;;
- v850*)	targ_archs=bfd_v850_arch ;;
- z8k*)	targ_archs=bfd_z8k_arch ;;
- *)	targ_archs=bfd_${targ_cpu}_arch ;;
-@@ -494,14 +495,34 @@
-     targ_defvec=rs6000coff_vec
-     ;;
- 
-+  sh-*-netbsdelf)
-+    targ_defvec=bfd_elf32_shunx_vec
-+    targ_selvecs="bfd_elf32_shlunx_vec shcoff_vec shlcoff_vec "
-+    targ_underscore=yes
-+    ;;
-+  shel-*-netbsdelf)
-+    targ_defvec=bfd_elf32_shlunx_vec
-+    targ_selvecs="bfd_elf32_shunx_vec shcoff_vec shlcoff_vec "
-+    targ_underscore=yes
-+    ;;
-   sh-*-elf*)
-     targ_defvec=bfd_elf32_sh_vec
--    targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
-+    targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec "
-+    targ_underscore=yes
-+    ;;
-+  sh-*-netbsdcoff)
-+    targ_defvec=shcoff_vec
-+    targ_selvecs="shlcoff_vec "
-+    targ_underscore=yes
-+    ;;
-+  shel-*-netbsdcoff)
-+    targ_defvec=shlcoff_vec
-+    targ_selvecs="shcoff_vec "
-     targ_underscore=yes
-     ;;
-   sh-*-* | sh-*-rtems*)
-     targ_defvec=shcoff_vec
--    targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
-+    targ_selvecs="shlcoff_vec "
-     targ_underscore=yes
-     ;;
- 
-diff -u -r -N -x *.orig -x CVS old/bfd/configure binutils-2.9.1/bfd/configure
---- bfd/configure	Wed Jan  3 20:40:59 2001
-+++ bfd/configure	Wed Jan  3 20:46:23 2001
-@@ -2738,6 +2738,8 @@
-     bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-     bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-     bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-+    bfd_elf32_shunx_vec)	tb="$tb elf32-shunx.lo elf32.lo $elf coff-sh.lo" ;;
-+    bfd_elf32_shlunx_vec)	tb="$tb elf32-shunx.lo elf32.lo $elf coff-sh.lo" ;;
-     bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-     bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-     bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elf32.lo $elf" ;;
-diff -u -r -N -x *.orig -x CVS old/bfd/configure.in binutils-2.9.1/bfd/configure.in
---- bfd/configure.in	Wed Jan  3 20:40:59 2001
-+++ bfd/configure.in	Wed Jan  3 20:46:30 2001
-@@ -423,6 +423,8 @@
-     bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-     bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-     bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-+    bfd_elf32_shunx_vec)	tb="$tb elf32-shunx.lo elf32.lo $elf coff-sh.lo" ;;
-+    bfd_elf32_shlunx_vec)	tb="$tb elf32-shunx.lo elf32.lo $elf coff-sh.lo" ;;
-     bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-     bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-     bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elf32.lo $elf" ;;
-diff -u -r -N -x *.orig -x CVS old/bfd/elf32-sh.c binutils-2.9.1/bfd/elf32-sh.c
---- bfd/elf32-sh.c	Sat May  2 00:48:09 1998
-+++ bfd/elf32-sh.c	Wed Jan  3 20:47:15 2001
-@@ -1889,13 +1889,28 @@
-   return NULL;
- }
- 
-+#ifndef TARGET_BIG_SYM
- #define TARGET_BIG_SYM		bfd_elf32_sh_vec
-+#endif
-+
-+#ifndef TARGET_BIG_NAME
- #define TARGET_BIG_NAME		"elf32-sh"
-+#endif
-+
-+#ifndef TARGET_LITTLE_SYM
- #define TARGET_LITTLE_SYM	bfd_elf32_shl_vec
-+#endif
-+
-+#ifndef TARGET_LITTLE_NAME
- #define TARGET_LITTLE_NAME	"elf32-shl"
-+#endif
-+
- #define ELF_ARCH		bfd_arch_sh
- #define ELF_MACHINE_CODE	EM_SH
-+
-+#ifndef ELF_MAXPAGESIZE
- #define ELF_MAXPAGESIZE		0x1
-+#endif
- 
- #define elf_symbol_leading_char '_'
- 
-diff -u -r -N -x *.orig -x CVS old/bfd/elf32-shunx.c binutils-2.9.1/bfd/elf32-shunx.c
---- bfd/elf32-shunx.c	Thu Jan  1 09:00:00 1970
-+++ bfd/elf32-shunx.c	Wed Jan  3 20:47:30 2001
-@@ -0,0 +1,7 @@
-+#define TARGET_BIG_SYM                bfd_elf32_shunx_vec
-+#define TARGET_BIG_NAME               "elf32-sh-unx"
-+#define TARGET_LITTLE_SYM     bfd_elf32_shlunx_vec
-+#define TARGET_LITTLE_NAME    "elf32-shl-unx"
-+#define ELF_MAXPAGESIZE               0x1000
-+
-+#include "elf32-sh.c"
-diff -u -r -N -x *.orig -x CVS old/bfd/targets.c binutils-2.9.1/bfd/targets.c
---- bfd/targets.c	Wed Jan  3 20:40:59 2001
-+++ bfd/targets.c	Wed Jan  3 20:47:40 2001
-@@ -504,6 +504,8 @@
- extern const bfd_target bfd_elf32_mn10300_vec;
- extern const bfd_target bfd_elf32_powerpc_vec;
- extern const bfd_target bfd_elf32_powerpcle_vec;
-+extern const bfd_target bfd_elf32_shunx_vec;
-+extern const bfd_target bfd_elf32_shlunx_vec;
- extern const bfd_target bfd_elf32_sh_vec;
- extern const bfd_target bfd_elf32_shl_vec;
- extern const bfd_target bfd_elf32_sparc_vec;
-diff -u -r -N -x *.orig -x CVS old/config.sub binutils-2.9.1/config.sub
---- config.sub	Wed Jan  3 20:41:00 2001
-+++ config.sub	Wed Jan  3 20:47:56 2001
-@@ -175,7 +175,7 @@
- 		| arme[lb] | pyramid | mn10200 | mn10300 \
- 		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
- 		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
--		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-+		| we32k | ns16k | clipper | i370 | sh | shel | powerpc | powerpcle \
- 		| 1750a | dsp16xx | pdp11 \
- 		| mips64 | mipsel | mipseb | mips64el | mips64orion | mips64orionel \
- 		| mipstx39 | mipstx39el \
-@@ -229,7 +229,7 @@
- 	      | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
- 	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
- 	      | xps100-* | clipper-* | orion-* \
--	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-+	      | sparclite-* | pdp11-* | sh-* | shel-* | powerpc-* | powerpcle-* \
- 	      | sparc64-* | mips64-* | mipsel-* | mipseb-* \
- 	      | mips64el-* | mips64orion-* | mips64orionel-* \
- 	      | mipstx39-* | mipstx39el-* \
-diff -u -r -N -x *.orig -x CVS old/ld/Makefile.am binutils-2.9.1/ld/Makefile.am
---- ld/Makefile.am	Wed Jan  3 20:40:59 2001
-+++ ld/Makefile.am	Wed Jan  3 20:49:44 2001
-@@ -169,6 +169,10 @@
- 	eshelf.o \
- 	eshlelf.o \
- 	eshl.o \
-+	eshunx.o \
-+	eshlunx.o \
-+	eelf32shunx.o \
-+	eelf32shlunx.o \
- 	esparcaout.o \
- 	esparclinux.o \
- 	esparclynx.o \
-@@ -488,6 +492,18 @@
- eshl.c: $(srcdir)/emulparams/shl.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} shl "$(tdir_shl)"
-+eshunx.c: $(srcdir)/emulparams/shunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} shunx "$(tdir_shunx)"
-+eshlunx.c: $(srcdir)/emulparams/shlunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} shlunx "$(tdir_shlunx)"
-+eelf32shunx.c: $(srcdir)/emulparams/elf32shunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} elf32shunx "$(tdir_elf32shunx)"
-+eelf32shlunx.c: $(srcdir)/emulparams/elf32shlunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} elf32shlunx "$(tdir_elf32shlunx)"
- esparcaout.c: $(srcdir)/emulparams/sparcaout.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} sparcaout "$(tdir_sparcaout)"
-diff -u -r -N -x *.orig -x CVS old/ld/Makefile.in binutils-2.9.1/ld/Makefile.in
---- ld/Makefile.in	Wed Jan  3 20:40:59 2001
-+++ ld/Makefile.in	Wed Jan  3 20:49:38 2001
-@@ -245,6 +245,10 @@
- 	eshelf.o \
- 	eshlelf.o \
- 	eshl.o \
-+	eshunx.o \
-+	eshlunx.o \
-+	eelf32shunx.o \
-+	eelf32shlunx.o \
- 	esparcaout.o \
- 	esparclinux.o \
- 	esparclynx.o \
-@@ -998,6 +1002,18 @@
- eshl.c: $(srcdir)/emulparams/shl.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} shl "$(tdir_shl)"
-+eshunx.c: $(srcdir)/emulparams/shunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} shunx "$(tdir_shunx)"
-+eshlunx.c: $(srcdir)/emulparams/shlunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} shlunx "$(tdir_shlunx)"
-+eelf32shunx.c: $(srcdir)/emulparams/elf32shunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} elf32shunx "$(tdir_elf32shunx)"
-+eelf32shlunx.c: $(srcdir)/emulparams/elf32shlunx.sh \
-+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} elf32shlunx "$(tdir_elf32shlunx)"
- esparcaout.c: $(srcdir)/emulparams/sparcaout.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} sparcaout "$(tdir_sparcaout)"
-diff -u -r -N -x *.orig -x CVS old/ld/configure.tgt binutils-2.9.1/ld/configure.tgt
---- ld/configure.tgt	Wed Jan  3 20:41:00 2001
-+++ ld/configure.tgt	Wed Jan  3 20:51:01 2001
-@@ -114,8 +114,16 @@
- 			targ_extra_emuls="h8500s h8500b h8500m h8500c"
- 			;;
- sh-*-elf*)		targ_emul=shelf
--			targ_extra_emuls="shlelf sh shl"
-+			targ_extra_emuls="shlelf shunx shlunx"
- 			;;
-+sh-*-netbsdelf)		targ_emul=elf32shunx
-+			targ_extra_emuls="elf32shlunx shunx shlunx"
-+			;;
-+shel-*-netbsdelf)	targ_emul=elf32shlunx
-+			targ_extra_emuls="elf32shunx shunx shlunx"
-+			;;
-+sh-*-netbsdcoff)	targ_emul=shunx; targ_extra_emuls=shlunx ;;
-+shel-*-netbsdcoff)	targ_emul=shlunx; targ_extra_emuls=shunx ;;
- sh-*-*|sh-*-rtems*)	targ_emul=sh; targ_extra_emuls=shl ;;
- m68k-sony-*)		targ_emul=news ;;
- m68k-hp-bsd*)		targ_emul=hp300bsd ;;
-diff -u -r -N -x *.orig -x CVS old/ld/emulparams/elf32shlunx.sh binutils-2.9.1/ld/emulparams/elf32shlunx.sh
---- ld/emulparams/elf32shlunx.sh	Thu Jan  1 09:00:00 1970
-+++ ld/emulparams/elf32shlunx.sh	Wed Jan  3 20:51:16 2001
-@@ -0,0 +1,15 @@
-+SCRIPT_NAME=elf
-+OUTPUT_FORMAT="elf32-shl-unx"
-+TEXT_START_ADDR=0x1000
-+MAXPAGESIZE=0x1000
-+ARCH=sh
-+MACHINE=
-+TEMPLATE_NAME=elf32
-+GENERATE_SHLIB_SCRIPT=yes
-+
-+# These are for compatibility with the COFF toolchain.
-+ENTRY=start
-+CTOR_START='___ctors = .;'
-+CTOR_END='___ctors_end = .;'
-+DTOR_START='___dtors = .;'
-+DTOR_END='___dtors_end = .;'
-diff -u -r -N -x *.orig -x CVS old/ld/emulparams/elf32shunx.sh binutils-2.9.1/ld/emulparams/elf32shunx.sh
---- ld/emulparams/elf32shunx.sh	Thu Jan  1 09:00:00 1970
-+++ ld/emulparams/elf32shunx.sh	Wed Jan  3 20:51:33 2001
-@@ -0,0 +1,15 @@
-+SCRIPT_NAME=elf
-+OUTPUT_FORMAT="elf32-sh-unx"
-+TEXT_START_ADDR=0x1000
-+MAXPAGESIZE=0x1000
-+ARCH=sh
-+MACHINE=
-+TEMPLATE_NAME=elf32
-+GENERATE_SHLIB_SCRIPT=yes
-+
-+# These are for compatibility with the COFF toolchain.
-+ENTRY=start
-+CTOR_START='___ctors = .;'
-+CTOR_END='___ctors_end = .;'
-+DTOR_START='___dtors = .;'
-+DTOR_END='___dtors_end = .;'
-diff -u -r -N -x *.orig -x CVS old/ld/emulparams/shlunx.sh binutils-2.9.1/ld/emulparams/shlunx.sh
---- ld/emulparams/shlunx.sh	Thu Jan  1 09:00:00 1970
-+++ ld/emulparams/shlunx.sh	Wed Jan  3 20:51:54 2001
-@@ -0,0 +1,5 @@
-+SCRIPT_NAME=shunx
-+OUTPUT_FORMAT="coff-shl"
-+TEXT_START_ADDR=0x1000
-+TARGET_PAGE_SIZE=0x1000
-+ARCH=sh
-diff -u -r -N -x *.orig -x CVS old/ld/emulparams/shunx.sh binutils-2.9.1/ld/emulparams/shunx.sh
---- ld/emulparams/shunx.sh	Thu Jan  1 09:00:00 1970
-+++ ld/emulparams/shunx.sh	Wed Jan  3 20:52:04 2001
-@@ -0,0 +1,5 @@
-+SCRIPT_NAME=shunx
-+OUTPUT_FORMAT="coff-sh"
-+TEXT_START_ADDR=0x1000
-+TARGET_PAGE_SIZE=0x1000
-+ARCH=sh
-diff -u -r -N -x *.orig -x CVS old/ld/scripttempl/shunx.sc binutils-2.9.1/ld/scripttempl/shunx.sc
---- ld/scripttempl/shunx.sc	Thu Jan  1 09:00:00 1970
-+++ ld/scripttempl/shunx.sc	Wed Jan  3 20:52:24 2001
-@@ -0,0 +1,53 @@
-+TORS=".tors :
-+  {
-+    ___ctors = . ;
-+    *(.ctors)
-+    ___ctors_end = . ;
-+    ___dtors = . ;
-+    *(.dtors)
-+    ___dtors_end = . ;
-+  }"
-+
-+
-+cat <<EOF
-+OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-+OUTPUT_ARCH(${ARCH})
-+${LIB_SEARCH_DIRS}
-+
-+SECTIONS
-+{
-+  . = ${TEXT_START_ADDR} + SIZEOF_HEADERS;
-+  .text ALIGN(0x10):
-+  {
-+    *(.text)
-+    *(.strings)
-+    ${RELOCATING+ _etext = . ; }
-+  }
-+  ${CONSTRUCTING+${TORS}}
-+  .data  ${RELOCATING+ ALIGN(${TARGET_PAGE_SIZE})} :
-+  {
-+    *(.data)
-+    ${RELOCATING+ _edata = . ; }
-+  }
-+  .bss ${RELOCATING+ ALIGN(${TARGET_PAGE_SIZE})} :
-+  {
-+    ${RELOCATING+ _bss_start = . ; }
-+    *(.bss)
-+    *(COMMON)
-+    ${RELOCATING+ _end = . ;  }
-+  }
-+  .stack :
-+  {
-+    ${RELOCATING+ _stack = . ; }
-+    *(.stack)
-+  }
-+  .stab 0 ${RELOCATING+(NOLOAD)} :
-+  {
-+    *(.stab)
-+  }
-+  .stabstr 0 ${RELOCATING+(NOLOAD)} :
-+  {
-+    *(.stabstr)
-+  }
-+}
-+EOF
---- gas/configure-	Wed Jan  3 21:34:11 2001
-+++ gas/configure	Wed Jan  3 21:35:19 2001
-@@ -1408,2 +1408,4 @@
-       rs6000*)		cpu_type=ppc ;;
-+      shel*)		cpu_type=sh endian=little ;;
-+      sh*)		cpu_type=sh endian=big ;;
-       sparclite*)	cpu_type=sparc arch=sparclite ;;
-@@ -1596,2 +1598,4 @@
-       sh-*-rtems*)	    fmt=coff ;;
-+      sh-*-netbsdelf*)	    fmt=elf em=nbsd ;;
-+      sh-*-netbsdcoff*)	    fmt=coff em=nbsd ;;
- 
---- gas/configure.in-	Wed Jan  3 21:34:13 2001
-+++ gas/configure.in	Wed Jan  3 21:35:31 2001
-@@ -88,2 +88,4 @@
-       rs6000*)		cpu_type=ppc ;;
-+      shel*)		cpu_type=sh endian=little ;;
-+      sh*)		cpu_type=sh endian=big ;;
-       sparclite*)	cpu_type=sparc arch=sparclite ;;
-@@ -264,2 +266,4 @@
-       sh-*-rtems*)	    fmt=coff ;;
-+      sh-*-netbsdelf*)	    fmt=elf em=nbsd ;;
-+      sh-*-netbsdcoff*)	    fmt=coff em=nbsd ;;
- 
---- gas/config/tc-sh.h-	Wed Jan  3 21:35:53 2001
-+++ gas/config/tc-sh.h	Wed Jan  3 21:36:21 2001
-@@ -22,3 +22,6 @@
- 
-+/* Set the endianness we are using.  Default to little endian.  */
-+#ifndef TARGET_BYTES_BIG_ENDIAN
- #define TARGET_BYTES_BIG_ENDIAN 0
-+#endif
- 
-@@ -136,3 +139,7 @@
- 
-+#ifdef TE_NetBSD
-+#define TARGET_FORMAT (shl ? "elf32-shl-unx" : "elf32-sh-unx")
-+#else
- #define TARGET_FORMAT (shl ? "elf32-shl" : "elf32-sh")
-+#endif
- 
diff --git a/cross/COMMON/patches-binutils/patch-si b/cross/COMMON/patches-binutils/patch-si
deleted file mode 100644
index 581d717070c..00000000000
--- a/cross/COMMON/patches-binutils/patch-si
+++ /dev/null
@@ -1,11 +0,0 @@
---- gas/config/tc-sh.c	2000/10/05 05:43:36	1.1
-+++ gas/config/tc-sh.c	2000/12/22 11:28:47	1.2
-@@ -1924,7 +1924,7 @@
- 
-     case BFD_RELOC_SH_PCDISP12BY2:
-       val /= 2;
--      if (val < -0x800 || val >= 0x7ff)
-+      if (val < -0x800 || val > 0x7ff)
- 	as_bad_where (fixP->fx_file, fixP->fx_line, "pcrel too far");
-       buf[lowbyte] = val & 0xff;
-       buf[highbyte] |= (val >> 8) & 0xf;
diff --git a/cross/i386-cygwin32/Makefile b/cross/i386-cygwin32/Makefile
index 5565362675a..9f1c5dfe95e 100644
--- a/cross/i386-cygwin32/Makefile
+++ b/cross/i386-cygwin32/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:55 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/09 20:48:15 kristerw Exp $
 #
 
 DISTVERSION=		1.0.0.0
 DISTFILES=		# none
+PKGREVISION=		1
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/
diff --git a/cross/i386-cygwin32/distinfo b/cross/i386-cygwin32/distinfo
index 03d1d3cc12e..8224c8ee1b2 100644
--- a/cross/i386-cygwin32/distinfo
+++ b/cross/i386-cygwin32/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:36:23 skrll Exp $
+$NetBSD: distinfo,v 1.3 2004/07/09 20:48:15 kristerw Exp $
 
-SHA1 (binutils-2.9.1.tar.gz) = 9df3cdcd34f81118ee403f8794b277ad28a57e14
-Size (binutils-2.9.1.tar.gz) = 5694541 bytes
+SHA1 (binutils-2.15.tar.gz) = 4caf693b8cbaf1118d2bfddb40a2fc91eaf51a6f
+Size (binutils-2.15.tar.gz) = 15134701 bytes
 SHA1 (egcs-1.1.1.tar.gz) = 381f6c15ab042a4d3605490c29620ea5ad5592a6
 Size (egcs-1.1.1.tar.gz) = 11604853 bytes
 SHA1 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 85ebc334bf9472b9595c4348a6bc440e836b922a
diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile
index e3a73dd0641..70c69555678 100644
--- a/cross/i386-linux/Makefile
+++ b/cross/i386-linux/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:10:55 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/07/09 20:48:15 kristerw Exp $
 #
 
 DISTVERSION=		2.0.7.1
+PKGREVISION=		1
 DISTFILES=		${LINUXDEVEL_FILES}
 EXTRACT_ONLY=		# none of the RPM files
 MASTER_SITES=		ftp://ftp.cdrom.com/pub/linux/redhat/redhat-5.1/i386/RedHat/RPMS/
diff --git a/cross/i386-linux/distinfo b/cross/i386-linux/distinfo
index 03e26bc2537..3d38158ba42 100644
--- a/cross/i386-linux/distinfo
+++ b/cross/i386-linux/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:36:23 skrll Exp $
+$NetBSD: distinfo,v 1.3 2004/07/09 20:48:15 kristerw Exp $
 
 SHA1 (glibc-2.0.7-13.i386.rpm) = 6ac4eb9bac93509f5f788792f623f9930282ffe0
 Size (glibc-2.0.7-13.i386.rpm) = 3864063 bytes
@@ -6,8 +6,8 @@ SHA1 (glibc-devel-2.0.7-13.i386.rpm) = 56bb83dc243b1d0609694d278afd02458bc532ff
 Size (glibc-devel-2.0.7-13.i386.rpm) = 2608055 bytes
 SHA1 (kernel-headers-2.0.34-0.6.i386.rpm) = f780f50e4eb15efff5c5c7654fea02c6546d810b
 Size (kernel-headers-2.0.34-0.6.i386.rpm) = 447811 bytes
-SHA1 (binutils-2.9.1.tar.gz) = 9df3cdcd34f81118ee403f8794b277ad28a57e14
-Size (binutils-2.9.1.tar.gz) = 5694541 bytes
+SHA1 (binutils-2.15.tar.gz) = 4caf693b8cbaf1118d2bfddb40a2fc91eaf51a6f
+Size (binutils-2.15.tar.gz) = 15134701 bytes
 SHA1 (egcs-1.1.1.tar.gz) = 381f6c15ab042a4d3605490c29620ea5ad5592a6
 Size (egcs-1.1.1.tar.gz) = 11604853 bytes
 SHA1 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 85ebc334bf9472b9595c4348a6bc440e836b922a
diff --git a/cross/i386-linuxglibc1/Makefile b/cross/i386-linuxglibc1/Makefile
index a227519731a..d39ad44e68c 100644
--- a/cross/i386-linuxglibc1/Makefile
+++ b/cross/i386-linuxglibc1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/08/04 21:07:48 jmc Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/09 20:48:15 kristerw Exp $
 #
 
 DISTVERSION=		5.3.12.1
+PKGREVISION=		1
 DISTFILES=		${LINUXDEVEL_FILES}
 EXTRACT_ONLY=		# none of the RPM files
 MASTER_SITES=		ftp://ftp.cdrom.com/pub/linux/redhat/redhat-4.2/i386/RedHat/RPMS/
diff --git a/cross/i386-linuxglibc1/distinfo b/cross/i386-linuxglibc1/distinfo
index 37f5e651f40..6e40a994765 100644
--- a/cross/i386-linuxglibc1/distinfo
+++ b/cross/i386-linuxglibc1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:36:24 skrll Exp $
+$NetBSD: distinfo,v 1.3 2004/07/09 20:48:15 kristerw Exp $
 
 SHA1 (libc-5.3.12-18.i386.rpm) = da75ab31a38640dbaffe7ea76d11aed731aa879a
 Size (libc-5.3.12-18.i386.rpm) = 310258 bytes
@@ -8,8 +8,8 @@ SHA1 (libc-static-5.3.12-18.i386.rpm) = 4b50d0c4c46b4b3cab9d90ea278848b491e99a61
 Size (libc-static-5.3.12-18.i386.rpm) = 314096 bytes
 SHA1 (kernel-headers-2.0.30-2.i386.rpm) = f481e5318a8eb174adf4b00a535ec7e79c4a9ab5
 Size (kernel-headers-2.0.30-2.i386.rpm) = 429959 bytes
-SHA1 (binutils-2.9.1.tar.gz) = 9df3cdcd34f81118ee403f8794b277ad28a57e14
-Size (binutils-2.9.1.tar.gz) = 5694541 bytes
+SHA1 (binutils-2.15.tar.gz) = 4caf693b8cbaf1118d2bfddb40a2fc91eaf51a6f
+Size (binutils-2.15.tar.gz) = 15134701 bytes
 SHA1 (egcs-1.1.1.tar.gz) = 381f6c15ab042a4d3605490c29620ea5ad5592a6
 Size (egcs-1.1.1.tar.gz) = 11604853 bytes
 SHA1 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 85ebc334bf9472b9595c4348a6bc440e836b922a
diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile
index ff7c3f0cf7f..591fde153d3 100644
--- a/cross/i386-msdosdjgpp/Makefile
+++ b/cross/i386-msdosdjgpp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/01/27 00:53:12 heinz Exp $
+# $NetBSD: Makefile,v 1.19 2004/07/09 20:48:16 kristerw Exp $
 #
 
 DISTVERSION=		2.02.0
+PKGREVISION=		1
 DISTFILES=		${DJGPP_FILES}
 EXTRACT_ONLY=		# none of the djgpp files
 MASTER_SITES=		ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2/old/ \
diff --git a/cross/i386-msdosdjgpp/distinfo b/cross/i386-msdosdjgpp/distinfo
index 05ac85b31ef..aa06a2f3738 100644
--- a/cross/i386-msdosdjgpp/distinfo
+++ b/cross/i386-msdosdjgpp/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:36:24 skrll Exp $
+$NetBSD: distinfo,v 1.3 2004/07/09 20:48:16 kristerw Exp $
 
 SHA1 (djcrx202.zip) = e99955d2a8cdc59bfe6873af06b8c601115e9da0
 Size (djcrx202.zip) = 587302 bytes
 SHA1 (wmemu2b.zip) = f149b51ea753a847075e83c45512b86aacb2472a
 Size (wmemu2b.zip) = 63779 bytes
-SHA1 (binutils-2.9.1.tar.gz) = 9df3cdcd34f81118ee403f8794b277ad28a57e14
-Size (binutils-2.9.1.tar.gz) = 5694541 bytes
+SHA1 (binutils-2.15.tar.gz) = 4caf693b8cbaf1118d2bfddb40a2fc91eaf51a6f
+Size (binutils-2.15.tar.gz) = 15134701 bytes
 SHA1 (egcs-1.1.1.tar.gz) = 381f6c15ab042a4d3605490c29620ea5ad5592a6
 Size (egcs-1.1.1.tar.gz) = 11604853 bytes
 SHA1 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 85ebc334bf9472b9595c4348a6bc440e836b922a