Module Name: src
Committed By: matt
Date: Wed Aug 26 03:35:41 UTC 2009
Modified Files:
src/usr.bin/crunch/crunchide [matt-nb5-mips64]: Makefile
src/usr.bin/elf2aout [matt-nb5-mips64]: Makefile
src/usr.bin/elf2ecoff [matt-nb5-mips64]: Makefile
Log Message:
Teach crunchhide about mips64.
Make elf2ecoff for mips64 too.
never make elf2aout anymore.
Don't make ATF stuff if MKATF is no.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.24.1 src/usr.bin/crunch/crunchide/Makefile
cvs rdiff -u -r1.6 -r1.6.48.1 src/usr.bin/elf2aout/Makefile
cvs rdiff -u -r1.10 -r1.10.46.1 src/usr.bin/elf2ecoff/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/crunch/crunchide/Makefile
diff -u src/usr.bin/crunch/crunchide/Makefile:1.16 src/usr.bin/crunch/crunchide/Makefile:1.16.24.1
--- src/usr.bin/crunch/crunchide/Makefile:1.16 Sun Apr 8 09:36:34 2007
+++ src/usr.bin/crunch/crunchide/Makefile Wed Aug 26 03:35:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/04/08 09:36:34 scw Exp $
+# $NetBSD: Makefile,v 1.16.24.1 2009/08/26 03:35:41 matt Exp $
.include <bsd.own.mk>
@@ -13,9 +13,15 @@
${MACHINE_ARCH} == "mipseb" || \
${MACHINE_ARCH} == "powerpc"
CPPFLAGS+=-DNLIST_ELF32
+.elif ${MACHINE_ARCH} == "mips" || \
+ ${MACHINE_ARCH} == "mipsel" || \
+ ${MACHINE_ARCH} == "mipseb" || \
+ ${MACHINE_ARCH} == "powerpc"
.elif ${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"
CPPFLAGS+=-DNLIST_ELF32 -DNLIST_COFF
.elif ${MACHINE_ARCH} == "powerpc64" || \
+ ${MACHINE_ARCH} == "mips64eb" || \
+ ${MACHINE_ARCH} == "mips64el" || \
${MACHINE_ARCH} == "x86_64"
CPPFLAGS+=-DNLIST_ELF32 -DNLIST_ELF64
.elif ${MACHINE_ARCH} == "sparc64"
Index: src/usr.bin/elf2aout/Makefile
diff -u src/usr.bin/elf2aout/Makefile:1.6 src/usr.bin/elf2aout/Makefile:1.6.48.1
--- src/usr.bin/elf2aout/Makefile:1.6 Fri Mar 22 00:17:56 2002
+++ src/usr.bin/elf2aout/Makefile Wed Aug 26 03:35:41 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/03/22 00:17:56 fredette Exp $
+# $NetBSD: Makefile,v 1.6.48.1 2009/08/26 03:35:41 matt Exp $
# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
# Build ELF to {ecoff, aout} tools on mips, for old bootblocks/PROMs,
# and on m68k/powerpc, for kernels with old amigappc bootblocks.
-.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc")
+.if (${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc")
PROG= elf2aout
.endif
Index: src/usr.bin/elf2ecoff/Makefile
diff -u src/usr.bin/elf2ecoff/Makefile:1.10 src/usr.bin/elf2ecoff/Makefile:1.10.46.1
--- src/usr.bin/elf2ecoff/Makefile:1.10 Sun May 18 07:57:34 2003
+++ src/usr.bin/elf2ecoff/Makefile Wed Aug 26 03:35:41 2009
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2003/05/18 07:57:34 lukem Exp $
+# $NetBSD: Makefile,v 1.10.46.1 2009/08/26 03:35:41 matt Exp $
# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
.include <bsd.own.mk>
# Build ELF to {ecoff, aout} tools on mips, for old bootblocks/PROMs.
-.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb")
+.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
+ ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb")
PROG= elf2ecoff
