Mon Dec 14 21:19:23 2009 UTC ()
Make librump play with mips nicely.  Define ARCH_ELFSIZE for mips to be 32.
This works for N64 kernels because objcopy them to be 32bit to the bootloaders
can handle them.


(matt)
diff -r1.67 -r1.68 src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -r0 -r1.1 src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc
cvs diff -r1.67 -r1.68 src/sys/rump/librump/rumpkern/Makefile.rumpkern (expand / switch to unified diff)

--- src/sys/rump/librump/rumpkern/Makefile.rumpkern 2009/12/13 08:25:20 1.67
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern 2009/12/14 21:19:23 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.rumpkern,v 1.67 2009/12/13 08:25:20 mrg Exp $ 1# $NetBSD: Makefile.rumpkern,v 1.68 2009/12/14 21:19:23 matt Exp $
2# 2#
3 3
4.include "${RUMPTOP}/Makefile.rump" 4.include "${RUMPTOP}/Makefile.rump"
5 5
6LIB= rump 6LIB= rump
7 7
8.PATH: ${RUMPTOP}/librump/rumpkern \ 8.PATH: ${RUMPTOP}/librump/rumpkern \
9 ${RUMPTOP}/../kern \ 9 ${RUMPTOP}/../kern \
10 ${RUMPTOP}/../uvm \ 10 ${RUMPTOP}/../uvm \
11 ${RUMPTOP}/../conf \ 11 ${RUMPTOP}/../conf \
12 ${RUMPTOP}/../dev \ 12 ${RUMPTOP}/../dev \
13 ${RUMPTOP}/../secmodel/suser 13 ${RUMPTOP}/../secmodel/suser
14 14
@@ -80,26 +80,28 @@ AFLAGS+= -D_LOCORE -Wa,-fatal-warnings @@ -80,26 +80,28 @@ AFLAGS+= -D_LOCORE -Wa,-fatal-warnings
80# 2) rump_cpu_bootstrap() 80# 2) rump_cpu_bootstrap()
81# 3) ...? 81# 3) ...?
82# 4) PROFIT! 82# 4) PROFIT!
83# 83#
84 84
85# 85#
86# Check if we are building compat. In compat mode we need to provide 86# Check if we are building compat. In compat mode we need to provide
87# the kernel of our compat target (amd64->i386 & sparc64->sparc), so 87# the kernel of our compat target (amd64->i386 & sparc64->sparc), so
88# take MD stuff from the right arch. 88# take MD stuff from the right arch.
89# 89#
90.ifdef MLIBDIR 90.ifdef MLIBDIR
91ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MLIBDIR} 91ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MLIBDIR}
92LIBKERN_ARCH= ${MLIBDIR} 92LIBKERN_ARCH= ${MLIBDIR}
 93.elif exists(${RUMPTOP}/librump/rumpkern/arch/${MACHINE_CPU})
 94ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MACHINE_CPU}
93.else 95.else
94ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH} 96ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH}
95.endif 97.endif
96.if exists(${ARCHDIR}) 98.if exists(${ARCHDIR})
97.include "${ARCHDIR}/Makefile.inc" 99.include "${ARCHDIR}/Makefile.inc"
98.PATH: ${ARCHDIR} 100.PATH: ${ARCHDIR}
99.else 101.else
100SRCS+= kobj_stubs.c rumpcpu_generic.c 102SRCS+= kobj_stubs.c rumpcpu_generic.c
101.endif 103.endif
102 104
103# include libkern source files 105# include libkern source files
104KERNDIR=${RUMPTOP}/../lib/libkern 106KERNDIR=${RUMPTOP}/../lib/libkern
105.include "${RUMPTOP}/../lib/libkern/Makefile.libkern" 107.include "${RUMPTOP}/../lib/libkern/Makefile.libkern"
File Added: src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc
# $NetBSD: Makefile.inc,v 1.1 2009/12/14 21:19:23 matt Exp $

CPPFLAGS+=	-DARCH_ELFSIZE=32
SRCS+=  	kobj_stubs.c rumpcpu_generic.c