Module Name: src
Committed By: matt
Date: Mon Aug 11 22:03:25 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Add MKCOMPAT support for aarch64 (COMPAT_MACHINE_CPU)
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/rump/librump/rumpkern/Makefile.rumpkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.148 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.149
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.148 Sun Aug 10 16:44:36 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Mon Aug 11 22:03:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.148 2014/08/10 16:44:36 tls Exp $
+# $NetBSD: Makefile.rumpkern,v 1.149 2014/08/11 22:03:25 matt Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -201,7 +201,11 @@ AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
# the kernel of our compat target (amd64->i386 & sparc64->sparc), so
# take MD stuff from the right arch.
#
-.ifdef MLIBDIR
+.if defined(COMPAT_MACHINE_CPU) \
+ && exists(${RUMPTOP}/librump/rumpkern/arch/${COMPAT_MACHINE_CPU})
+ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${COMPAT_MACHINE_CPU}
+LIBKERN_ARCH= ${COMPAT_MACHINE_CPU}
+.elif defined(MLIBDIR)
ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MLIBDIR}
LIBKERN_ARCH= ${MLIBDIR}
.elif exists(${RUMPTOP}/librump/rumpkern/arch/${MACHINE_CPU})