Wed Dec 31 13:08:58 2008 UTC ()
Include rb.c instead of relying on it being in libc.


(pooka)
diff -r1.25 -r1.26 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs diff -r1.25 -r1.26 src/sys/rump/librump/rumpkern/Makefile.rumpkern (expand / switch to unified diff)

--- src/sys/rump/librump/rumpkern/Makefile.rumpkern 2008/12/30 09:49:21 1.25
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern 2008/12/31 13:08:57 1.26
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile.rumpkern,v 1.25 2008/12/30 09:49:21 pooka Exp $ 1# $NetBSD: Makefile.rumpkern,v 1.26 2008/12/31 13:08:57 pooka Exp $
2# 2#
3 3
4.include "${RUMPTOP}/Makefile.rump" 4.include "${RUMPTOP}/Makefile.rump"
5 5
6LIB= rump 6LIB= rump
7LDFLAGS+= -Wl,--wrap=malloc 7LDFLAGS+= -Wl,--wrap=malloc
8 8
9.PATH: ${RUMPTOP}/librump/rumpkern \ 9.PATH: ${RUMPTOP}/librump/rumpkern \
10 ${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern \ 10 ${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern \
11 ${RUMPTOP}/../conf ${RUMPTOP}/../dev \ 11 ${RUMPTOP}/../conf ${RUMPTOP}/../dev \
12 ${RUMPTOP}/../../common/lib/libutil 12 ${RUMPTOP}/../../common/lib/libutil \
 13 ${RUMPTOP}/../../common/lib/libc/gen
13 14
14# 15#
15# Source modules, first the ones specifically implemented for librump. 16# Source modules, first the ones specifically implemented for librump.
16#  17#
17SRCS= rump.c emul.c intr.c locks.c ltsleep.c percpu.c pool.c sleepq.c vm.c 18SRCS= rump.c emul.c intr.c locks.c ltsleep.c percpu.c pool.c sleepq.c vm.c
18 19
19# stubs 20# stubs
20# 21#
21SRCS+= misc_stub.c pmap_stub.c 22SRCS+= misc_stub.c pmap_stub.c
22 23
23# autogenerated 24# autogenerated
24# 25#
25SRCS+= rump_syscalls.c 26SRCS+= rump_syscalls.c
@@ -39,27 +40,27 @@ SRCS+= subr_devsw.c subr_callback.c subr @@ -39,27 +40,27 @@ SRCS+= subr_devsw.c subr_callback.c subr
39 40
40# the funny bit. this doesn't really belong here, but helps with the 41# the funny bit. this doesn't really belong here, but helps with the
41# needs of kern_descrip.c. And since it's a fully dynamic interface, 42# needs of kern_descrip.c. And since it's a fully dynamic interface,
42# it doesn't pull in other gunk. 43# it doesn't pull in other gunk.
43SRCS+= vnode_if.c 44SRCS+= vnode_if.c
44 45
45# sys/dev 46# sys/dev
46SRCS+= clock_subr.c 47SRCS+= clock_subr.c
47 48
48# sys/lib/libkern 49# sys/lib/libkern
49SRCS+= __assert.c scanc.c skpc.c 50SRCS+= __assert.c scanc.c skpc.c
50 51
51# src/common 52# src/common
52SRCS+= snprintb.c 53SRCS+= snprintb.c rb.c
53 54
54# uncomment these lines if you want to use the real kmem code 55# uncomment these lines if you want to use the real kmem code
55#CPPFLAGS+= -DRUMP_USE_REAL_KMEM 56#CPPFLAGS+= -DRUMP_USE_REAL_KMEM
56#SRCS+= subr_kmem.c subr_vmem.c 57#SRCS+= subr_kmem.c subr_vmem.c
57 58
58.if ${MACHINE_ARCH} == "vax" 59.if ${MACHINE_ARCH} == "vax"
59.PATH: ${RUMPTOP}/../lib/libkern/arch/vax 60.PATH: ${RUMPTOP}/../lib/libkern/arch/vax
60SRCS+= blkset.S 61SRCS+= blkset.S
61.endif 62.endif
62 63
63# no shlib_version because this is automatically in sync with lib/librump 64# no shlib_version because this is automatically in sync with lib/librump
64SHLIB_MAJOR= 0 65SHLIB_MAJOR= 0
65SHLIB_MINOR= 0 66SHLIB_MINOR= 0