Tue Dec 30 21:31:10 2008 UTC ()
Move list of rump-uses-kmod archs to bsd.own.mk for wider consumption.


(pooka)
diff -r1.552 -r1.553 src/share/mk/bsd.own.mk
diff -r1.19 -r1.20 src/sys/rump/Makefile.rump
cvs diff -r1.552 -r1.553 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2008/12/23 02:54:11 1.552
+++ src/share/mk/bsd.own.mk 2008/12/30 21:31:10 1.553
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.552 2008/12/23 02:54:11 agc Exp $ 1# $NetBSD: bsd.own.mk,v 1.553 2008/12/30 21:31:10 pooka Exp $
2 2
3.if !defined(_BSD_OWN_MK_) 3.if !defined(_BSD_OWN_MK_)
4_BSD_OWN_MK_=1 4_BSD_OWN_MK_=1
5 5
6MAKECONF?= /etc/mk.conf 6MAKECONF?= /etc/mk.conf
7.-include "${MAKECONF}" 7.-include "${MAKECONF}"
8 8
9# 9#
10# CPU model, derived from MACHINE_ARCH 10# CPU model, derived from MACHINE_ARCH
11# 11#
12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/} 12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
13 13
14# 14#
@@ -542,26 +542,34 @@ MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR @@ -542,26 +542,34 @@ MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
542 (${MACHINE_GNU_ARCH} == "arm" || \ 542 (${MACHINE_GNU_ARCH} == "arm" || \
543 ${MACHINE_GNU_ARCH} == "armeb" || \ 543 ${MACHINE_GNU_ARCH} == "armeb" || \
544 ${MACHINE_ARCH} == "i386" || \ 544 ${MACHINE_ARCH} == "i386" || \
545 ${MACHINE_CPU} == "m68k" || \ 545 ${MACHINE_CPU} == "m68k" || \
546 ${MACHINE_GNU_ARCH} == "sh" || \ 546 ${MACHINE_GNU_ARCH} == "sh" || \
547 ${MACHINE_GNU_ARCH} == "shle" || \ 547 ${MACHINE_GNU_ARCH} == "shle" || \
548 ${MACHINE_ARCH} == "sparc" || \ 548 ${MACHINE_ARCH} == "sparc" || \
549 ${MACHINE_ARCH} == "vax") 549 ${MACHINE_ARCH} == "vax")
550MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf 550MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf
551.else 551.else
552MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsd 552MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsd
553.endif 553.endif
554 554
 555#
 556# Determine if arch uses native kernel modules with rump
 557#
 558.if ${MACHINE_ARCH} == "i386" || \
 559 ${MACHINE_ARCH} == "x86_64"
 560RUMPKMOD= # defined
 561.endif
 562
555TARGETS+= all clean cleandir depend dependall includes \ 563TARGETS+= all clean cleandir depend dependall includes \
556 install lint obj regress tags html 564 install lint obj regress tags html
557PHONY_NOTMAIN = all clean cleandir depend dependall distclean includes \ 565PHONY_NOTMAIN = all clean cleandir depend dependall distclean includes \
558 install lint obj regress tags beforedepend afterdepend \ 566 install lint obj regress tags beforedepend afterdepend \
559 beforeinstall afterinstall realinstall realdepend realall \ 567 beforeinstall afterinstall realinstall realdepend realall \
560 html subdir-all subdir-install subdir-depend 568 html subdir-all subdir-install subdir-depend
561.PHONY: ${PHONY_NOTMAIN} 569.PHONY: ${PHONY_NOTMAIN}
562.NOTMAIN: ${PHONY_NOTMAIN} 570.NOTMAIN: ${PHONY_NOTMAIN}
563 571
564.if ${NEED_OWN_INSTALL_TARGET} != "no" 572.if ${NEED_OWN_INSTALL_TARGET} != "no"
565.if !target(install) 573.if !target(install)
566install: beforeinstall .WAIT subdir-install realinstall .WAIT afterinstall 574install: beforeinstall .WAIT subdir-install realinstall .WAIT afterinstall
567beforeinstall: 575beforeinstall:
cvs diff -r1.19 -r1.20 src/sys/rump/Makefile.rump (expand / switch to unified diff)

--- src/sys/rump/Makefile.rump 2008/12/30 19:05:40 1.19
+++ src/sys/rump/Makefile.rump 2008/12/30 21:31:10 1.20
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile.rump,v 1.19 2008/12/30 19:05:40 pooka Exp $ 1# $NetBSD: Makefile.rump,v 1.20 2008/12/30 21:31:10 pooka Exp $
2# 2#
3 3
4WARNS?= 4 4WARNS?= 4
5NOLINT= # kernel code 5NOLINT= # kernel code
6 6
 7.include <bsd.own.mk>
 8
7# use kernel ABI instead of rump ABI (needs md code) 9# use kernel ABI instead of rump ABI (needs md code)
8.if ${MACHINE_ARCH} != "i386" && \ 10.ifndef(RUMPKMOD)
9 ${MACHINE_ARCH} != "x86_64" 
10CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS} 11CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS}
11.endif 12.endif
12 13
13CFLAGS+= -ffreestanding 14CFLAGS+= -ffreestanding
14CPPFLAGS+= -D_RUMPKERNEL # XXX: this should die 15CPPFLAGS+= -D_RUMPKERNEL # XXX: this should die
15CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE 16CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE
16CPPFLAGS+= -DDIAGNOSTIC 17CPPFLAGS+= -DDIAGNOSTIC
17CPPFLAGS+= -I${.CURDIR} -I. 18CPPFLAGS+= -I${.CURDIR} -I.
18CPPFLAGS+= -I${RUMPTOP}/../../common/include -I${RUMPTOP}/../arch 19CPPFLAGS+= -I${RUMPTOP}/../../common/include -I${RUMPTOP}/../arch
19CPPFLAGS+= -I${RUMPTOP}/include 20CPPFLAGS+= -I${RUMPTOP}/include
20CPPFLAGS+= -nostdinc -I${RUMPTOP}/.. 21CPPFLAGS+= -nostdinc -I${RUMPTOP}/..
21#CPPFLAGS+= -DDEBUG 22#CPPFLAGS+= -DDEBUG
22 23