Major `cross' category overhaul. Clean up the shared Makefiles; move all

binutils stuff (except gas) to a shared, multiple-target binutils build;
reduce extract and compile times by being more specific with files and
targets; update to egcs 1.1.1 with a diffball from NetBSD's src/gnu/dist
tree; add 4.4BSD a.out archive support to binutils.

3 files changed, 31 insertions, 28 deletions

diff --git a/cross/i386-linuxglibc1/Makefile b/cross/i386-linuxglibc1/Makefile
index 05fdacd9e0a..beb1b8fc701 100644
--- a/cross/i386-linuxglibc1/Makefile
+++ b/cross/i386-linuxglibc1/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.2 1998/08/23 20:43:41 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/04 22:37:33 tv Exp $
 #
 
-DISTVERSION=		5.3.12.0
+DISTVERSION=		5.3.12.1
 DISTFILES=		${LINUXDEVEL_FILES}
 EXTRACT_ONLY=		# none of the RPM files
-MASTER_SITES=		ftp://ftp.redhat.com/pub/redhat/redhat-4.2/i386/RedHat/RPMS/ \
-			ftp://ftp.digital.com/pub/linux/redhat/redhat-4.2/i386/RedHat/RPMS/
+MASTER_SITES=		ftp://ftp.cdrom.com/pub/linux/redhat/redhat-4.2/i386/RedHat/RPMS/
 
 MAINTAINER=		packages@netbsd.org
 
 BUILD_DEPENDS=		rpm2cpio:../../misc/rpm
 
-USE_CROSS_GNU=		yes
+USE_CROSS_BINUTILS=	yes
+BINUTILS_GNUTARGET=	elf32-i386
+BINUTILS_LDEMULATION=	elf_i386
+USE_CROSS_EGCS=		yes
 
 LINUXDEVEL_FILES=	libc-5.3.12-18.i386.rpm \
 			libc-devel-5.3.12-18.i386.rpm \
@@ -36,6 +38,6 @@ post-extract:
 	@cd ${WRKDIR}/usr/src/linux-2.0.30/include && \
 		${MV} -f asm-i386 ${WRKDIR}/usr/include/asm && \
 		${MV} -f linux scsi ${WRKDIR}/usr/include/
-	@${LN} -f ${WRKDIR}/usr/lib/crt*.o ${WRKSRC}/gcc/
+	@${LN} -f ${WRKDIR}/usr/lib/crt*.o ${EGCS_WRKSRC}/gcc/
 
 .include "../COMMON/cross.mk"
diff --git a/cross/i386-linuxglibc1/files/md5 b/cross/i386-linuxglibc1/files/md5
index ace4c3e3dc8..4708bcacb54 100644
--- a/cross/i386-linuxglibc1/files/md5
+++ b/cross/i386-linuxglibc1/files/md5
@@ -1,8 +1,9 @@
-$NetBSD: md5,v 1.1 1998/08/12 02:44:16 tv Exp $
+$NetBSD: md5,v 1.2 1999/01/04 22:37:33 tv Exp $
 
 MD5 (libc-5.3.12-18.i386.rpm) = 0f14dc6e43739d10148af57423a14c53
 MD5 (libc-devel-5.3.12-18.i386.rpm) = c03ad5d961928d56cf90be35e827ef6e
 MD5 (libc-static-5.3.12-18.i386.rpm) = 0662b25878f2c4bb3c10ded7fcb79c92
 MD5 (kernel-headers-2.0.30-2.i386.rpm) = cc3a5ce8114f7885b483e057180eabee
 MD5 (binutils-2.9.1.tar.gz) = 8f9ad1a6e96742fd3069479171a63c22
-MD5 (egcs-19980803.tar.gz) = 3c6e28dd25140187e322c890231bfc72
+MD5 (egcs-1.1.1.tar.gz) = 0b3f0e856dcbb2241c183081fc7271af
+MD5 (egcs-1.1.1-NetBSD-19980104.diff.gz) = f6496aa337d9e7289b91cc834d7d3401
diff --git a/cross/i386-linuxglibc1/pkg/PLIST b/cross/i386-linuxglibc1/pkg/PLIST
index 18e62766c75..939a3d0107f 100644
--- a/cross/i386-linuxglibc1/pkg/PLIST
+++ b/cross/i386-linuxglibc1/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/12 02:44:16 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/01/04 22:37:33 tv Exp $
 ${TARGET_ARCH}/include/_G_config.h
 ${TARGET_ARCH}/include/a.out.h
 ${TARGET_ARCH}/include/alloca.h
@@ -583,22 +583,22 @@ lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/crtbegin.o
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/crtbeginS.o
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/crtend.o
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/crtendS.o
-@dirrm i386-linuxglibc1/include/arpa
-@dirrm i386-linuxglibc1/include/bsd/sys
-@dirrm i386-linuxglibc1/include/bsd
-@dirrm i386-linuxglibc1/include/gnu
-@dirrm i386-linuxglibc1/include/net
-@dirrm i386-linuxglibc1/include/i386
-@dirrm i386-linuxglibc1/include/m68k
-@dirrm i386-linuxglibc1/include/netinet
-@dirrm i386-linuxglibc1/include/pthread/mit/sys
-@dirrm i386-linuxglibc1/include/pthread/mit
-@dirrm i386-linuxglibc1/include/pthread
-@dirrm i386-linuxglibc1/include/protocols
-@dirrm i386-linuxglibc1/include/rpc
-@dirrm i386-linuxglibc1/include/rpcsvc
-@dirrm i386-linuxglibc1/include/sys
-@dirrm i386-linuxglibc1/include/asm
-@dirrm i386-linuxglibc1/include/linux/modules
-@dirrm i386-linuxglibc1/include/linux
-@dirrm i386-linuxglibc1/include/scsi
+@dirrm ${TARGET_ARCH}/include/arpa
+@dirrm ${TARGET_ARCH}/include/bsd/sys
+@dirrm ${TARGET_ARCH}/include/bsd
+@dirrm ${TARGET_ARCH}/include/gnu
+@dirrm ${TARGET_ARCH}/include/net
+@dirrm ${TARGET_ARCH}/include/i386
+@dirrm ${TARGET_ARCH}/include/m68k
+@dirrm ${TARGET_ARCH}/include/netinet
+@dirrm ${TARGET_ARCH}/include/pthread/mit/sys
+@dirrm ${TARGET_ARCH}/include/pthread/mit
+@dirrm ${TARGET_ARCH}/include/pthread
+@dirrm ${TARGET_ARCH}/include/protocols
+@dirrm ${TARGET_ARCH}/include/rpc
+@dirrm ${TARGET_ARCH}/include/rpcsvc
+@dirrm ${TARGET_ARCH}/include/sys
+@dirrm ${TARGET_ARCH}/include/asm
+@dirrm ${TARGET_ARCH}/include/linux/modules
+@dirrm ${TARGET_ARCH}/include/linux
+@dirrm ${TARGET_ARCH}/include/scsi