pkg/16475: Update to the compiler of PlayStation Linux 1.0

 - gcc: Add -fsingle-precision-constant option
 - gcc: Apply franken-gcc patch of Mozilla.org
 - ld: Add -fgc-dynstr

As for pkgsrc, C++ compiler is removed because it is not used for kernel
compilation.

6 files changed, 84 insertions, 42 deletions

diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile
index f29774169f6..98524b97dee 100644
--- a/cross/mipsEEel-netbsd/Makefile
+++ b/cross/mipsEEel-netbsd/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/05/15 14:03:27 kent Exp $
 
 DISTNAME=	cross-${TARGET_ARCH}-${DISTVERSION}
 TARGET_ARCH=	mipsEEel-netbsd
 DISTVERSION=	1.0.0
+PKGREVISION=	1
 CATEGORIES+=	cross lang
-MAINTAINER=	kent@netbsd.org
+MAINTAINER=	packages@netbsd.org
 COMMENT=	Cross-compiler for NetBSD/PlayStation2 kernel
 
 BZCAT=		/usr/bin/bzcat
@@ -20,11 +21,9 @@ PLIST_SUBST+=	SUBDIR="cross-ps2" TARGET_ARCH="${TARGET_ARCH}" \
 #
 # binutils
 #
-MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/tshiozak/PlayStation2/GPLed-from-SCEI/binutils-2.9EE/
-DISTFILES+=		binutils-2.9EE.linux.patch.bz2
-BINUTILS_PATCH1=	${_DISTDIR}/binutils-2.9EE.linux.patch.bz2
-DISTFILES+=		binutils-ps2linux-0.9.patch.bz2
-BINUTILS_PATCH2=	${_DISTDIR}/binutils-ps2linux-0.9.patch.bz2
+MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/hamajima/PlayStation2/GPLed-from-SCEI/binutils-2.9EE/
+DISTFILES+=		binutils-ps2linux-1.0.0.patch.bz2
+BINUTILS_PATCH1=	${_DISTDIR}/binutils-ps2linux-1.0.0.patch.bz2
 
 BINUTILS_DISTNAME=	binutils-2.9EE
 BINUTILS_WRKSRC=	${WRKDIR}/${BINUTILS_DISTNAME}
@@ -34,16 +33,18 @@ EXTRACT_ONLY=		${BINUTILS_DISTNAME}.tar.gz
 #
 # gcc
 #
-MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/tshiozak/PlayStation2/GPLed-from-SCEI/gcc-2.95.2EE/
+MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/hamajima/PlayStation2/GPLed-from-SCEI/gcc-2.95.2EE/
 GCC_VERSION=		2.95.2
 GCC_DISTNAME=		gcc-${GCC_VERSION}
 GCC_WRKSRC=		${WRKDIR}/${GCC_DISTNAME}
 DISTFILES+=		${GCC_DISTNAME}.tar.gz
 EXTRACT_ONLY+=		${GCC_DISTNAME}.tar.gz
-DISTFILES+=		gcc-${GCC_VERSION}.EE-linux.patch.bz2
-GCC_PATCH1=		${_DISTDIR}/gcc-${GCC_VERSION}.EE-linux.patch.bz2
-DISTFILES+=		gcc-ps2linux-0.9.1.patch.bz2
-GCC_PATCH2=		${_DISTDIR}/gcc-ps2linux-0.9.1.patch.bz2
+DISTFILES+=		gcc-${GCC_VERSION}-frankengcc-patches.patch.bz2
+GCC_PATCH0=		${_DISTDIR}/gcc-${GCC_VERSION}-frankengcc-patches.patch.bz2
+DISTFILES+=		gcc-${GCC_VERSION}-single-float-const.patch.bz2
+GCC_PATCH1=		${_DISTDIR}/gcc-${GCC_VERSION}-single-float-const.patch.bz2
+DISTFILES+=		gcc-ps2linux-1.0.0.patch.bz2
+GCC_PATCH2=		${_DISTDIR}/gcc-ps2linux-1.0.0.patch.bz2
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
 
@@ -56,7 +57,6 @@ do-install: binutils-install gcc-install
 
 binutils-patch:
 	${BZCAT} ${BINUTILS_PATCH1} | ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -p1 -E
-	${BZCAT} ${BINUTILS_PATCH2} | ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -p1 -E
 	for i in patches/binutils-*; do \
 		${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \
 	done
@@ -74,6 +74,7 @@ binutils-install:
 
 
 gcc-patch:
+	${BZCAT} ${GCC_PATCH0} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E
 	${BZCAT} ${GCC_PATCH1} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E
 	${BZCAT} ${GCC_PATCH2} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E
 	for i in patches/gcc-*; do \
@@ -84,21 +85,20 @@ gcc-configure:
 	${MKDIR} ${GCC_WRKSRC}/obj
 	cd ${GCC_WRKSRC}/obj && ../configure --prefix=${TARGET_DIR} \
 		--enable-shared --target=${TARGET_ARCH} \
-		--enable-languages=c,c++ --with-gnu-as \
+		--enable-languages=c --with-gnu-as \
 		--with-gnu-ld --disable-nls
 	-${RM} ${GCC_WRKSRC}/obj/texinfo/makeinfo/Makefile
 
 gcc-build:
-	-${RM} ${GCC_WRKSRC}/obj/gcc/as
-	-${RM} ${GCC_WRKSRC}/obj/gcc/ld
-	${LN} -s ${BINUTILS_WRKSRC}/obj/gas/as-new ${GCC_WRKSRC}/obj/gcc/as
-	${LN} -s ${BINUTILS_WRKSRC}/obj/ld/ld-new ${GCC_WRKSRC}/obj/gcc/ld
+	${LN} -sf ${BINUTILS_WRKSRC}/obj/gas/as-new ${GCC_WRKSRC}/obj/gcc/as
+	${LN} -sf ${BINUTILS_WRKSRC}/obj/ld/ld-new ${GCC_WRKSRC}/obj/gcc/ld
 	${GMAKE} -C ${GCC_WRKSRC}/obj/libiberty
 #	${GMAKE} -C ${GCC_WRKSRC}/obj/texinfo
 	${GMAKE} -C ${GCC_WRKSRC}/obj/gcc LIBGCC="" LIBGCC1_TEST="" INSTALL_LIBGCC=""
 
 gcc-install:
-	${GMAKE} -C ${GCC_WRKSRC}/obj/gcc install-common install-headers install-cpp lang.install-normal install-driver
+	${GMAKE} -C ${GCC_WRKSRC}/obj/gcc install-common install-headers \
+		install-cpp lang.install-normal install-driver
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/cross/mipsEEel-netbsd/PLIST b/cross/mipsEEel-netbsd/PLIST
index 11ec23dcfd5..9f7ef241260 100644
--- a/cross/mipsEEel-netbsd/PLIST
+++ b/cross/mipsEEel-netbsd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/15 14:03:27 kent Exp $
 ${SUBDIR}/bin/cpp
 ${SUBDIR}/bin/ee-dvp-as
 ${SUBDIR}/bin/ee-dvp-gasp
@@ -6,9 +6,7 @@ ${SUBDIR}/bin/gcov
 ${SUBDIR}/bin/${TARGET_ARCH}-addr2line
 ${SUBDIR}/bin/${TARGET_ARCH}-ar
 ${SUBDIR}/bin/${TARGET_ARCH}-as
-${SUBDIR}/bin/${TARGET_ARCH}-c++
 ${SUBDIR}/bin/${TARGET_ARCH}-c++filt
-${SUBDIR}/bin/${TARGET_ARCH}-g++
 ${SUBDIR}/bin/${TARGET_ARCH}-gasp
 ${SUBDIR}/bin/${TARGET_ARCH}-gcc
 ${SUBDIR}/bin/${TARGET_ARCH}-ld
@@ -27,7 +25,6 @@ ${SUBDIR}/include/bfd.h
 ${SUBDIR}/include/bfdlink.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/SYSCALLS.c.X
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/cc1
-${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/cc1plus
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/collect2
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/cpp
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/crtbegin.o
@@ -36,19 +33,15 @@ ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/crtend.o
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/crtendS.o
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/README
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/assert.h
-${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/exception
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/fixed
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/float.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/iso646.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/limits.h
-${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/new
-${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/new.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/proto.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/stdarg.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/stdbool.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/stddef.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/syslimits.h
-${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/typeinfo
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/va-alpha.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/va-arc.h
 ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include/va-c4x.h
@@ -120,6 +113,7 @@ ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts/mipslit.xr
 ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts/mipslit.xu
 @dirrm ${SUBDIR}/bin
 @dirrm ${SUBDIR}/include
+@dirrm ${SUBDIR}/info
 @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include
 @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}
 @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}
@@ -131,4 +125,5 @@ ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts/mipslit.xu
 @dirrm ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts
 @dirrm ${SUBDIR}/${TARGET_ARCH}/lib
 @dirrm ${SUBDIR}/${TARGET_ARCH}
+@dirrm ${SUBDIR}/share
 @dirrm ${SUBDIR}
diff --git a/cross/mipsEEel-netbsd/distinfo b/cross/mipsEEel-netbsd/distinfo
index fe5be8f98ef..2ce2acb7092 100644
--- a/cross/mipsEEel-netbsd/distinfo
+++ b/cross/mipsEEel-netbsd/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.1 2001/08/05 15:28:41 kent Exp $
+$NetBSD: distinfo,v 1.2 2002/05/15 14:03:27 kent Exp $
 
-SHA1 (binutils-2.9EE.linux.patch.bz2) = 9b8af1ca94cbb6731fc283509d420b9ca35a7658
-Size (binutils-2.9EE.linux.patch.bz2) = 292104 bytes
-SHA1 (binutils-ps2linux-0.9.patch.bz2) = 29283f4fe7f450a69495a0da80c44eb28377088d
-Size (binutils-ps2linux-0.9.patch.bz2) = 19123 bytes
+SHA1 (binutils-ps2linux-1.0.0.patch.bz2) = 965761594a12eeb880a93d94ff25167f73589658
+Size (binutils-ps2linux-1.0.0.patch.bz2) = 314714 bytes
 SHA1 (binutils-2.9EE.tar.gz) = 541c6815446b091ca17405127602b3673dc84fc8
 Size (binutils-2.9EE.tar.gz) = 7199214 bytes
 SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
 Size (gcc-2.95.2.tar.gz) = 12885815 bytes
-SHA1 (gcc-2.95.2.EE-linux.patch.bz2) = df5ee1b60219a1d1f7c073751571554888028b18
-Size (gcc-2.95.2.EE-linux.patch.bz2) = 220838 bytes
-SHA1 (gcc-ps2linux-0.9.1.patch.bz2) = 2dd428fc45d2aafafe7bbd479012fbff29fbc07c
-Size (gcc-ps2linux-0.9.1.patch.bz2) = 612196 bytes
+SHA1 (gcc-2.95.2-frankengcc-patches.patch.bz2) = fe13882ab97f66c65cfc55b117a49827815fe486
+Size (gcc-2.95.2-frankengcc-patches.patch.bz2) = 1300 bytes
+SHA1 (gcc-2.95.2-single-float-const.patch.bz2) = e673dd3c15dd90b790e83e328c37424e482d029a
+Size (gcc-2.95.2-single-float-const.patch.bz2) = 1429 bytes
+SHA1 (gcc-ps2linux-1.0.0.patch.bz2) = afb4b93d0116b1dfd35da59258df441d57863b0a
+Size (gcc-ps2linux-1.0.0.patch.bz2) = 819901 bytes
diff --git a/cross/mipsEEel-netbsd/patches/binutils-ae b/cross/mipsEEel-netbsd/patches/binutils-ae
new file mode 100644
index 00000000000..ba1c8fe3c09
--- /dev/null
+++ b/cross/mipsEEel-netbsd/patches/binutils-ae
@@ -0,0 +1,16 @@
+$NetBSD: binutils-ae,v 1.1 2002/05/15 14:03:27 kent Exp $
+
+--- config.sub.orig	Wed Apr 24 15:22:48 2002
++++ config.sub
+@@ -952,6 +952,11 @@
+  		basic_machine=c4x-none
+  		os=-coff
+   		;;
++	algor-* | arc-* | cobalt-* | hpcmips-* | playstation2-* | pmax-*)
++		if [ x$os = x-netbsd ]; then
++			basic_machine=mipsel-unknown
++		fi
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
diff --git a/cross/mipsEEel-netbsd/patches/gcc-aa b/cross/mipsEEel-netbsd/patches/gcc-aa
index 468b4fdfc86..2ae66911f28 100644
--- a/cross/mipsEEel-netbsd/patches/gcc-aa
+++ b/cross/mipsEEel-netbsd/patches/gcc-aa
@@ -1,11 +1,27 @@
-$NetBSD: gcc-aa,v 1.1 2001/08/05 15:28:41 kent Exp $
+$NetBSD: gcc-aa,v 1.2 2002/05/15 14:03:28 kent Exp $
 
---- gcc/configure.hoge	Thu Aug  2 23:14:48 2001
+--- gcc/configure.orig	Wed Apr 24 15:23:36 2002
 +++ gcc/configure
-@@ -4686,6 +4686,15 @@
+@@ -2947,6 +2947,10 @@
+ 	sparc*-*-*)
+ 		cpu_type=sparc
+ 		;;
++	algor-*-netbsd* | arc-*-netbsd* | cobalt-*-netbsd* | hpcmips-*-netbsd* | playstation2-*-netbsd* | pmax-*-netbsd*)
++		cpu_type=mips
++		machine=mipsel-unknown-netbsd
++		;;
+ 	esac
+ 
+ 	tm_file=${cpu_type}/${cpu_type}.h
+@@ -4682,9 +4686,19 @@
+ 	      fi
+ 	      ;;
+ 	mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
++		xmake_file=x-netbsd
+ 		tm_file=mips/netbsd.h
  		# On NetBSD, the headers are already okay, except for math.h.
  		tmake_file=t-netbsd
- 		;;
++		;;
 +	mipsEEel-*-netbsd*)			# for NetBSD/PlayStation2, incomplete!!
 +		xmake_file=x-linux		# Oops
 +		xm_file="xm-siglist.h ${xm_file}"
@@ -14,7 +30,6 @@ $NetBSD: gcc-aa,v 1.1 2001/08/05 15:28:41 kent Exp $
 +		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		gnu_ld=yes
 +		gas=yes
-+		;;
+ 		;;
  	mipsEE*-*-linux*)		# MIPS EE w/ Linux & ELF
  		xmake_file=x-linux
- 		xm_file="xm-siglist.h ${xm_file}"
diff --git a/cross/mipsEEel-netbsd/patches/gcc-ad b/cross/mipsEEel-netbsd/patches/gcc-ad
new file mode 100644
index 00000000000..d9a0163f4ab
--- /dev/null
+++ b/cross/mipsEEel-netbsd/patches/gcc-ad
@@ -0,0 +1,16 @@
+$NetBSD: gcc-ad,v 1.1 2002/05/15 14:03:28 kent Exp $
+
+--- config.sub.orig	Wed Apr 24 15:23:34 2002
++++ config.sub
+@@ -880,6 +880,11 @@
+  		basic_machine=c4x-none
+  		os=-coff
+   		;;
++	algor-* | arc-* | cobalt-* | hpcmips-* | playstation2-* | pmax-*)
++		if [ x$os = x-netbsd ]; then
++			basic_machine=mipsel-unknown
++		fi
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1