From a22fb01b56fa9efff1b651d511ef01bfd4da6de7 Mon Sep 17 00:00:00 2001
From: mrg <mrg>
Date: Fri, 21 May 1999 09:37:07 +0000
Subject: disable sparc64 support for now; it kills sparc-netbsdelf which is
 actually very useful right now.

---
 cross/COMMON/cross.mk         |  6 ++++--
 cross/binutils/Makefile       | 15 +++++++++------
 cross/sparc64-netbsd/Makefile |  4 +++-
 3 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'cross')

diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index 6cc0d135936..aed3413b8e0 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: cross.mk,v 1.10 1999/02/18 13:46:32 tv Exp $
+#	$NetBSD: cross.mk,v 1.11 1999/05/21 09:37:07 mrg Exp $
 
 # Shared definitions for building a cross-compile environment.
 
@@ -49,11 +49,13 @@ binutils-patch:
 		${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \
 	done
 
+BFD64ARG=	--enable-64-bit-bfd
+
 binutils-configure:
 	@cd ${BINUTILS_WRKSRC} && ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
 		CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} ./configure \
 		--prefix=${PREFIX} --host=${MACHINE_GNU_ARCH}--netbsd \
-		--target=${TARGET_ARCH} --enable-64-bit-bfd
+		--target=${TARGET_ARCH} ${BFD64ARG}
 
 binutils-build:
 	@cd ${BINUTILS_WRKSRC}/bfd && ${SETENV} ${MAKE_ENV} \
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index d609c61c406..16f005f53e1 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/14 21:39:01 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/05/21 09:37:07 mrg Exp $
 #
 # GNU binutils configured to hold `as many targets as the cross system is
 # capable of using'.  Configures and builds everything except gas, which
@@ -16,8 +16,8 @@ USE_CROSSBASE=		yes
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-64-bit-bfd \
-			--enable-targets=${ENABLE_TARGETS_LIST} \
+CONFIGURE_ARGS+=	--enable-64-bit-bfd
+CONFIGURE_ARGS+=	--enable-targets=${ENABLE_TARGETS_LIST} \
 			--target=i386-linux
 # --target above ensures that --host is not included as default
 MAKE_ARGS+=		CFLAGS="${CFLAGS}"
@@ -25,14 +25,17 @@ ALL_TARGET=		all-binutils all-ld
 
 BINDIR=			${PREFIX}/libexec/binutils
 
-ENABLE_TARGETS=		alpha-netbsd \
+ENABLE_TARGETS+=	alpha-netbsd \
 			i386-cygwin32 i386-elf i386-go32 i386-linux \
 			i386-netbsd i386-netware \
 			m68k-elf m68k-netbsd m68k-sunos4 \
 			mips-dec-netbsd \
 			powerpc-eabi powerpcle-eabi \
-			sparc-netbsd sparc-solaris2 sparc-sunos4 \
-			sparc64-elf
+			sparc-netbsd sparc-solaris2 sparc-sunos4
+
+# this breaks the `sparc-solaris2' target (which adds sparc_elf32
+# which we use for the `sparc-netbsdelf' target
+#ENABLE_TARGETS+=	sparc64-elf
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/gas
diff --git a/cross/sparc64-netbsd/Makefile b/cross/sparc64-netbsd/Makefile
index 168a46a43f3..9410115a75a 100644
--- a/cross/sparc64-netbsd/Makefile
+++ b/cross/sparc64-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/01/06 03:43:04 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/21 09:37:07 mrg Exp $
 #
 
 DISTVERSION=		1.3.0.0
@@ -17,4 +17,6 @@ EGCS_FAKE_RUNTIME=	yes
 
 TARGET_ARCH=		sparc64-netbsd
 
+BROKEN=			kills sparc-netbsdelf support
+
 .include "../COMMON/cross.mk"
-- 
cgit v1.2.3