From 29bf026beaf64bdf7544c9f70af2430dbd02ee1f Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Sun, 10 Jul 2011 08:43:50 +0000
Subject: [PATCH] install elf2ecoff for all mips64 systems.  it's needed for
 stand.

---
 tools/Makefile             |  5 +++--
 usr.bin/elf2ecoff/Makefile | 11 +++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 6fe35eb0ea45..6d3f07d1b5ed 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.146 2011/06/21 02:15:41 mrg Exp $
+#	$NetBSD: Makefile,v 1.147 2011/07/10 08:43:51 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -107,7 +107,8 @@ SUBDIR+=	macppc-fixcoff
 SUBDIR+=	powerpc-mkbootimage
 .endif
 
-.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb")
+.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
+     ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb")
 SUBDIR+=	mips-elf2ecoff
 .endif
 
diff --git a/usr.bin/elf2ecoff/Makefile b/usr.bin/elf2ecoff/Makefile
index b9e4e4e51db5..f2e120c13ef9 100644
--- a/usr.bin/elf2ecoff/Makefile
+++ b/usr.bin/elf2ecoff/Makefile
@@ -1,16 +1,11 @@
-#	$NetBSD: Makefile,v 1.11 2009/12/14 00:43:05 matt Exp $
+#	$NetBSD: Makefile,v 1.12 2011/07/10 08:43:50 mrg Exp $
 #	from: @(#)Makefile	5.4 (Berkeley) 5/11/90
 
 .include <bsd.own.mk>
 
-ABI64:=  ${CPUFLAGS:M-mabi=64:M-mabi=o64}
-# Build ELF to {ecoff, aout} tools on mips, for old bootblocks/PROMs.
-.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-     ((${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
-      !defined(HOSTPROG) && empty(ABI64)))
-
+# Build ELF to ecoff tools on mips, for old bootblocks/PROMs.
+.if ${MACHINE_CPU} == "mips"
 PROG=	elf2ecoff
-
 .endif
 
 MAN=	elf2ecoff.1