Update gcc from 3.3.3 to 3.3.6, and binutils from 2.15.90-20040222

to 2.16.91-20060119 to build with gcc-4

8 files changed, 89 insertions, 98 deletions

diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index d9faa061026..eaf7b20e67e 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/03 04:23:38 kent Exp $
 
 DISTNAME=		cross-${TARGET_ARCH}-${DISTVERSION}
-DISTVERSION=		3.3.3
-PKGREVISION=		1
+DISTVERSION=		3.3.6
+PKGREVISION=		0
 CATEGORIES+=		cross lang
 MASTER_SITES=		http://chiharu.hauN.org/peace/dist/
 
@@ -32,10 +32,10 @@ MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=mingw/}
 MESSAGE_SUBST+=		CROSSBASE=${CROSSBASE}
 TARGET_DIR=		${PREFIX}/${TARGET_ARCH}
 
-GCC_DISTNAME=		gcc-3.3.3
-GCC_INTVERSION=		3.3.3
-MASTER_SITES+=		${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.3/}
-DISTFILES+=		${GCC_DISTNAME}.tar.gz
+GCC_DISTNAME=		gcc-3.3.6
+GCC_INTVERSION=		3.3.6
+MASTER_SITES+=		${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.6/}
+DISTFILES+=		${GCC_DISTNAME}.tar.bz2
 USE_TOOLS+=		gmake makeinfo
 GCC_LANGUAGES=		c,c++
 CONFIGURE_ENV=		${SETENV} CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} \
@@ -54,7 +54,7 @@ GCC_MAKE=		${SETENV} ${MAKE_ENV} \
 	                ${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS}
 WRKOBJ=			${WRKDIR}/obj
 
-BINUTILS_DISTNAME=	binutils-2.15.90-20040222-1
+BINUTILS_DISTNAME=	binutils-2.16.91-20060119-1
 DISTFILES+=		${BINUTILS_DISTNAME}-src.tar.gz
 MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=mingw/}
 #MASTER_SITES+=		${MASTER_SITE_GNU:=binutils/}
diff --git a/cross/i386-netbsdpe/PLIST b/cross/i386-netbsdpe/PLIST
index 32f85d8ceb7..c522ec892f4 100644
--- a/cross/i386-netbsdpe/PLIST
+++ b/cross/i386-netbsdpe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/03/30 03:44:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/07/03 04:23:38 kent Exp $
 bin/i386-netbsdpe-addr2line
 bin/i386-netbsdpe-ar
 bin/i386-netbsdpe-as
@@ -10,7 +10,7 @@ bin/i386-netbsdpe-dlltool
 bin/i386-netbsdpe-dllwrap
 bin/i386-netbsdpe-g++
 bin/i386-netbsdpe-gcc
-bin/i386-netbsdpe-gcc-3.3.3
+bin/i386-netbsdpe-gcc-3.3.6
 bin/i386-netbsdpe-gccbug
 bin/i386-netbsdpe-gcov
 bin/i386-netbsdpe-ld
@@ -32,6 +32,7 @@ i386-netbsdpe/bin/g++
 i386-netbsdpe/bin/gcc
 i386-netbsdpe/bin/ld
 i386-netbsdpe/bin/nm
+i386-netbsdpe/bin/objdump
 i386-netbsdpe/bin/ranlib
 i386-netbsdpe/bin/strip
 i386-netbsdpe/lib/ldscripts/i386pe.x
@@ -48,16 +49,17 @@ i386-netbsdpe/share/locale/es/LC_MESSAGES/gcc.mo
 i386-netbsdpe/share/locale/fr/LC_MESSAGES/gcc.mo
 i386-netbsdpe/share/locale/ja/LC_MESSAGES/gcc.mo
 i386-netbsdpe/share/locale/nl/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/rw/LC_MESSAGES/gcc.mo
 i386-netbsdpe/share/locale/sv/LC_MESSAGES/gcc.mo
 i386-netbsdpe/share/locale/tr/LC_MESSAGES/gcc.mo
 info/bfd.info
-lib/gcc-lib/i386-netbsdpe/3.3.3/cc1
-lib/gcc-lib/i386-netbsdpe/3.3.3/cc1plus
-lib/gcc-lib/i386-netbsdpe/3.3.3/collect2
-lib/gcc-lib/i386-netbsdpe/3.3.3/include/mmintrin.h
-lib/gcc-lib/i386-netbsdpe/3.3.3/include/xmmintrin.h
-lib/gcc-lib/i386-netbsdpe/3.3.3/libgcc.a
-lib/gcc-lib/i386-netbsdpe/3.3.3/specs
+lib/gcc-lib/i386-netbsdpe/3.3.6/cc1
+lib/gcc-lib/i386-netbsdpe/3.3.6/cc1plus
+lib/gcc-lib/i386-netbsdpe/3.3.6/collect2
+lib/gcc-lib/i386-netbsdpe/3.3.6/include/mmintrin.h
+lib/gcc-lib/i386-netbsdpe/3.3.6/include/xmmintrin.h
+lib/gcc-lib/i386-netbsdpe/3.3.6/libgcc.a
+lib/gcc-lib/i386-netbsdpe/3.3.6/specs
 man/man1/i386-netbsdpe-addr2line.1
 man/man1/i386-netbsdpe-ar.1
 man/man1/i386-netbsdpe-as.1
@@ -74,14 +76,16 @@ man/man1/i386-netbsdpe-size.1
 man/man1/i386-netbsdpe-strings.1
 man/man1/i386-netbsdpe-strip.1
 man/man1/i386-netbsdpe-windres.1
-@dirrm lib/gcc-lib/i386-netbsdpe/3.3.3/include
-@dirrm lib/gcc-lib/i386-netbsdpe/3.3.3
+@dirrm lib/gcc-lib/i386-netbsdpe/3.3.6/include
+@dirrm lib/gcc-lib/i386-netbsdpe/3.3.6
 @dirrm lib/gcc-lib/i386-netbsdpe
 @unexec ${RMDIR} %D/lib/gcc-lib 2>/dev/null || ${TRUE}
 @dirrm i386-netbsdpe/share/locale/tr/LC_MESSAGES
 @dirrm i386-netbsdpe/share/locale/tr
 @dirrm i386-netbsdpe/share/locale/sv/LC_MESSAGES
 @dirrm i386-netbsdpe/share/locale/sv
+@dirrm i386-netbsdpe/share/locale/rw/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/rw
 @dirrm i386-netbsdpe/share/locale/nl/LC_MESSAGES
 @dirrm i386-netbsdpe/share/locale/nl
 @dirrm i386-netbsdpe/share/locale/ja/LC_MESSAGES
diff --git a/cross/i386-netbsdpe/distinfo b/cross/i386-netbsdpe/distinfo
index aac886083e3..308c05ccb18 100644
--- a/cross/i386-netbsdpe/distinfo
+++ b/cross/i386-netbsdpe/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 10:16:53 agc Exp $
+$NetBSD: distinfo,v 1.11 2006/07/03 04:23:38 kent Exp $
 
 SHA1 (gcc-3.3.3-20040217-1-src.diff.gz) = 721674ff4b07397a3bd5570832bb89662aacee2a
 RMD160 (gcc-3.3.3-20040217-1-src.diff.gz) = 75713a2b9e00f132d9be89ff57e532c1a4bff223
 Size (gcc-3.3.3-20040217-1-src.diff.gz) = 122692 bytes
-SHA1 (gcc-3.3.3.tar.gz) = decb70e78f040850dbd41f18bb5ec992192ad28c
-RMD160 (gcc-3.3.3.tar.gz) = 79b72210bdf01e8c24952b30fbc3270c28532f19
-Size (gcc-3.3.3.tar.gz) = 30747783 bytes
-SHA1 (binutils-2.15.90-20040222-1-src.tar.gz) = 49c81b65f288a8c849675da9ddf3536a24d8515f
-RMD160 (binutils-2.15.90-20040222-1-src.tar.gz) = 9fa69fe5add08e9abfe8e17cd2d3fb6ecaa3708b
-Size (binutils-2.15.90-20040222-1-src.tar.gz) = 14182109 bytes
+SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb
+RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967
+Size (gcc-3.3.6.tar.bz2) = 23972413 bytes
+SHA1 (binutils-2.16.91-20060119-1-src.tar.gz) = a63e7c62bb1287cfa5625c2e2b61c076a323883f
+RMD160 (binutils-2.16.91-20060119-1-src.tar.gz) = dbcb7003e80733441ffd2f01b55344f36f2dbcd1
+Size (binutils-2.16.91-20060119-1-src.tar.gz) = 16214443 bytes
 SHA1 (patch-ab) = fd94571856c4706b324307efa8e2cacec3021463
 SHA1 (patch-ad) = 609f33a5cc0804115ca969aab9b05cbc6162d9e9
 SHA1 (patch-ae) = d738f7f0ec4a0832270d9bc1fdd0f3e69b20b511
diff --git a/cross/i386-netbsdpe/patches/binutils-af b/cross/i386-netbsdpe/patches/binutils-af
index a97a4903611..93f483d19da 100644
--- a/cross/i386-netbsdpe/patches/binutils-af
+++ b/cross/i386-netbsdpe/patches/binutils-af
@@ -1,8 +1,8 @@
-$NetBSD: binutils-af,v 1.3 2004/03/09 12:19:12 kent Exp $
+$NetBSD: binutils-af,v 1.4 2006/07/03 04:23:38 kent Exp $
 
---- binutils/dlltool.c.orig	2003-07-08 12:35:36.000000000 +0900
+--- binutils/dlltool.c.orig	2005-10-05 07:07:08.000000000 +0900
 +++ binutils/dlltool.c
-@@ -1437,6 +1437,8 @@ match_exclude (string)
+@@ -1363,6 +1363,8 @@ match_exclude (const char *string)
    for (excl_item = excludes; excl_item; excl_item = excl_item->next)
      if (strcmp (string, excl_item->string) == 0)
        return TRUE;
@@ -11,49 +11,49 @@ $NetBSD: binutils-af,v 1.3 2004/03/09 12:19:12 kent Exp $
    return FALSE;
  }
  
-@@ -2351,6 +2353,7 @@ make_one_lib_file (exp, i)
-       asymbol *  exp_label;
-       asymbol *  iname = 0;
-       asymbol *  iname2;
-+      asymbol *  iname_nm = 0;
-       asymbol *  iname_lab;
-       asymbol ** iname_lab_pp;
-       asymbol ** iname_pp;
-@@ -2362,7 +2365,7 @@ make_one_lib_file (exp, i)
+@@ -2169,6 +2171,7 @@ make_one_lib_file (export_type *exp, int
+   asymbol *  exp_label;
+   asymbol *  iname = 0;
+   asymbol *  iname2;
++  asymbol *  iname_nm = 0;
+   asymbol *  iname_lab;
+   asymbol ** iname_lab_pp;
+   asymbol ** iname_pp;
+@@ -2180,7 +2183,7 @@ make_one_lib_file (export_type *exp, int
  #ifndef EXTRA
  #define EXTRA    0
  #endif
--      asymbol *  ptrs[NSECS + 4 + EXTRA + 1];
-+      asymbol *  ptrs[NSECS + 5 + EXTRA + 1];
-       flagword   applicable;
+-  asymbol *  ptrs[NSECS + 4 + EXTRA + 1];
++  asymbol *  ptrs[NSECS + 5 + EXTRA + 1];
+   flagword   applicable;
+   char *     outname = xmalloc (strlen (TMP_STUB) + 10);
+   int        oidx = 0;
+@@ -2278,6 +2281,15 @@ make_one_lib_file (export_type *exp, int
+   iname2->flags = BSF_GLOBAL;
+   iname2->value = 0;
  
-       char *     outname = xmalloc (strlen (TMP_STUB) + 10);
-@@ -2460,6 +2463,15 @@ make_one_lib_file (exp, i)
-       iname2->flags = BSF_GLOBAL;
-       iname2->value = 0;
++  if (exp->data)
++    {
++      iname_nm = bfd_make_empty_symbol (abfd);
++      iname_nm->name = make_imp_label ("__nm_", exp->name);
++      iname_nm->section = secdata[IDATA6].sec;
++      iname_nm->flags = BSF_GLOBAL;
++      iname_nm->value = 0;
++    }
++ 
+   iname_lab = bfd_make_empty_symbol (abfd);
  
-+      if (exp->data)
-+	{
-+	  iname_nm = bfd_make_empty_symbol (abfd);
-+	  iname_nm->name = make_imp_label ("__nm_", exp->name);
-+	  iname_nm->section = secdata[IDATA6].sec;
-+	  iname_nm->flags = BSF_GLOBAL;
-+	  iname_nm->value = 0;
-+	}
-+
-       iname_lab = bfd_make_empty_symbol(abfd);
+   iname_lab->name = head_label;
+@@ -2289,6 +2301,8 @@ make_one_lib_file (export_type *exp, int
+   if (create_compat_implib)
+     ptrs[oidx++] = iname;
+   ptrs[oidx++] = iname2;
++  if (exp->data)
++    ptrs[oidx++] = iname_nm;
  
-       iname_lab->name = head_label;
-@@ -2471,6 +2483,8 @@ make_one_lib_file (exp, i)
-       if (create_compat_implib)
- 	ptrs[oidx++] = iname;
-       ptrs[oidx++] = iname2;
-+      if (exp->data)
-+	  ptrs[oidx++] = iname_nm;
- 
-       iname_lab_pp = ptrs + oidx;
-       ptrs[oidx++] = iname_lab;
-@@ -2781,7 +2795,7 @@ make_head ()
+   iname_lab_pp = ptrs + oidx;
+   ptrs[oidx++] = iname_lab;
+@@ -2595,7 +2609,7 @@ make_head (void)
    fprintf (f, "\t%sdoesn't load DLLs when this is set.\n", ASM_C);
    fprintf (f, "\t%s\t0\t%s loaded time\n", ASM_LONG, ASM_C);
    fprintf (f, "\t%s\t0\t%s Forwarder chain\n", ASM_LONG, ASM_C);
@@ -62,7 +62,7 @@ $NetBSD: binutils-af,v 1.3 2004/03/09 12:19:12 kent Exp $
  	   ASM_RVA_BEFORE,
  	   imp_name_lab,
  	   ASM_RVA_AFTER,
-@@ -2862,8 +2876,8 @@ make_tail ()
+@@ -2676,8 +2690,8 @@ make_tail (void)
    fprintf (f, "\t.section	.idata$7\n");
  #endif
  
diff --git a/cross/i386-netbsdpe/patches/binutils-ag b/cross/i386-netbsdpe/patches/binutils-ag
index de13f969bca..6762030c1f0 100644
--- a/cross/i386-netbsdpe/patches/binutils-ag
+++ b/cross/i386-netbsdpe/patches/binutils-ag
@@ -1,13 +1,13 @@
-$NetBSD: binutils-ag,v 1.1 2004/03/09 12:19:12 kent Exp $
+$NetBSD: binutils-ag,v 1.2 2006/07/03 04:23:38 kent Exp $
 
---- binutils/doc/Makefile.in.orig	2003-10-27 00:45:51.000000000 +0900
+--- binutils/doc/Makefile.in.orig	2005-10-11 15:46:24.000000000 +0900
 +++ binutils/doc/Makefile.in
-@@ -552,7 +552,7 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefil
+@@ -683,7 +683,7 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefil
  
  # We want install to imply install-info as per GNU standards, despite the
  # cygnus option.
--install: install-info
-+#install: install-info
+-install-data-local: install-info
++#install-data-local: install-info
  
  # Maintenance
  
diff --git a/cross/i386-netbsdpe/patches/binutils-ah b/cross/i386-netbsdpe/patches/binutils-ah
index a599c2c3b60..4728158ae8e 100644
--- a/cross/i386-netbsdpe/patches/binutils-ah
+++ b/cross/i386-netbsdpe/patches/binutils-ah
@@ -1,14 +1,13 @@
-$NetBSD: binutils-ah,v 1.1 2004/03/09 12:19:12 kent Exp $
+$NetBSD: binutils-ah,v 1.2 2006/07/03 04:23:38 kent Exp $
 
---- gas/doc/Makefile.in.orig	2003-11-25 07:01:36.000000000 +0900
+--- gas/doc/Makefile.in.orig	2006-01-19 13:59:42.000000000 +0900
 +++ gas/doc/Makefile.in
-@@ -521,7 +521,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.te
+@@ -591,7 +591,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.te
  
  # We want install to imply install-info as per GNU standards, despite the
  # cygnus option.
--install: install-info
--install-info: install-info-am
-+install:
-+install-info:
+-install-data-local: install-info
++#install-data-local: install-info
  
  # Maintenance
+ 
diff --git a/cross/i386-netbsdpe/patches/binutils-ai b/cross/i386-netbsdpe/patches/binutils-ai
index 16109c7b9fd..16dbc080f86 100644
--- a/cross/i386-netbsdpe/patches/binutils-ai
+++ b/cross/i386-netbsdpe/patches/binutils-ai
@@ -1,13 +1,13 @@
-$NetBSD: binutils-ai,v 1.1 2004/03/09 12:19:12 kent Exp $
+$NetBSD: binutils-ai,v 1.2 2006/07/03 04:23:38 kent Exp $
 
---- ld/Makefile.in.orig	2003-10-27 00:47:14.000000000 +0900
+--- ld/Makefile.in.orig	2006-01-19 14:00:24.000000000 +0900
 +++ ld/Makefile.in
-@@ -2243,7 +2243,7 @@ install-data-local:
+@@ -2496,7 +2496,7 @@ install-data-local:
  
  # We want install to imply install-info as per GNU standards, despite the
  # cygnus option.
--install: install-info
-+#install: install-info
+-install-data-local: install-info
++#install-data-local: install-info
  diststuff: info $(EXTRA_DIST)
- distclean-local:
- 	rm -rf ldscripts
+ all: info ld.1
+ 
diff --git a/cross/i386-netbsdpe/patches/binutils-ak b/cross/i386-netbsdpe/patches/binutils-ak
deleted file mode 100644
index 39f8e67fd0a..00000000000
--- a/cross/i386-netbsdpe/patches/binutils-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: binutils-ak,v 1.1 2004/03/09 12:19:12 kent Exp $
-
---- gas/Makefile.in.orig	2004-03-09 14:46:34.000000000 +0900
-+++ gas/Makefile.in
-@@ -2866,6 +2866,7 @@ install-data-am:
- install-exec-am: install-exec-local
- 
- install-info:
-+install-info-am:
- 
- install-man:
-