[src/trunk]: src/sys/arch/usermode/conf use MACHINE_CPU instead of uname -p; ...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c2a6b35e9533
branches:  trunk
changeset: 791258:c2a6b35e9533
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Nov 10 19:49:49 2013 +0000

description:
use MACHINE_CPU instead of uname -p; create symlink for arm headers

diffstat:

 sys/arch/usermode/conf/Makefile.usermode |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r acea7e79e277 -r c2a6b35e9533 sys/arch/usermode/conf/Makefile.usermode
--- a/sys/arch/usermode/conf/Makefile.usermode  Sun Nov 10 18:28:08 2013 +0000
+++ b/sys/arch/usermode/conf/Makefile.usermode  Sun Nov 10 19:49:49 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.33 2013/03/06 11:36:21 yamt Exp $
+# $NetBSD: Makefile.usermode,v 1.34 2013/11/10 19:49:49 jmcneill Exp $
 
 USETOOLS?=                     no
 NEED_OWN_INSTALL_TARGET?=      no
@@ -59,8 +59,8 @@
 MD_CFILES=     ${USERMODE}/usermode/thunk.c
 MD_SFILES=
 
-MD_OBJS+=      cpu_${MACHINE_ARCH}.o
-MD_CFILES+=    ${USERMODE}/target/${MACHINE_ARCH}/cpu_${MACHINE_ARCH}.c
+MD_OBJS+=      cpu_${MACHINE_CPU}.o
+MD_CFILES+=    ${USERMODE}/target/${MACHINE_CPU}/cpu_${MACHINE_CPU}.c
 
 ##
 ## (5) link settings
@@ -88,6 +88,8 @@
                ln -s $S/arch/i386/include i386
        @rm -f amd64 && \
                ln -s $S/arch/amd64/include amd64
+       @rm -f arm && \
+               ln -s $S/arch/arm/include arm
 .endif
 
 thunk.d: ${USERMODE}/usermode/thunk.c
@@ -97,7 +99,7 @@
 thunk.o: ${USERMODE}/usermode/thunk.c
        ${CC} ${COPTS} ${CPPFLAGS.thunk.c} -c -o $@ ${USERMODE}/usermode/thunk.c
 
-cpu_${MACHINE_ARCH}.o: ${USERMODE}/target/${MACHINE_ARCH}/cpu_${MACHINE_ARCH}.c
+cpu_${MACHINE_CPU}.o:  ${USERMODE}/target/${MACHINE_CPU}/cpu_${MACHINE_CPU}.c
 
 ##
 ## (7) misc settings