Wed Mar 6 11:36:22 2013 UTC ()
fix include dir
add some dependencies


(yamt)
diff -r1.32 -r1.33 src/sys/arch/usermode/conf/Makefile.usermode
cvs diff -r1.32 -r1.33 src/sys/arch/usermode/conf/Makefile.usermode (expand / switch to unified diff)

--- src/sys/arch/usermode/conf/Makefile.usermode 2012/06/30 15:03:57 1.32
+++ src/sys/arch/usermode/conf/Makefile.usermode 2013/03/06 11:36:21 1.33
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile.usermode,v 1.32 2012/06/30 15:03:57 reinoud Exp $ 1# $NetBSD: Makefile.usermode,v 1.33 2013/03/06 11:36:21 yamt Exp $
2 2
3USETOOLS?= no 3USETOOLS?= no
4NEED_OWN_INSTALL_TARGET?= no 4NEED_OWN_INSTALL_TARGET?= no
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7## 7##
8## (1) port identification 8## (1) port identification
9## 9##
10USERMODE= $S/arch/usermode 10USERMODE= $S/arch/usermode
11GENASSYM_CONF= ${USERMODE}/usermode/genassym.cf 11GENASSYM_CONF= ${USERMODE}/usermode/genassym.cf
12 12
13## support for crosscompiling 13## support for crosscompiling
14.if ${MACHINE_ARCH:Uunset} == "unset" 14.if ${MACHINE_ARCH:Uunset} == "unset"
15MACHINE_ARCH!=uname -p 15MACHINE_ARCH!=uname -p
16.endif 16.endif
17 17
18## 18##
19## (2) compile settings 19## (2) compile settings
20## 20##
21USERMODE_HOSTOS!=uname -s 21USERMODE_HOSTOS!=uname -s
22USERMODE_HOSTMACHINE!=uname -m 22USERMODE_HOSTMACHINE!=uname -m
23USERMODE_LIBS= -L${DESTDIR}/usr/lib -lrt 23USERMODE_LIBS= -L${DESTDIR}/usr/lib -lrt
24USERMODE_CPPFLAGS=${DEBUG} -U_KERNEL -I/usr/include 24USERMODE_CPPFLAGS=${DEBUG} -U_KERNEL
 25USERMODE_CPPFLAGS+=-I${DESTDIR}/usr/include
25USERMODE_CPPFLAGS+=${CWARNFLAGS} ${NOGCCERROR:D:U-Werror} 26USERMODE_CPPFLAGS+=${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
26 27
27## XXX hack to make it work under build.sh 28## XXX hack to make it work under build.sh
28.if ${TOOLDIR:Uno} != "no" 29.if ${TOOLDIR:Uno} != "no"
29USERMODE_LIBS+= crti.o 30USERMODE_LIBS+= crti.o
30SYSTEM_LD_FIX= cp ${DESTDIR}/usr/lib/crt0.o ${DESTDIR}/usr/lib/crtbegin.o ${DESTDIR}/usr/lib/crtend.o ${DESTDIR}/usr/lib/crti.o .; 31SYSTEM_LD_FIX= cp ${DESTDIR}/usr/lib/crt0.o ${DESTDIR}/usr/lib/crtbegin.o ${DESTDIR}/usr/lib/crtend.o ${DESTDIR}/usr/lib/crti.o .;
31.endif 32.endif
32 33
33.if ${USERMODE_HOSTOS} == "Linux" 34.if ${USERMODE_HOSTOS} == "Linux"
34USERMODE_LIBS+= -lpthread 35USERMODE_LIBS+= -lpthread
35CPPFLAGS+=-Dstrtoul=netbsd_strtoul 36CPPFLAGS+=-Dstrtoul=netbsd_strtoul
36CPPFLAGS+=-Dstrtoll=netbsd_strtoll 37CPPFLAGS+=-Dstrtoll=netbsd_strtoll
37CPPFLAGS+=-Dstrtoull=netbsd_strtoull 38CPPFLAGS+=-Dstrtoull=netbsd_strtoull
@@ -86,26 +87,28 @@ NVFLAGS= -n @@ -86,26 +87,28 @@ NVFLAGS= -n
86 @rm -f i386 && \ 87 @rm -f i386 && \
87 ln -s $S/arch/i386/include i386 88 ln -s $S/arch/i386/include i386
88 @rm -f amd64 && \ 89 @rm -f amd64 && \
89 ln -s $S/arch/amd64/include amd64 90 ln -s $S/arch/amd64/include amd64
90.endif 91.endif
91 92
92thunk.d: ${USERMODE}/usermode/thunk.c 93thunk.d: ${USERMODE}/usermode/thunk.c
93 ${MKDEP} -f ${.TARGET} -- ${MKDEP_CFLAGS} \ 94 ${MKDEP} -f ${.TARGET} -- ${MKDEP_CFLAGS} \
94 ${CPPFLAGS.thunk.c} ${USERMODE}/usermode/thunk.c 95 ${CPPFLAGS.thunk.c} ${USERMODE}/usermode/thunk.c
95 96
96thunk.o: ${USERMODE}/usermode/thunk.c 97thunk.o: ${USERMODE}/usermode/thunk.c
97 ${CC} ${COPTS} ${CPPFLAGS.thunk.c} -c -o $@ ${USERMODE}/usermode/thunk.c 98 ${CC} ${COPTS} ${CPPFLAGS.thunk.c} -c -o $@ ${USERMODE}/usermode/thunk.c
98 99
 100cpu_${MACHINE_ARCH}.o: ${USERMODE}/target/${MACHINE_ARCH}/cpu_${MACHINE_ARCH}.c
 101
99## 102##
100## (7) misc settings 103## (7) misc settings
101## 104##
102 105
103## 106##
104## (8) config(8) generated machinery 107## (8) config(8) generated machinery
105%INCLUDES 108%INCLUDES
106 109
107%OBJS 110%OBJS
108 111
109%CFILES 112%CFILES
110 113
111%SFILES 114%SFILES