Sync w/ PEACE repository.

6 files changed, 50 insertions, 36 deletions

diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index 14602c34a84..dc8c63d54e4 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:05:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/01 05:59:46 minoura Exp $
 #
 
-DISTVERSION=		1.1.2
+DISTVERSION=		1.1.4
 DISTFILES=		# none
 
 MAINTAINER=		peace-sacrifice@hauN.org
@@ -15,6 +15,12 @@ BINUTILS_GNUTARGET=	pe-i386
 BINUTILS_LDEMULATION=	i386pe
 USE_CROSS_GCC=		yes
 GCC_FAKE_RUNTIME=	yes
+GCC_CXX=		yes
+#GCC_F77=		yes
+#GCC_OBJC=		yes
+#GCC_CXX_RUNTIME=	yes
+#GCC_F77_RUNTIME=	yes
+#GCC_OBJC_RUNTIME=	yes
 
 TARGET_ARCH=		i386-netbsdpe
 GCC_CONFIGURE_ARGS+=	--enable-threads
@@ -29,6 +35,7 @@ CROSS_DISTFILES+=	${GCC_WIN32_PATCHBUNDLE}
 PTHREAD_DISTNAME=	unproven-pthreads-0.17
 PTHREAD_DISTFILE=	${PTHREAD_DISTNAME}.tar.gz
 MASTER_SITES+=		ftp://ftp.flame.org/pub/netbsd/
+CROSS_DISTFILES+=	${PTHREAD_DISTFILE}
 
 pre-patch: gcc-patchbundle
 
@@ -49,12 +56,14 @@ post-patch:
 		${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread .
 
 
+CFLAGS_FOR_TARGET+=	-I${WRKDIR}
 post-configure:
 	${CP} ${FILESDIR}/i386_limits.h ${SYS_INCLUDE}/machine/limits.h
 	${CP} ${FILESDIR}/syslimits.h ${SYS_INCLUDE}/sys/
 	${CP} ${FILESDIR}/featuretest.h ${SYS_INCLUDE}/sys/
 	${CP} ${FILESDIR}/limits.h ${SYS_INCLUDE}/
 	${RM} ${WRKDIR}/${GCC_DISTNAME}/texinfo/makeinfo/Makefile
+	$(SED) "s/extern FILE/__declspec(dllimport) FILE/" /usr/include/stdio.h > $(WRKDIR)/stdio.h
 
 #.include "../COMMON/cross.mk"
 .include "files/cross.mk"
diff --git a/cross/i386-netbsdpe/files/PLIST-gcc-cxx b/cross/i386-netbsdpe/files/PLIST-gcc-cxx
index eb18e06c782..7e99bf38df9 100644
--- a/cross/i386-netbsdpe/files/PLIST-gcc-cxx
+++ b/cross/i386-netbsdpe/files/PLIST-gcc-cxx
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST-gcc-cxx,v 1.1 2001/01/30 03:08:57 minoura Exp $
+@comment $NetBSD: PLIST-gcc-cxx,v 1.2 2001/03/01 05:59:46 minoura Exp $
 ${TARGET_ARCH}/bin/c++
 ${TARGET_ARCH}/bin/c++filt
 ${TARGET_ARCH}/bin/g++
+${TARGET_ARCH}/include/c++/exception
+${TARGET_ARCH}/include/c++/new
+${TARGET_ARCH}/include/c++/new.h
+${TARGET_ARCH}/include/c++/typeinfo
 bin/${TARGET_ARCH}-c++
 bin/${TARGET_ARCH}-c++filt
 bin/${TARGET_ARCH}-g++
 lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/cc1plus
+@dirrm ${TARGET_ARCH}/include/c++
diff --git a/cross/i386-netbsdpe/files/cross.mk b/cross/i386-netbsdpe/files/cross.mk
index 90fe18341f1..5252a52bfb0 100644
--- a/cross/i386-netbsdpe/files/cross.mk
+++ b/cross/i386-netbsdpe/files/cross.mk
@@ -2,6 +2,7 @@
 #	NetBSD: cross.mk,v 1.16 2000/11/09 13:04:55 wiz Exp 
 
 # Shared definitions for building a cross-compile environment.
+# We have to switch to COMMON/cross.mk when it is upgraded for the new gcc.
 
 DISTNAME=		cross-${TARGET_ARCH}-${DISTVERSION}
 CATEGORIES+=		cross lang
@@ -101,33 +102,27 @@ GCC_WRKSRC=		${WRKDIR}/${GCC_DISTNAME}
 GCC_LANGUAGES=		c # add to these below
 BUILD_DEPENDS+= ${LOCALBASE}/bin/autoheader:../../devel/autoconf
 
-.if defined(GCC_NO_RUNTIME) || defined(GCC_FAKE_RUNTIME)
-GCC_NO_CXX_RUNTIME=	yes
-GCC_NO_F77_RUNTIME=	yes
-GCC_NO_OBJC_RUNTIME=	yes
-.endif
-
-.if !defined(GCC_NO_CXX)
-CXX_CONFIGURE_ARGS+=	--with-gxx-include-dir=${TARGET_DIR}/include/g++
+.if defined(GCC_CXX)
+CXX_CONFIGURE_ARGS+=	--with-gxx-include-dir=${TARGET_DIR}/include/c++
 GCC_LANGUAGES+=		c++
 PLIST_PRE+=		${GCC_PLIST_DIR}/PLIST-gcc-cxx
-.if !defined(GCC_NO_CXX_RUNTIME)
+.if defined(GCC_CXX_RUNTIME)
 PLIST_PRE+=		${GCC_PLIST_DIR}/PLIST-gcc-cxx-runtime
 .endif
 .endif
 
-.if !defined(GCC_NO_F77)
+.if defined(GCC_F77)
 GCC_LANGUAGES+=		f77
 PLIST_PRE+=		${GCC_PLIST_DIR}/PLIST-gcc-f77
-.if !defined(GCC_NO_F77_RUNTIME)
+.if defined(GCC_F77_RUNTIME)
 PLIST_PRE+=		${GCC_PLIST_DIR}/PLIST-gcc-f77-runtime
 .endif
 .endif
 
-.if !defined(GCC_NO_OBJC)
+.if defined(GCC_OBJC)
 GCC_LANGUAGES+=		objc
 PLIST_PRE+=		${GCC_PLIST_DIR}/PLIST-gcc-objc
-.if !defined(GCC_NO_OBJC_RUNTIME)
+.if defined(GCC_OBJC_RUNTIME)
 PLIST_PRE+=		${GCC_PLIST_DIR}/PLIST-gcc-objc-runtime
 .endif
 .endif
@@ -199,13 +194,13 @@ gcc-build:
 	@${LN} -sf ${LD_FOR_TARGET} ${GCC_WRKSRC}/gcc/ld
 	@cd ${GCC_WRKSRC} && make all-libiberty
 	@cd ${GCC_WRKSRC}/gcc && ${GCC_MAKE} all
-.if !defined(GCC_NO_CXX) && !defined(GCC_NO_CXX_RUNTIME)
+.if defined(GCC_CXX) && defined(GCC_CXX_RUNTIME)
 	@cd ${GCC_WRKSRC} && ${GCC_MAKE} configure-target-libio configure-target-libstdc++ all-target-libio all-target-libstdc++
 .endif
-.if !defined(GCC_NO_F77) && !defined(GCC_NO_F77_RUNTIME)
+.if defined(GCC_F77) && defined(GCC_F77_RUNTIME)
 	@cd ${GCC_WRKSRC} && ${GCC_MAKE} configure-target-libf2c all-target-libf2c
 .endif
-.if !defined(GCC_NO_OBJC) && !defined(GCC_NO_OBJC_RUNTIME)
+.if defined(GCC_OBJC) && defined(GCC_OBJC_RUNTIME)
 	@cd ${GCC_WRKSRC}/gcc && ${GCC_MAKE} objc-runtime
 .endif
 
@@ -217,8 +212,8 @@ gcc-install:
 	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${PREFIX}/bin/${TARGET_ARCH}-cc
 	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${TARGET_DIR}/bin/cc
 	${RM} ${PREFIX}/bin/${TARGET_ARCH}-gcj # install-driver installs gcj but we need not it
-.if !defined(GCC_NO_F77)
-.if !defined(GCC_NO_F77_RUNTIME)
+.if defined(GCC_F77)
+.if defined(GCC_F77_RUNTIME)
 	@cd ${GCC_WRKSRC} && ${GCC_MAKE} install-target-libf2c
 .endif
 	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-g77 ${PREFIX}/bin/${TARGET_ARCH}-f77
@@ -227,8 +222,12 @@ gcc-install:
 		${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
 	done
 .endif
-.if !defined(GCC_NO_CXX)
-.if !defined(GCC_NO_CXX_RUNTIME)
+.if defined(GCC_CXX)
+	@${MKDIR} ${TARGET_DIR}/include/c++
+	@for file in exception new new.h typeinfo; do \
+		${CP} -p ${GCC_WRKSRC}/gcc/cp/inc/$$file ${TARGET_DIR}/include/c++; \
+	done
+.if defined(GCC_CXX_RUNTIME)
 	@${MKDIR} ${TARGET_DIR}/include/g++/std
 	@cd ${GCC_WRKSRC} && ${GCC_MAKE} install-target-libstdc++
 .endif
diff --git a/cross/i386-netbsdpe/files/md5 b/cross/i386-netbsdpe/files/md5
index 67f79c1c043..191feb4986b 100644
--- a/cross/i386-netbsdpe/files/md5
+++ b/cross/i386-netbsdpe/files/md5
@@ -1,5 +1,6 @@
-$NetBSD: md5,v 1.2 2001/01/30 03:08:58 minoura Exp $
+$NetBSD: md5,v 1.3 2001/03/01 05:59:46 minoura Exp $
 
 MD5 (gcc-2.95.2-x86-win32-patches.tar.gz) = d7a4cf0082a222bd4ee780fb6ef94b82
+MD5 (unproven-pthreads-0.17.tar.gz) = caa913b1dc1991386b391c6964a60f5f
 MD5 (binutils-2.9.1.tar.gz) = 8f9ad1a6e96742fd3069479171a63c22
 MD5 (gcc-2.95.2.tar.gz) = 0e36957d734286e242e9697fd2806c4f
diff --git a/cross/i386-netbsdpe/files/patch-sum b/cross/i386-netbsdpe/files/patch-sum
index 89f9502cc07..7031a0c0311 100644
--- a/cross/i386-netbsdpe/files/patch-sum
+++ b/cross/i386-netbsdpe/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.2 2001/01/30 03:08:58 minoura Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/01 05:59:47 minoura Exp $
 
 MD5 (patch-aa) = 714fd58bf57f5528bb7767847a2e3ed8
 MD5 (patch-co) = 1d4eea39503b20d1c5c94e3d95426bfe
 MD5 (patch-cp) = 3ba4994d246553ed6115e99c22693932
 MD5 (patch-cq) = 782b6f7159e7212a22094fea9e93ed80
 MD5 (patch-ma) = ff7dd6b557381fca5161bc87dd2a8751
-MD5 (patch-pe) = d4b784a815cf090540e8550c74925a58
+MD5 (patch-pe) = bf1006bee3fd1c687b6c089b5504150f
diff --git a/cross/i386-netbsdpe/patches/patch-pe b/cross/i386-netbsdpe/patches/patch-pe
index f1f94eb698b..dadb3efbd78 100644
--- a/cross/i386-netbsdpe/patches/patch-pe
+++ b/cross/i386-netbsdpe/patches/patch-pe
@@ -1,4 +1,4 @@
-$NetBSD: patch-pe,v 1.1 2001/01/30 03:09:01 minoura Exp $
+$NetBSD: patch-pe,v 1.2 2001/03/01 05:59:47 minoura Exp $
 
 --- /dev/null	Fri Jan 26 01:33:46 2001
 +++ gcc/config/i386/netbsd-pe.h
@@ -87,9 +87,9 @@ $NetBSD: patch-pe,v 1.1 2001/01/30 03:09:01 minoura Exp $
 +   by calling the init function from the prologue. */
 +
 +#undef STARTFILE_SPEC
-+#define STARTFILE_SPEC "%{mdll:crt0dll%o%s} \
-+                        %{!mdll: %{!mwindows:crt0%O%s} \
-+                                 %{mwindows:crt0win%O%s}}"
++#define STARTFILE_SPEC "%{mdll:crt0dll%O%s} %{!mdll: %{!mwindows:crt0%O%s} %{mwindows:crt0win%O%s}}"
++
++
 +
 +#undef CPP_SPEC
 +#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
@@ -117,13 +117,13 @@ $NetBSD: patch-pe,v 1.1 2001/01/30 03:09:01 minoura Exp $
 +   ld, but that doesn't work just yet.  */
 +
 +#undef LIB_SPEC
-+#define LIB_SPEC "-lkernel32 \
-+                  %{mwindows:-luser32 -lgdi32 -lcomdlg32 -ladvapi32 -lshell32 -lm} \
-+                  -lpthread -lc"
++#define LIB_SPEC "-lkernel32 %{mwindows:-luser32 -lgdi32 -lcomdlg32 -ladvapi32 -lshell32 -lm} \
++ -lpthread -lc %{mdll:-lpeasu}"
++
++
++#define LINK_SPEC "%{mwindows:--subsystem windows} %{mconsole:--subsystem console} \
++ %{mdll:--dll -e _DllMainCRTStartup@12 --file-alignment 0x1000}"
 +
-+#define LINK_SPEC "%{mwindows:--subsystem windows} \
-+                   %{mconsole:--subsystem console} \
-+                   %{mdll:--dll -e _DllMainCRTStartup@12}"
 +
 +
 +#define SIZE_TYPE "unsigned int"