summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2012-02-16 02:37:43 +0000
committerchristos <christos@NetBSD.org>2012-02-16 02:37:43 +0000
commit7698ea37fbb56871a15bfc0da525589f4e8499a2 (patch)
tree50a57d4eb3b904033e15bc7d98c5a26477b1193a
parentf45636588a4656e4840d5773b665d347c8a60166 (diff)
- make this work for arm32
- factor out duplicated ifdefs
-rw-r--r--usr.sbin/crash/Makefile31
1 files changed, 14 insertions, 17 deletions
diff --git a/usr.sbin/crash/Makefile b/usr.sbin/crash/Makefile
index 4359b8235cc..70ce8bc1609 100644
--- a/usr.sbin/crash/Makefile
+++ b/usr.sbin/crash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/01/31 21:17:57 mlelstv Exp $
+# $NetBSD: Makefile,v 1.17 2012/02/16 02:37:43 christos Exp $
PROG= crash
MAN= crash.8
@@ -15,7 +15,10 @@ DPADD+= ${LIBUTIL} ${LIBKVM} ${LIBEDIT} ${LIBTERMINFO}
|| ${MACHINE} == "hp700" \
|| ${MACHINE} == "i386" \
|| ${MACHINE} == "sparc64" \
+ || (${MACHINE_ARCH} == "arm" && ${MACHINE} != "acorn26") \
|| ${MACHINE_ARCH} == "m68k"
+SRCS+= db_trace.c
+SRCS+= db_machdep.c
REALCRASH=yes
.else
REALCRASH=no
@@ -40,30 +43,24 @@ SRCS+= db_sym.c db_variables.c db_write_cmd.c
.PATH: ${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= db_disasm.c
+CPPFLAGS+= -I${S}/arch
+
. if ${MACHINE} == "amd64" \
|| ${MACHINE} == "i386"
MACHINE_FAMILY = x86
-.PATH: ${S}/arch/x86/x86
-SRCS+= db_trace.c
-SRCS+= db_machdep.c
+. elif ${MACHINE_ARCH} == "m68k" \
+ || ${MACHINE_ARCH} == "arm"
+MACHINE_FAMILY = ${MACHINE_ARCH}
. else
MACHINE_FAMILY = ${MACHINE}
. endif
-. if ${MACHINE} == "hp700"
-SRCS+= db_trace.c db_machdep.c
-. endif
-
-. if ${MACHINE} == "sparc64"
-SRCS+= db_trace.c db_interface.c
-. endif
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${S}/arch/arm/arm32
+SRCS+=disassem.c setstack.S cpufunc_asm.S
+.endif
-. if ${MACHINE_ARCH} == "m68k"
-MACHINE_FAMILY = m68k
-.PATH: ${S}/arch/m68k/m68k
-CPPFLAGS+= -I${S}/arch
-SRCS+= db_trace.c db_interface.c
-. endif
+.PATH: ${S}/arch/${MACHINE_FAMILY}/${MACHINE_FAMILY}
# crash main source
SRCS+= crash.c