Update MinGW to 3.2 with gcc-3.3.3, binutils-2.15.90, and w32api-2.5.

Fixes PR pkg/19167

5 files changed, 443 insertions, 281 deletions

diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile
index 4af8577d175..70054067ee5 100644
--- a/cross/i386-mingw32/Makefile
+++ b/cross/i386-mingw32/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2004/01/22 07:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/11 18:07:09 kent Exp $
 
-DISTNAME=		cross-${TARGET_ARCH}-1.2
-PKGREVISION=		3
+DISTNAME=		cross-${TARGET_ARCH}-3.2
 CROSS_DISTFILES=
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.mingw.org/
@@ -13,17 +12,20 @@ TARGET_ARCH=		i386-mingw32
 TARGET_DIR=		${PREFIX}/${TARGET_ARCH}
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mingw/}
-CROSS_DISTFILES+=	binutils-2.11.92-20011113-src.tar.gz
-BINUTILS_WRKSRC=	${WRKDIR}/binutils-2.11.92-20011113
+CROSS_DISTFILES+=	binutils-2.15.90-20040222-1-src.tar.gz
+BINUTILS_WRKSRC=	${WRKDIR}/binutils-2.15.90-20040222-1
 BINUTILS_EXTRAS=	dlltool dllwrap windres
-CROSS_DISTFILES+=	gcc-2.95.3-20011106-src.tar.gz
-GCC_WRKSRC=		${WRKDIR}/gcc-2.95.3-20011106
-GCC_VERSION=		2.95.3-7
+GCC_VERSION=		3.3.3
+CROSS_DISTFILES+=	gcc-${GCC_VERSION}.tar.gz gcc-3.3.3-20040217-1-src.diff.gz \
+			gcc-g++-3.3.3-20040217-1.tar.gz
+MASTER_SITES+=		${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.3/}
+GCC_WIN32_PATCH=	${WRKDIR}/gcc-3.3.3-20040217-1-src.diff
+GCC_WRKSRC=		${WRKDIR}/gcc-${GCC_VERSION}
 PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION}
-CROSS_DISTFILES+=	mingw-runtime-1.2-src.tar.gz
-MINGW_WRKSRC=		${WRKDIR}/mingw-runtime-1.2
-CROSS_DISTFILES+=	w32api-1.2-src.tar.gz
-W32_WRKSRC=		${WRKDIR}/w32api-1.2
+CROSS_DISTFILES+=	mingw-runtime-3.2.tar.gz
+MINGW_WRKSRC=		${WRKDIR}/mingw-runtime-3.2
+CROSS_DISTFILES+=	w32api-2.5.tar.gz
+W32_WRKSRC=		${WRKDIR}/w32api-2.5
 USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
@@ -35,7 +37,7 @@ RANLIB_FOR_TARGET=	${BINUTILS_WRKSRC}/binutils/ranlib
 LD_FOR_TARGET=		${BINUTILS_WRKSRC}/ld/ld-new
 CC_FOR_TARGET=		${GCC_WRKSRC}/${TARGET_ARCH}/gcc/xgcc \
 		-B${GCC_WRKSRC}/${TARGET_ARCH}/gcc/ ${CFLAGS_FOR_TARGET} \
-		-I${MINGW_WRKSRC}/include -I${W32_WRKSRC}/include -L${W32_WRKSRC}/lib
+		-I${WRKSRC}/include -L${WRKSRC}/lib
 CXX_FOR_TARGET=		${CC_FOR_TARGET}
 GCC_MAKE_FLAGS=		\
 			CC_FOR_TARGET="${CC_FOR_TARGET}" \
@@ -59,6 +61,9 @@ TARGET_CONFIGURE_ENV=	CC="${CC_FOR_TARGET}" \
 
 DISTFILES+=	${CROSS_DISTFILES}
 
+post-extract:
+	-${PATCH} -d ${GCC_WRKSRC} -p1 --forward --quiet -E < ${GCC_WIN32_PATCH}
+
 do-configure: bu-configure gcc-configure
 bu-configure:
 	cd ${BINUTILS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
@@ -67,32 +72,18 @@ gcc-configure:
 	-${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}
 	cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${CONFIGURE_ENV} ../configure \
 		--prefix=${PREFIX} --target=${TARGET_ARCH} \
-		--with-gnu-as --with-gnu-ld --disable-multilib --disable-nls
-	-${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}/${TARGET_ARCH}/libiberty
-	cd ${GCC_WRKSRC}/${TARGET_ARCH}/${TARGET_ARCH}/libiberty && ${SETENV} \
-		${CONFIGURE_ENV} ../../../libiberty/configure \
-		--prefix=${PREFIX} --target=${TARGET_ARCH} --disable-nls
-	${CP} ${FILESDIR}/config.h ${GCC_WRKSRC}/${TARGET_ARCH}/${TARGET_ARCH}/libiberty
+		--with-gnu-as --with-gnu-ld --disable-multilib --disable-nls \
+		--enable-sjlj-exceptions \
+		--with-gxx-include-dir=${TARGET_DIR}/include/c++/${GCC_VERSION}
 
-do-build: bu-build gcc-build w32-build mingw-build
-bu-build:
+do-build:
 	cd ${BINUTILS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-gcc-build:
 	@${LN} -sf ${AS_FOR_TARGET} ${GCC_WRKSRC}/${TARGET_ARCH}/gcc/as
 	@${LN} -sf ${LD_FOR_TARGET} ${GCC_WRKSRC}/${TARGET_ARCH}/gcc/ld
 	cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS}
-w32-build:
-	cd ${W32_WRKSRC} && ${SETENV} ${TARGET_CONFIGURE_ENV} ${CONFIGURE_ENV} \
-		./configure --target=${TARGET_ARCH}
-	cd ${W32_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-mingw-build:
-	cd ${MINGW_WRKSRC} && ${SETENV} ${TARGET_CONFIGURE_ENV} ${CONFIGURE_ENV} \
-		./configure --target=${TARGET_ARCH}
-	cd ${MINGW_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} all-gcc
 
-
-do-install: bu-install gcc-install w32-install mingw-install
+do-install: bu-install gcc-install mingw-install
 bu-install:
 	${INSTALL_PROGRAM_DIR} ${TARGET_DIR}/bin
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
@@ -111,34 +102,20 @@ gcc-install:
 	@cd ${GCC_WRKSRC}/${TARGET_ARCH}/gcc && ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} \
 		install-common install-headers install-libgcc install-driver
-	@${MKDIR} ${TARGET_DIR}/include/g++-3
-	@${MKDIR} ${TARGET_DIR}/include/g++-3/std
-	${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
-	@cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-		${MAKE_FLAGS} ${GCC_MAKE_FLAGS} prefix="${TARGET_DIR}" \
-		tooldir="${TARGET_DIR}" \
-		libsubdir="${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}" \
-		install-target-libstdc++
-	for file in c++ c++filt g++; do \
+	for file in c++ g++; do \
 		${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
 	done
-w32-install:
+	${RM} ${PREFIX}/bin/${TARGET_ARCH}-gcj
+mingw-install:
 	${INSTALL_DATA_DIR} ${TARGET_DIR}/include
-	${INSTALL_DATA} ${W32_WRKSRC}/include/*.h ${TARGET_DIR}/include
+	cd ${WRKSRC}/include && ${TAR} cf - * | ${TAR} xf - -C ${TARGET_DIR}/include
+	${MV} ${TARGET_DIR}/include/c++/${GCC_VERSION}/mingw32 \
+		${TARGET_DIR}/include/c++/${GCC_VERSION}/i386-mingw32
+	${CHMOD} a-wx `${FIND} ${TARGET_DIR}/include -type f`
+	${CHMOD} a-w `${FIND} ${TARGET_DIR}/include -type d`
 	${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
-	${INSTALL_DATA} ${W32_WRKSRC}/lib/lib*.a ${TARGET_DIR}/lib
-mingw-install:
-	${INSTALL_DATA_DIR} ${TARGET_DIR}/include/sys
-	${INSTALL_DATA} ${MINGW_WRKSRC}/include/*.h ${TARGET_DIR}/include
-	${INSTALL_DATA} ${MINGW_WRKSRC}/include/sys/*.h ${TARGET_DIR}/include/sys
-	for file in libcrtdll libmsvcrt libmsvcrt20 libmsvcrt40 libmingw32 \
-	libcoldname libmoldname libm libmingwthrd profile/libgmon ; do \
-		${INSTALL_DATA} ${MINGW_WRKSRC}/$$file.a ${TARGET_DIR}/lib; \
-	done
-	${INSTALL_DATA} ${MINGW_WRKSRC}/mingwm10.dll ${TARGET_DIR}/lib
-	for file in crt1 dllcrt1 crt2 dllcrt2  CRT_noglob crtmt crtst \
-	profile/gcrt1 profile/gcrt2; do \
-		${INSTALL_DATA} ${MINGW_WRKSRC}/$$file.o ${TARGET_DIR}/lib; \
-	done
+	-rm -r ${WRKSRC}/lib/gcc-lib
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${TARGET_DIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/bin/mingwm10.dll ${TARGET_DIR}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/i386-mingw32/PLIST b/cross/i386-mingw32/PLIST
index c370021efc4..fdeeb07e4a4 100644
--- a/cross/i386-mingw32/PLIST
+++ b/cross/i386-mingw32/PLIST
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/05 18:55:26 kent Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/11 18:07:09 kent Exp $
 bin/i386-mingw32-addr2line
 bin/i386-mingw32-ar
 bin/i386-mingw32-as
 bin/i386-mingw32-c++
-bin/i386-mingw32-c++filt
 bin/i386-mingw32-dlltool
 bin/i386-mingw32-dllwrap
 bin/i386-mingw32-g++
 bin/i386-mingw32-gcc
+bin/i386-mingw32-gcc-${GCC_VERSION}
+bin/i386-mingw32-gccbug
 bin/i386-mingw32-ld
 bin/i386-mingw32-nm
 bin/i386-mingw32-objcopy
@@ -21,7 +22,6 @@ i386-mingw32/bin/addr2line
 i386-mingw32/bin/ar
 i386-mingw32/bin/as
 i386-mingw32/bin/c++
-i386-mingw32/bin/c++filt
 i386-mingw32/bin/dlltool
 i386-mingw32/bin/dllwrap
 i386-mingw32/bin/g++
@@ -35,14 +35,205 @@ i386-mingw32/bin/size
 i386-mingw32/bin/strings
 i386-mingw32/bin/strip
 i386-mingw32/bin/windres
+i386-mingw32/include/GL/gl.h
+i386-mingw32/include/GL/glext.h
+i386-mingw32/include/GL/glu.h
 i386-mingw32/include/_mingw.h
 i386-mingw32/include/accctrl.h
 i386-mingw32/include/aclapi.h
+i386-mingw32/include/afxres.h
 i386-mingw32/include/assert.h
 i386-mingw32/include/basetsd.h
 i386-mingw32/include/basetyps.h
+i386-mingw32/include/c++/${GCC_VERSION}/algorithm
+i386-mingw32/include/c++/${GCC_VERSION}/backward/algo.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/algobase.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/alloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/backward_warning.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/bvector.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/complex.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/defalloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/deque.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/fstream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/function.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/hash_map.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/hash_set.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/hashtable.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/heap.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/iomanip.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/iostream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/istream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/list.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/map.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/multimap.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/multiset.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/new.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/ostream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/pair.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/queue.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/rope.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/set.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/slist.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/stack.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/stream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/streambuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/strstream
+i386-mingw32/include/c++/${GCC_VERSION}/backward/tempbuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/tree.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/vector.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_ios.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_ios.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_string.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_string.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/boost_concept_check.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/char_traits.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/cmath.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/codecvt.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/concept_check.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/cpp_type_traits.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/deque.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/fpos.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/fstream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/functexcept.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/gslice.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/gslice_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/indirect_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/ios_base.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/istream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/list.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/locale_classes.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/locale_facets.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/locale_facets.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/localefwd.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/mask_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/ostream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/pthread_allocimpl.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/slice_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/sstream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_algo.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_algobase.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_alloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_bvector.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_construct.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_deque.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_function.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_heap.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_iterator_base_funcs.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_iterator_base_types.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_list.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_map.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_multimap.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_multiset.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_numeric.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_pair.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_pthread_alloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_queue.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_raw_storage_iter.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_relops.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_set.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_stack.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_tempbuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_threads.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_tree.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_uninitialized.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_vector.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stream_iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/streambuf.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/streambuf_iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stringfwd.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/type_traits.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/valarray_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/valarray_array.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/valarray_meta.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/vector.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bitset
+i386-mingw32/include/c++/${GCC_VERSION}/cassert
+i386-mingw32/include/c++/${GCC_VERSION}/cctype
+i386-mingw32/include/c++/${GCC_VERSION}/cerrno
+i386-mingw32/include/c++/${GCC_VERSION}/cfloat
+i386-mingw32/include/c++/${GCC_VERSION}/ciso646
+i386-mingw32/include/c++/${GCC_VERSION}/climits
+i386-mingw32/include/c++/${GCC_VERSION}/clocale
+i386-mingw32/include/c++/${GCC_VERSION}/cmath
+i386-mingw32/include/c++/${GCC_VERSION}/complex
+i386-mingw32/include/c++/${GCC_VERSION}/csetjmp
+i386-mingw32/include/c++/${GCC_VERSION}/csignal
+i386-mingw32/include/c++/${GCC_VERSION}/cstdarg
+i386-mingw32/include/c++/${GCC_VERSION}/cstddef
+i386-mingw32/include/c++/${GCC_VERSION}/cstdio
+i386-mingw32/include/c++/${GCC_VERSION}/cstdlib
+i386-mingw32/include/c++/${GCC_VERSION}/cstring
+i386-mingw32/include/c++/${GCC_VERSION}/ctime
+i386-mingw32/include/c++/${GCC_VERSION}/cwchar
+i386-mingw32/include/c++/${GCC_VERSION}/cwctype
+i386-mingw32/include/c++/${GCC_VERSION}/cxxabi.h
+i386-mingw32/include/c++/${GCC_VERSION}/deque
+i386-mingw32/include/c++/${GCC_VERSION}/exception
+i386-mingw32/include/c++/${GCC_VERSION}/exception_defines.h
+i386-mingw32/include/c++/${GCC_VERSION}/ext/algorithm
+i386-mingw32/include/c++/${GCC_VERSION}/ext/enc_filebuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/ext/functional
+i386-mingw32/include/c++/${GCC_VERSION}/ext/hash_map
+i386-mingw32/include/c++/${GCC_VERSION}/ext/hash_set
+i386-mingw32/include/c++/${GCC_VERSION}/ext/iterator
+i386-mingw32/include/c++/${GCC_VERSION}/ext/memory
+i386-mingw32/include/c++/${GCC_VERSION}/ext/numeric
+i386-mingw32/include/c++/${GCC_VERSION}/ext/rb_tree
+i386-mingw32/include/c++/${GCC_VERSION}/ext/rope
+i386-mingw32/include/c++/${GCC_VERSION}/ext/ropeimpl.h
+i386-mingw32/include/c++/${GCC_VERSION}/ext/slist
+i386-mingw32/include/c++/${GCC_VERSION}/ext/stdio_filebuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/ext/stl_hash_fun.h
+i386-mingw32/include/c++/${GCC_VERSION}/ext/stl_hashtable.h
+i386-mingw32/include/c++/${GCC_VERSION}/ext/stl_rope.h
+i386-mingw32/include/c++/${GCC_VERSION}/fstream
+i386-mingw32/include/c++/${GCC_VERSION}/functional
+i386-mingw32/include/c++/${GCC_VERSION}/iomanip
+i386-mingw32/include/c++/${GCC_VERSION}/ios
+i386-mingw32/include/c++/${GCC_VERSION}/iosfwd
+i386-mingw32/include/c++/${GCC_VERSION}/iostream
+i386-mingw32/include/c++/${GCC_VERSION}/istream
+i386-mingw32/include/c++/${GCC_VERSION}/iterator
+i386-mingw32/include/c++/${GCC_VERSION}/limits
+i386-mingw32/include/c++/${GCC_VERSION}/list
+i386-mingw32/include/c++/${GCC_VERSION}/locale
+i386-mingw32/include/c++/${GCC_VERSION}/map
+i386-mingw32/include/c++/${GCC_VERSION}/memory
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/atomicity.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/basic_file.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/c++config.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/c++io.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/c++locale.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/codecvt_specializations.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/ctype_base.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/ctype_inline.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/ctype_noninline.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/gthr-default.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/gthr-posix.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/gthr-single.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/gthr.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/messages_members.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/os_defines.h
+i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits/time_members.h
+i386-mingw32/include/c++/${GCC_VERSION}/new
+i386-mingw32/include/c++/${GCC_VERSION}/numeric
+i386-mingw32/include/c++/${GCC_VERSION}/ostream
+i386-mingw32/include/c++/${GCC_VERSION}/queue
+i386-mingw32/include/c++/${GCC_VERSION}/set
+i386-mingw32/include/c++/${GCC_VERSION}/sstream
+i386-mingw32/include/c++/${GCC_VERSION}/stack
+i386-mingw32/include/c++/${GCC_VERSION}/stdexcept
+i386-mingw32/include/c++/${GCC_VERSION}/streambuf
+i386-mingw32/include/c++/${GCC_VERSION}/string
+i386-mingw32/include/c++/${GCC_VERSION}/typeinfo
+i386-mingw32/include/c++/${GCC_VERSION}/utility
+i386-mingw32/include/c++/${GCC_VERSION}/valarray
+i386-mingw32/include/c++/${GCC_VERSION}/vector
 i386-mingw32/include/cderr.h
 i386-mingw32/include/cguid.h
+i386-mingw32/include/comcat.h
 i386-mingw32/include/commctrl.h
 i386-mingw32/include/commdlg.h
 i386-mingw32/include/conio.h
@@ -53,145 +244,107 @@ i386-mingw32/include/custcntl.h
 i386-mingw32/include/dbt.h
 i386-mingw32/include/dde.h
 i386-mingw32/include/ddeml.h
+i386-mingw32/include/ddk/atm.h
+i386-mingw32/include/ddk/batclass.h
+i386-mingw32/include/ddk/cfg.h
+i386-mingw32/include/ddk/cfgmgr32.h
+i386-mingw32/include/ddk/d4drvif.h
+i386-mingw32/include/ddk/d4iface.h
+i386-mingw32/include/ddk/ddkmapi.h
+i386-mingw32/include/ddk/hidclass.h
+i386-mingw32/include/ddk/hidpi.h
+i386-mingw32/include/ddk/hidusage.h
+i386-mingw32/include/ddk/mcd.h
+i386-mingw32/include/ddk/miniport.h
+i386-mingw32/include/ddk/minitape.h
+i386-mingw32/include/ddk/mountdev.h
+i386-mingw32/include/ddk/mountmgr.h
+i386-mingw32/include/ddk/ndis.h
+i386-mingw32/include/ddk/ndisguid.h
+i386-mingw32/include/ddk/ndistapi.h
+i386-mingw32/include/ddk/ndiswan.h
+i386-mingw32/include/ddk/netevent.h
+i386-mingw32/include/ddk/netpnp.h
+i386-mingw32/include/ddk/newdev.h
+i386-mingw32/include/ddk/ntapi.h
+i386-mingw32/include/ddk/ntdd8042.h
+i386-mingw32/include/ddk/ntddbeep.h
+i386-mingw32/include/ddk/ntddcdrm.h
+i386-mingw32/include/ddk/ntddcdvd.h
+i386-mingw32/include/ddk/ntddchgr.h
+i386-mingw32/include/ddk/ntdddisk.h
+i386-mingw32/include/ddk/ntddk.h
+i386-mingw32/include/ddk/ntddkbd.h
+i386-mingw32/include/ddk/ntddmou.h
+i386-mingw32/include/ddk/ntddndis.h
+i386-mingw32/include/ddk/ntddpar.h
+i386-mingw32/include/ddk/ntddpcm.h
+i386-mingw32/include/ddk/ntddscsi.h
+i386-mingw32/include/ddk/ntddser.h
+i386-mingw32/include/ddk/ntddstor.h
+i386-mingw32/include/ddk/ntddtape.h
+i386-mingw32/include/ddk/ntddtdi.h
+i386-mingw32/include/ddk/ntddvdeo.h
+i386-mingw32/include/ddk/ntddvol.h
+i386-mingw32/include/ddk/ntifs.h
+i386-mingw32/include/ddk/ntpoapi.h
+i386-mingw32/include/ddk/ntstatus.h
+i386-mingw32/include/ddk/parallel.h
+i386-mingw32/include/ddk/pfhook.h
+i386-mingw32/include/ddk/poclass.h
+i386-mingw32/include/ddk/scsi.h
+i386-mingw32/include/ddk/scsiscan.h
+i386-mingw32/include/ddk/scsiwmi.h
+i386-mingw32/include/ddk/smbus.h
+i386-mingw32/include/ddk/srb.h
+i386-mingw32/include/ddk/storport.h
+i386-mingw32/include/ddk/tdi.h
+i386-mingw32/include/ddk/tdiinfo.h
+i386-mingw32/include/ddk/tdikrnl.h
+i386-mingw32/include/ddk/tdistat.h
+i386-mingw32/include/ddk/tvout.h
+i386-mingw32/include/ddk/upssvc.h
+i386-mingw32/include/ddk/usb.h
+i386-mingw32/include/ddk/usb100.h
+i386-mingw32/include/ddk/usbcamdi.h
+i386-mingw32/include/ddk/usbdi.h
+i386-mingw32/include/ddk/usbioctl.h
+i386-mingw32/include/ddk/usbiodef.h
+i386-mingw32/include/ddk/usbscan.h
+i386-mingw32/include/ddk/usbuser.h
+i386-mingw32/include/ddk/video.h
+i386-mingw32/include/ddk/videoagp.h
+i386-mingw32/include/ddk/win2k.h
+i386-mingw32/include/ddk/winddi.h
+i386-mingw32/include/ddk/winddk.h
+i386-mingw32/include/ddk/winnt4.h
+i386-mingw32/include/ddk/winxp.h
+i386-mingw32/include/ddk/ws2san.h
+i386-mingw32/include/ddk/xfilter.h
+i386-mingw32/include/dhcpcsdk.h
 i386-mingw32/include/dir.h
 i386-mingw32/include/direct.h
 i386-mingw32/include/dirent.h
 i386-mingw32/include/dlgs.h
+i386-mingw32/include/docobj.h
 i386-mingw32/include/dos.h
 i386-mingw32/include/errno.h
+i386-mingw32/include/errorrep.h
 i386-mingw32/include/excpt.h
+i386-mingw32/include/exdisp.h
+i386-mingw32/include/exdispid.h
 i386-mingw32/include/fcntl.h
+i386-mingw32/include/fenv.h
 i386-mingw32/include/float.h
-i386-mingw32/include/g++-3/algo.h
-i386-mingw32/include/g++-3/algobase.h
-i386-mingw32/include/g++-3/algorithm
-i386-mingw32/include/g++-3/alloc.h
-i386-mingw32/include/g++-3/bitset
-i386-mingw32/include/g++-3/bvector.h
-i386-mingw32/include/g++-3/cassert
-i386-mingw32/include/g++-3/cctype
-i386-mingw32/include/g++-3/cerrno
-i386-mingw32/include/g++-3/cfloat
-i386-mingw32/include/g++-3/ciso646
-i386-mingw32/include/g++-3/climits
-i386-mingw32/include/g++-3/clocale
-i386-mingw32/include/g++-3/cmath
-i386-mingw32/include/g++-3/complex
-i386-mingw32/include/g++-3/complex.h
-i386-mingw32/include/g++-3/csetjmp
-i386-mingw32/include/g++-3/csignal
-i386-mingw32/include/g++-3/cstdarg
-i386-mingw32/include/g++-3/cstddef
-i386-mingw32/include/g++-3/cstdio
-i386-mingw32/include/g++-3/cstdlib
-i386-mingw32/include/g++-3/cstring
-i386-mingw32/include/g++-3/ctime
-i386-mingw32/include/g++-3/cwchar
-i386-mingw32/include/g++-3/cwctype
-i386-mingw32/include/g++-3/defalloc.h
-i386-mingw32/include/g++-3/deque
-i386-mingw32/include/g++-3/deque.h
-i386-mingw32/include/g++-3/fstream
-i386-mingw32/include/g++-3/function.h
-i386-mingw32/include/g++-3/functional
-i386-mingw32/include/g++-3/hash_map
-i386-mingw32/include/g++-3/hash_map.h
-i386-mingw32/include/g++-3/hash_set
-i386-mingw32/include/g++-3/hash_set.h
-i386-mingw32/include/g++-3/hashtable.h
-i386-mingw32/include/g++-3/heap.h
-i386-mingw32/include/g++-3/iomanip
-i386-mingw32/include/g++-3/iosfwd
-i386-mingw32/include/g++-3/iostream
-i386-mingw32/include/g++-3/iterator
-i386-mingw32/include/g++-3/iterator.h
-i386-mingw32/include/g++-3/list
-i386-mingw32/include/g++-3/list.h
-i386-mingw32/include/g++-3/map
-i386-mingw32/include/g++-3/map.h
-i386-mingw32/include/g++-3/memory
-i386-mingw32/include/g++-3/multimap.h
-i386-mingw32/include/g++-3/multiset.h
-i386-mingw32/include/g++-3/numeric
-i386-mingw32/include/g++-3/pair.h
-i386-mingw32/include/g++-3/pthread_alloc
-i386-mingw32/include/g++-3/pthread_alloc.h
-i386-mingw32/include/g++-3/queue
-i386-mingw32/include/g++-3/rope
-i386-mingw32/include/g++-3/rope.h
-i386-mingw32/include/g++-3/ropeimpl.h
-i386-mingw32/include/g++-3/set
-i386-mingw32/include/g++-3/set.h
-i386-mingw32/include/g++-3/slist
-i386-mingw32/include/g++-3/slist.h
-i386-mingw32/include/g++-3/sstream
-i386-mingw32/include/g++-3/stack
-i386-mingw32/include/g++-3/stack.h
-i386-mingw32/include/g++-3/std/bastring.cc
-i386-mingw32/include/g++-3/std/bastring.h
-i386-mingw32/include/g++-3/std/complext.cc
-i386-mingw32/include/g++-3/std/complext.h
-i386-mingw32/include/g++-3/std/dcomplex.h
-i386-mingw32/include/g++-3/std/fcomplex.h
-i386-mingw32/include/g++-3/std/gslice.h
-i386-mingw32/include/g++-3/std/gslice_array.h
-i386-mingw32/include/g++-3/std/indirect_array.h
-i386-mingw32/include/g++-3/std/ldcomplex.h
-i386-mingw32/include/g++-3/std/mask_array.h
-i386-mingw32/include/g++-3/std/slice.h
-i386-mingw32/include/g++-3/std/slice_array.h
-i386-mingw32/include/g++-3/std/std_valarray.h
-i386-mingw32/include/g++-3/std/straits.h
-i386-mingw32/include/g++-3/std/valarray_array.h
-i386-mingw32/include/g++-3/std/valarray_array.tcc
-i386-mingw32/include/g++-3/std/valarray_meta.h
-i386-mingw32/include/g++-3/stdexcept
-i386-mingw32/include/g++-3/stl.h
-i386-mingw32/include/g++-3/stl_algo.h
-i386-mingw32/include/g++-3/stl_algobase.h
-i386-mingw32/include/g++-3/stl_alloc.h
-i386-mingw32/include/g++-3/stl_bvector.h
-i386-mingw32/include/g++-3/stl_config.h
-i386-mingw32/include/g++-3/stl_construct.h
-i386-mingw32/include/g++-3/stl_deque.h
-i386-mingw32/include/g++-3/stl_function.h
-i386-mingw32/include/g++-3/stl_hash_fun.h
-i386-mingw32/include/g++-3/stl_hash_map.h
-i386-mingw32/include/g++-3/stl_hash_set.h
-i386-mingw32/include/g++-3/stl_hashtable.h
-i386-mingw32/include/g++-3/stl_heap.h
-i386-mingw32/include/g++-3/stl_iterator.h
-i386-mingw32/include/g++-3/stl_list.h
-i386-mingw32/include/g++-3/stl_map.h
-i386-mingw32/include/g++-3/stl_multimap.h
-i386-mingw32/include/g++-3/stl_multiset.h
-i386-mingw32/include/g++-3/stl_numeric.h
-i386-mingw32/include/g++-3/stl_pair.h
-i386-mingw32/include/g++-3/stl_queue.h
-i386-mingw32/include/g++-3/stl_raw_storage_iter.h
-i386-mingw32/include/g++-3/stl_relops.h
-i386-mingw32/include/g++-3/stl_rope.h
-i386-mingw32/include/g++-3/stl_set.h
-i386-mingw32/include/g++-3/stl_slist.h
-i386-mingw32/include/g++-3/stl_stack.h
-i386-mingw32/include/g++-3/stl_tempbuf.h
-i386-mingw32/include/g++-3/stl_tree.h
-i386-mingw32/include/g++-3/stl_uninitialized.h
-i386-mingw32/include/g++-3/stl_vector.h
-i386-mingw32/include/g++-3/string
-i386-mingw32/include/g++-3/strstream
-i386-mingw32/include/g++-3/tempbuf.h
-i386-mingw32/include/g++-3/tree.h
-i386-mingw32/include/g++-3/type_traits.h
-i386-mingw32/include/g++-3/utility
-i386-mingw32/include/g++-3/valarray
-i386-mingw32/include/g++-3/vector
-i386-mingw32/include/g++-3/vector.h
+i386-mingw32/include/getopt.h
+i386-mingw32/include/gmon.h
 i386-mingw32/include/httpext.h
+i386-mingw32/include/idispids.h
 i386-mingw32/include/imagehlp.h
 i386-mingw32/include/imm.h
 i386-mingw32/include/initguid.h
 i386-mingw32/include/intshcut.h
+i386-mingw32/include/inttypes.h
 i386-mingw32/include/io.h
 i386-mingw32/include/ipexport.h
 i386-mingw32/include/iphlpapi.h
@@ -227,18 +380,26 @@ i386-mingw32/include/lmwksta.h
 i386-mingw32/include/locale.h
 i386-mingw32/include/lzexpand.h
 i386-mingw32/include/malloc.h
+i386-mingw32/include/mapi.h
 i386-mingw32/include/math.h
+i386-mingw32/include/mbctype.h
+i386-mingw32/include/mbstring.h
 i386-mingw32/include/mciavi.h
 i386-mingw32/include/mcx.h
 i386-mingw32/include/mem.h
 i386-mingw32/include/memory.h
+i386-mingw32/include/mgmtapi.h
 i386-mingw32/include/mmsystem.h
+i386-mingw32/include/mshtml.h
 i386-mingw32/include/mswsock.h
 i386-mingw32/include/nb30.h
 i386-mingw32/include/nddeapi.h
 i386-mingw32/include/nspapi.h
 i386-mingw32/include/ntdef.h
+i386-mingw32/include/ntdll.h
+i386-mingw32/include/ntldap.h
 i386-mingw32/include/ntsecapi.h
+i386-mingw32/include/ntsecpkg.h
 i386-mingw32/include/oaidl.h
 i386-mingw32/include/objbase.h
 i386-mingw32/include/objfwd.h
@@ -248,6 +409,7 @@ i386-mingw32/include/odbcinst.h
 i386-mingw32/include/ole.h
 i386-mingw32/include/ole2.h
 i386-mingw32/include/ole2ver.h
+i386-mingw32/include/oleacc.h
 i386-mingw32/include/oleauto.h
 i386-mingw32/include/olectl.h
 i386-mingw32/include/olectlid.h
@@ -255,7 +417,10 @@ i386-mingw32/include/oledlg.h
 i386-mingw32/include/oleidl.h
 i386-mingw32/include/pbt.h
 i386-mingw32/include/poppack.h
+i386-mingw32/include/powrprof.h
 i386-mingw32/include/process.h
+i386-mingw32/include/profil.h
+i386-mingw32/include/profile.h
 i386-mingw32/include/prsht.h
 i386-mingw32/include/psapi.h
 i386-mingw32/include/pshpack1.h
@@ -264,6 +429,7 @@ i386-mingw32/include/pshpack4.h
 i386-mingw32/include/pshpack8.h
 i386-mingw32/include/rapi.h
 i386-mingw32/include/ras.h
+i386-mingw32/include/rasdlg.h
 i386-mingw32/include/raserror.h
 i386-mingw32/include/rassapi.h
 i386-mingw32/include/regstr.h
@@ -278,18 +444,27 @@ i386-mingw32/include/rpcnsi.h
 i386-mingw32/include/rpcnsip.h
 i386-mingw32/include/rpcnterr.h
 i386-mingw32/include/rpcproxy.h
+i386-mingw32/include/schannel.h
+i386-mingw32/include/schnlsp.h
 i386-mingw32/include/scrnsave.h
+i386-mingw32/include/search.h
+i386-mingw32/include/secext.h
+i386-mingw32/include/security.h
+i386-mingw32/include/servprov.h
 i386-mingw32/include/setjmp.h
 i386-mingw32/include/setupapi.h
 i386-mingw32/include/share.h
 i386-mingw32/include/shellapi.h
 i386-mingw32/include/shlguid.h
 i386-mingw32/include/shlobj.h
+i386-mingw32/include/shlwapi.h
 i386-mingw32/include/signal.h
+i386-mingw32/include/snmp.h
 i386-mingw32/include/sql.h
 i386-mingw32/include/sqlext.h
 i386-mingw32/include/sqltypes.h
 i386-mingw32/include/sqlucode.h
+i386-mingw32/include/sspi.h
 i386-mingw32/include/stdarg.h
 i386-mingw32/include/stddef.h
 i386-mingw32/include/stdint.h
@@ -298,9 +473,11 @@ i386-mingw32/include/stdlib.h
 i386-mingw32/include/string.h
 i386-mingw32/include/strings.h
 i386-mingw32/include/subauth.h
+i386-mingw32/include/svcguid.h
 i386-mingw32/include/sys/fcntl.h
 i386-mingw32/include/sys/file.h
 i386-mingw32/include/sys/locking.h
+i386-mingw32/include/sys/param.h
 i386-mingw32/include/sys/stat.h
 i386-mingw32/include/sys/time.h
 i386-mingw32/include/sys/timeb.h
@@ -310,40 +487,56 @@ i386-mingw32/include/sys/utime.h
 i386-mingw32/include/tchar.h
 i386-mingw32/include/time.h
 i386-mingw32/include/tlhelp32.h
+i386-mingw32/include/tmschema.h
 i386-mingw32/include/unistd.h
 i386-mingw32/include/unknwn.h
 i386-mingw32/include/userenv.h
+i386-mingw32/include/utime.h
+i386-mingw32/include/uxtheme.h
 i386-mingw32/include/values.h
 i386-mingw32/include/varargs.h
+i386-mingw32/include/vfw.h
 i386-mingw32/include/w32api.h
 i386-mingw32/include/wchar.h
 i386-mingw32/include/wctype.h
+i386-mingw32/include/winable.h
 i386-mingw32/include/winbase.h
+i386-mingw32/include/winber.h
 i386-mingw32/include/wincon.h
 i386-mingw32/include/wincrypt.h
 i386-mingw32/include/windef.h
+i386-mingw32/include/windns.h
 i386-mingw32/include/windows.h
 i386-mingw32/include/windowsx.h
 i386-mingw32/include/winerror.h
 i386-mingw32/include/wingdi.h
 i386-mingw32/include/wininet.h
 i386-mingw32/include/winioctl.h
+i386-mingw32/include/winldap.h
 i386-mingw32/include/winnetwk.h
 i386-mingw32/include/winnls.h
 i386-mingw32/include/winnt.h
 i386-mingw32/include/winperf.h
 i386-mingw32/include/winreg.h
 i386-mingw32/include/winresrc.h
+i386-mingw32/include/winsnmp.h
 i386-mingw32/include/winsock.h
 i386-mingw32/include/winsock2.h
 i386-mingw32/include/winspool.h
 i386-mingw32/include/winsvc.h
 i386-mingw32/include/winuser.h
 i386-mingw32/include/winver.h
+i386-mingw32/include/ws2spi.h
 i386-mingw32/include/ws2tcpip.h
+i386-mingw32/include/wsahelp.h
+i386-mingw32/include/wsipx.h
+i386-mingw32/include/wsnetbs.h
 i386-mingw32/include/wtypes.h
 i386-mingw32/include/zmouse.h
+i386-mingw32/lib/CRT_fp10.o
+i386-mingw32/lib/CRT_fp8.o
 i386-mingw32/lib/CRT_noglob.o
+i386-mingw32/lib/binmode.o
 i386-mingw32/lib/crt1.o
 i386-mingw32/lib/crt2.o
 i386-mingw32/lib/crtmt.o
@@ -353,28 +546,41 @@ i386-mingw32/lib/dllcrt2.o
 i386-mingw32/lib/gcrt1.o
 i386-mingw32/lib/gcrt2.o
 i386-mingw32/lib/libadvapi32.a
+i386-mingw32/lib/libapcups.a
+i386-mingw32/lib/libavicap32.a
+i386-mingw32/lib/libavifil32.a
 i386-mingw32/lib/libcap.a
+i386-mingw32/lib/libcfgmgr32.a
 i386-mingw32/lib/libcoldname.a
 i386-mingw32/lib/libcomctl32.a
 i386-mingw32/lib/libcomdlg32.a
 i386-mingw32/lib/libcrtdll.a
+i386-mingw32/lib/libcrypt32.a
 i386-mingw32/lib/libctl3d32.a
 i386-mingw32/lib/libd3dim.a
 i386-mingw32/lib/libd3drm.a
 i386-mingw32/lib/libd3dxof.a
 i386-mingw32/lib/libddraw.a
+i386-mingw32/lib/libdhcpcsvc.a
 i386-mingw32/lib/libdinput.a
 i386-mingw32/lib/libdlcapi.a
+i386-mingw32/lib/libdnsapi.a
 i386-mingw32/lib/libdplayx.a
 i386-mingw32/lib/libdsetup.a
 i386-mingw32/lib/libdsound.a
+i386-mingw32/lib/libdxapi.a
 i386-mingw32/lib/libdxguid.a
+i386-mingw32/lib/libfaultrep.a
 i386-mingw32/lib/libgdi32.a
 i386-mingw32/lib/libglaux.a
 i386-mingw32/lib/libglu32.a
 i386-mingw32/lib/libglut.a
 i386-mingw32/lib/libglut32.a
 i386-mingw32/lib/libgmon.a
+i386-mingw32/lib/libhal.a
+i386-mingw32/lib/libhid.a
+i386-mingw32/lib/libhidparse.a
+i386-mingw32/lib/libigmpagnt.a
 i386-mingw32/lib/libimagehlp.a
 i386-mingw32/lib/libimm32.a
 i386-mingw32/lib/libiphlpapi.a
@@ -383,23 +589,35 @@ i386-mingw32/lib/liblargeint.a
 i386-mingw32/lib/liblz32.a
 i386-mingw32/lib/libm.a
 i386-mingw32/lib/libmapi32.a
+i386-mingw32/lib/libmcd.a
 i386-mingw32/lib/libmfcuia32.a
 i386-mingw32/lib/libmgmtapi.a
 i386-mingw32/lib/libmingw32.a
+i386-mingw32/lib/libmingwex.a
 i386-mingw32/lib/libmingwthrd.a
 i386-mingw32/lib/libmoldname.a
+i386-mingw32/lib/libmoldnamed.a
 i386-mingw32/lib/libmpr.a
 i386-mingw32/lib/libmsacm32.a
+i386-mingw32/lib/libmsimg32.a
 i386-mingw32/lib/libmsvcp60.a
+i386-mingw32/lib/libmsvcr70.a
+i386-mingw32/lib/libmsvcr70d.a
+i386-mingw32/lib/libmsvcr71.a
+i386-mingw32/lib/libmsvcr71d.a
 i386-mingw32/lib/libmsvcrt.a
-i386-mingw32/lib/libmsvcrt20.a
-i386-mingw32/lib/libmsvcrt40.a
+i386-mingw32/lib/libmsvcrtd.a
+i386-mingw32/lib/libmsvfw32.a
 i386-mingw32/lib/libmswsock.a
 i386-mingw32/lib/libnddeapi.a
+i386-mingw32/lib/libndis.a
 i386-mingw32/lib/libnetapi32.a
+i386-mingw32/lib/libntdll.a
+i386-mingw32/lib/libntoskrnl.a
 i386-mingw32/lib/libodbc32.a
 i386-mingw32/lib/libodbccp32.a
 i386-mingw32/lib/libole32.a
+i386-mingw32/lib/liboleacc.a
 i386-mingw32/lib/liboleaut32.a
 i386-mingw32/lib/libolecli32.a
 i386-mingw32/lib/liboledlg.a
@@ -408,92 +626,94 @@ i386-mingw32/lib/libolesvr32.a
 i386-mingw32/lib/libopengl32.a
 i386-mingw32/lib/libpenwin32.a
 i386-mingw32/lib/libpkpd32.a
+i386-mingw32/lib/libpowrprof.a
 i386-mingw32/lib/libpsapi.a
 i386-mingw32/lib/librapi.a
 i386-mingw32/lib/librasapi32.a
+i386-mingw32/lib/librasdlg.a
 i386-mingw32/lib/librpcdce4.a
 i386-mingw32/lib/librpcns4.a
 i386-mingw32/lib/librpcrt4.a
 i386-mingw32/lib/libscrnsave.a
 i386-mingw32/lib/libscrnsavw.a
+i386-mingw32/lib/libscsiport.a
 i386-mingw32/lib/libsecur32.a
 i386-mingw32/lib/libsetupapi.a
 i386-mingw32/lib/libshell32.a
-i386-mingw32/lib/libstdc++.a.2.10.0
+i386-mingw32/lib/libshfolder.a
+i386-mingw32/lib/libshlwapi.a
+i386-mingw32/lib/libsnmpapi.a
+i386-mingw32/lib/libstdc++.a
+i386-mingw32/lib/libstdc++.la
+i386-mingw32/lib/libsupc++.a
+i386-mingw32/lib/libsupc++.la
 i386-mingw32/lib/libsvrapi.a
 i386-mingw32/lib/libtapi32.a
+i386-mingw32/lib/libtdi.a
 i386-mingw32/lib/libth32.a
 i386-mingw32/lib/libthunk32.a
 i386-mingw32/lib/liburl.a
+i386-mingw32/lib/libusbcamd.a
+i386-mingw32/lib/libusbcamd2.a
 i386-mingw32/lib/libuser32.a
 i386-mingw32/lib/libuserenv.a
 i386-mingw32/lib/libuuid.a
+i386-mingw32/lib/libuxtheme.a
 i386-mingw32/lib/libvdmdbg.a
 i386-mingw32/lib/libversion.a
 i386-mingw32/lib/libvfw32.a
+i386-mingw32/lib/libvideoprt.a
+i386-mingw32/lib/libwin32k.a
 i386-mingw32/lib/libwin32spl.a
 i386-mingw32/lib/libwininet.a
 i386-mingw32/lib/libwinmm.a
 i386-mingw32/lib/libwinspool.a
 i386-mingw32/lib/libwinstrm.a
+i386-mingw32/lib/libwldap32.a
 i386-mingw32/lib/libwow32.a
 i386-mingw32/lib/libws2_32.a
+i386-mingw32/lib/libwsnmp32.a
 i386-mingw32/lib/libwsock32.a
 i386-mingw32/lib/libwst.a
 i386-mingw32/lib/mingwm10.dll
+i386-mingw32/lib/txtmode.o
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/cc1
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/cc1plus
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/cpp0
+lib/gcc-lib/i386-mingw32/${GCC_VERSION}/crtbegin.o
+lib/gcc-lib/i386-mingw32/${GCC_VERSION}/crtend.o
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/README
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/exception
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/fixed
+lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/emmintrin.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/float.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/iso646.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/limits.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/new
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/new.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/proto.h
+lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/mmintrin.h
+lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/pmmintrin.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/stdarg.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/stdbool.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/stddef.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/syslimits.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/typeinfo
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-alpha.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-arc.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-c4x.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-clipper.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-h8300.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-i860.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-i960.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-m32r.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-m88k.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-mips.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-mn10200.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-mn10300.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-pa.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-ppc.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-pyr.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-sh.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-sparc.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-spur.h
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/va-v850.h
+lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/unwind.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/varargs.h
+lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include/xmmintrin.h
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/libgcc.a
-lib/gcc-lib/i386-mingw32/${GCC_VERSION}/libstdc++.a
 lib/gcc-lib/i386-mingw32/${GCC_VERSION}/specs
 @dirrm bin
 @dirrm i386-mingw32/bin
-@dirrm i386-mingw32/include/g++-3/std
-@dirrm i386-mingw32/include/g++-3
 @dirrm i386-mingw32/include/sys
+@dirrm i386-mingw32/include/ddk
+@dirrm i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32/bits
+@dirrm i386-mingw32/include/c++/${GCC_VERSION}/i386-mingw32
+@dirrm i386-mingw32/include/c++/${GCC_VERSION}/ext
+@dirrm i386-mingw32/include/c++/${GCC_VERSION}/bits
+@dirrm i386-mingw32/include/c++/${GCC_VERSION}/backward
+@dirrm i386-mingw32/include/c++/${GCC_VERSION}
+@dirrm i386-mingw32/include/c++
+@dirrm i386-mingw32/include/GL
 @dirrm i386-mingw32/include
 @dirrm i386-mingw32/lib
 @dirrm i386-mingw32
-@dirrm info
 @dirrm lib/gcc-lib/i386-mingw32/${GCC_VERSION}/include
 @dirrm lib/gcc-lib/i386-mingw32/${GCC_VERSION}
 @dirrm lib/gcc-lib/i386-mingw32
 @dirrm lib/gcc-lib
 @dirrm lib
-@dirrm man/man1
-@dirrm man
diff --git a/cross/i386-mingw32/distinfo b/cross/i386-mingw32/distinfo
index fd1bc8206f2..0bc16874aa1 100644
--- a/cross/i386-mingw32/distinfo
+++ b/cross/i386-mingw32/distinfo
@@ -1,11 +1,15 @@
-$NetBSD: distinfo,v 1.2 2003/11/05 23:03:54 seb Exp $
+$NetBSD: distinfo,v 1.3 2004/03/11 18:07:09 kent Exp $
 
-SHA1 (binutils-2.11.92-20011113-src.tar.gz) = 3286f3f239fa3e3565225ca6d3a875dbecfbc542
-Size (binutils-2.11.92-20011113-src.tar.gz) = 10310634 bytes
-SHA1 (gcc-2.95.3-20011106-src.tar.gz) = 04def41a5c6d7cce6e2330d8de7e6ab82ca4b53a
-Size (gcc-2.95.3-20011106-src.tar.gz) = 11564449 bytes
-SHA1 (mingw-runtime-1.2-src.tar.gz) = 6a1b3937ce2f85e37d8ce5e3b0a411b884d9521d
-Size (mingw-runtime-1.2-src.tar.gz) = 136354 bytes
-SHA1 (w32api-1.2-src.tar.gz) = 4862ee2372ea962651a315eba836c2e04cd1fa4c
-Size (w32api-1.2-src.tar.gz) = 493336 bytes
-SHA1 (patch-aa) = 37937b1b8de5eb8c2de3835b4296538bd253796b
+SHA1 (binutils-2.15.90-20040222-1-src.tar.gz) = 49c81b65f288a8c849675da9ddf3536a24d8515f
+Size (binutils-2.15.90-20040222-1-src.tar.gz) = 14182109 bytes
+SHA1 (gcc-3.3.3.tar.gz) = decb70e78f040850dbd41f18bb5ec992192ad28c
+Size (gcc-3.3.3.tar.gz) = 30747783 bytes
+SHA1 (gcc-3.3.3-20040217-1-src.diff.gz) = 721674ff4b07397a3bd5570832bb89662aacee2a
+Size (gcc-3.3.3-20040217-1-src.diff.gz) = 122692 bytes
+SHA1 (gcc-g++-3.3.3-20040217-1.tar.gz) = b5b0959e974f472a672a7ebff0ea57635481a3a2
+Size (gcc-g++-3.3.3-20040217-1.tar.gz) = 2301514 bytes
+SHA1 (mingw-runtime-3.2.tar.gz) = ef30f93037318c0ab57b71b649ffc81895e19f25
+Size (mingw-runtime-3.2.tar.gz) = 308420 bytes
+SHA1 (w32api-2.5.tar.gz) = cb5eca3f0fd11ecae4ce7852f5b0b605b8746d6d
+Size (w32api-2.5.tar.gz) = 1336713 bytes
+SHA1 (patch-aa) = fe62ad2b8c454d5d00f3d6fd6299de8b4a32ee67
diff --git a/cross/i386-mingw32/files/config.h b/cross/i386-mingw32/files/config.h
deleted file mode 100644
index d4fc6e19606..00000000000
--- a/cross/i386-mingw32/files/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $NetBSD: config.h,v 1.1 2002/01/22 12:16:21 kent Exp $ */
-#define HAVE_ALLOCA 1
-#define pid_t int
-#define STDC_HEADERS 1
-#define HAVE_SYS_ERRLIST 1
-#define HAVE_SYS_NERR 1
-#define HAVE_STRERROR 1
-#define HAVE_ATEXIT 1
-#define HAVE_CALLOC 1
-#define HAVE_CLOCK 1
-#define HAVE_GETCWD 1
-#define HAVE_MEMCHR 1
-#define HAVE_MEMCMP 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMSET 1
-#define HAVE_PUTENV 1
-#define HAVE_RENAME 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRCHR 1
-#define HAVE_STRDUP 1
-#define HAVE_STRERROR 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOD 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_TMPNAM 1
-#define HAVE_VFPRINTF 1
-#define HAVE_VPRINTF 1
-#define HAVE_VSPRINTF 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_SYS_FILE_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_UNISTD_H 1
diff --git a/cross/i386-mingw32/patches/patch-aa b/cross/i386-mingw32/patches/patch-aa
index b3bdb095782..5e40b1cfb7d 100644
--- a/cross/i386-mingw32/patches/patch-aa
+++ b/cross/i386-mingw32/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2003/11/05 23:03:54 seb Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/11 18:07:09 kent Exp $
 
---- gcc-2.95.3-20011106/gcc/Makefile.in.orig	Fri Oct 19 08:13:13 2001
-+++ gcc-2.95.3-20011106/gcc/Makefile.in
-@@ -839,7 +839,7 @@ all.internal: start.encap rest.encap doc
- # Note that we can compile enquire using the cross-compiler just built,
- # although we can't run it on this machine.
- all.cross: native gcc-cross specs stmp-headers $(STMP_FIXPROTO) $(LIBGCC) \
--	$(LIBGCC1_TEST) $(EXTRA_PARTS) lang.all.cross doc
-+	$(LIBGCC1_TEST) $(EXTRA_PARTS) lang.all.cross
- # This is what to compile if making gcc with a cross-compiler.
- all.build: native xgcc$(exeext) cpp$(exeext) $(EXTRA_PARTS) lang.all.build
+--- gcc-3.3.3/gcc/Makefile.in.orig2	2004-03-11 13:51:47.000000000 +0900
++++ gcc-3.3.3/gcc/Makefile.in
+@@ -948,7 +948,7 @@ config.status: $(srcdir)/configure $(src
+ all.internal: start.encap rest.encap doc
+ # This is what to compile if making a cross-compiler.
+ all.cross: native gcc-cross cpp$(exeext) specs \
+-	$(LIBGCC) $(EXTRA_PARTS) lang.all.cross doc
++	$(LIBGCC) $(EXTRA_PARTS) lang.all.cross
  # This is what must be made before installing GCC and converting libraries.
+ start.encap: native xgcc$(exeext) cpp$(exeext) specs \
+ 	xlimits.h lang.start.encap