Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin build elf2aout and fdformat on macppc64 (for now, it...



details:   https://anonhg.NetBSD.org/src/rev/c5aac24f1cd9
branches:  trunk
changeset: 753482:c5aac24f1cd9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Mar 30 07:26:23 2010 +0000

description:
build elf2aout and fdformat on macppc64 (for now, it's a lot easier than
figuring out how to split the sets... but that will have to happen.)

fixes the first easy part of PR#43075.

diffstat:

 usr.bin/elf2aout/Makefile |  7 +++++--
 usr.bin/fdformat/Makefile |  9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 923c63a785f0 -r c5aac24f1cd9 usr.bin/elf2aout/Makefile
--- a/usr.bin/elf2aout/Makefile Tue Mar 30 07:23:51 2010 +0000
+++ b/usr.bin/elf2aout/Makefile Tue Mar 30 07:26:23 2010 +0000
@@ -1,8 +1,11 @@
-#      $NetBSD: Makefile,v 1.7 2009/08/12 23:39:13 matt Exp $
+#      $NetBSD: Makefile,v 1.8 2010/03/30 07:26:23 mrg Exp $
 #      from: @(#)Makefile      5.4 (Berkeley) 5/11/90
 
 # Build ELF to {ecoff, aout} tools on m68k/powerpc, for kernels with old amigappc bootblocks.
-.if (${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc")
+.if (${MACHINE_ARCH} == "m68000" || \
+     ${MACHINE_ARCH} == "m68k" || \
+     ${MACHINE_ARCH} == "powerpc" || \
+     ${MACHINE_ARCH} == "powerpc64")
 PROG=  elf2aout
 .endif
 
diff -r 923c63a785f0 -r c5aac24f1cd9 usr.bin/fdformat/Makefile
--- a/usr.bin/fdformat/Makefile Tue Mar 30 07:23:51 2010 +0000
+++ b/usr.bin/fdformat/Makefile Tue Mar 30 07:26:23 2010 +0000
@@ -1,11 +1,12 @@
-#      $NetBSD: Makefile,v 1.12 2009/04/12 02:53:56 lukem Exp $
+#      $NetBSD: Makefile,v 1.13 2010/03/30 07:26:23 mrg Exp $
+
+.include <bsd.own.mk>
 
 .if (${MACHINE_ARCH} == "alpha" || \
-     ${MACHINE_ARCH} == "arm" || \
-     ${MACHINE_ARCH} == "armeb" || \
+     ${MACHINE_CPU} == "arm" || \
      ${MACHINE_ARCH} == "i386" || \
      ${MACHINE_ARCH} == "m68k" || \
-     ${MACHINE_ARCH} == "powerpc" || \
+     ${MACHINE_CPU} == "powerpc" || \
      ${MACHINE_ARCH} == "sparc" || \
      ${MACHINE_ARCH} == "sparc64" || \
      ${MACHINE_ARCH} == "x86_64")



Home | Main Index | Thread Index | Old Index