Module Name: src
Committed By: jmcneill
Date: Thu Aug 11 22:30:41 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: GENERIC Makefile.usermode
Log Message:
get this linking and running (sorta) again:
soundwave$ ./netbsd
NetBSD/usermode startup
Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2010, 2011
The NetBSD Foundation, Inc. All rights reserved.
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
NetBSD 5.99.55 (GENERIC) #10: Thu Aug 11 14:24:03 EDT 2011
jmcneill@soundwave:/home/jmcneill/branches/HEAD/src/sys/arch/usermode/compile/GENERIC
total memory = 128 MB
avail memory = 124 MB
mainbus0 (root)
cpu0 at mainbus0
clock0 at mainbus0
ttycons0 at mainbus0: console
panic: setcontext failed: 14
rebooting...
Abort (core dumped)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/usermode/conf/GENERIC
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/conf/Makefile.usermode
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/conf/GENERIC
diff -u src/sys/arch/usermode/conf/GENERIC:1.6 src/sys/arch/usermode/conf/GENERIC:1.7
--- src/sys/arch/usermode/conf/GENERIC:1.6 Wed Aug 10 01:32:43 2011
+++ src/sys/arch/usermode/conf/GENERIC Thu Aug 11 22:30:41 2011
@@ -1,12 +1,10 @@
-# $NetBSD: GENERIC,v 1.6 2011/08/10 01:32:43 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.7 2011/08/11 22:30:41 jmcneill Exp $
include "arch/usermode/conf/std.usermode"
options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 32
-makeoptions DEBUG="-g3"
-makeoptions COPTS="-O2 -fno-omit-frame-pointer"
#options MEMSIZE=65536 # amount of memory to allocate (in KB)
options MEMSIZE=131072
@@ -15,6 +13,10 @@
options KTRACE
options USERCONF
+options SYSVMSG
+options SYSVSEM
+options SYSVSHM
+
#options DEBUG
#options DIAGNOSTIC
#options LOCKDEBUG
@@ -25,6 +27,7 @@
#options DDB_HISTORY_SIZE=512
options COMPAT_BSDPTY
+options COMPAT_50
file-system FFS
file-system FDESC
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.5 src/sys/arch/usermode/conf/Makefile.usermode:1.6
--- src/sys/arch/usermode/conf/Makefile.usermode:1.5 Wed Aug 10 01:32:43 2011
+++ src/sys/arch/usermode/conf/Makefile.usermode Thu Aug 11 22:30:41 2011
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile.usermode,v 1.5 2011/08/10 01:32:43 jmcneill Exp $
+# $NetBSD: Makefile.usermode,v 1.6 2011/08/11 22:30:41 jmcneill Exp $
MACHINE_ARCH= usermode
USETOOLS?= no
NEED_OWN_INSTALL_TARGET?= no
.include <bsd.own.mk>
-SYSTEM_LD= ${CC} -o netbsd ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
-
##
## (1) port identification
##
@@ -16,15 +14,15 @@
##
## (2) compile settings
##
-DEFCOPTS= -O2
+DEFCOPTS= -O2 -fno-omit-frame-pointer
CPPFLAGS+= -Dusermode
CPPFLAGS.init_main.c+= -Dmain=kernmain
-AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
KERN_AS= obj
+COMPAT_AS= obj
##
## (4) local objects, compile rules, and dependencies
@@ -36,6 +34,17 @@
##
## (5) link settings
##
+SYSTEM_LD= @${_MKSHMSG} " link ${.CUTDIR:T}/${.TARGET}"; \
+ ${_MKSHECHO}\
+ ${CC} ${COPTS} -Wl,-Map,[email protected] -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \
+ ${CC} ${COPTS} -Wl,-Map,[email protected] -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
+
+newvers: vers.o
+vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh $S/conf/osrelease.sh
+ ${_MKMSG_CREATE} vers.c
+ ${HOST_SH} $S/conf/newvers.sh -n ${_NVFLAGS}
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
##
## (6) port specific target dependencies
