Module Name: src
Committed By: jmcneill
Date: Fri Aug 12 11:22:12 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: GENERIC32 Makefile.usermode
Log Message:
Make GENERIC32 build on amd64
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/usermode/conf/GENERIC32
cvs rdiff -u -r1.8 -r1.9 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/GENERIC32
diff -u src/sys/arch/usermode/conf/GENERIC32:1.1 src/sys/arch/usermode/conf/GENERIC32:1.2
--- src/sys/arch/usermode/conf/GENERIC32:1.1 Sat Dec 29 20:22:25 2007
+++ src/sys/arch/usermode/conf/GENERIC32 Fri Aug 12 11:22:11 2011
@@ -1,9 +1,12 @@
-# $NetBSD: GENERIC32,v 1.1 2007/12/29 20:22:25 reinoud Exp $
+# $NetBSD: GENERIC32,v 1.2 2011/08/12 11:22:11 jmcneill Exp $
include "arch/usermode/conf/GENERIC"
no options EXEC_ELF64
+makeoptions COPTS+="-m32"
+makeoptions LD="ld -melf_i386"
+
#options INCLUDE_CONFIG_FILE
-#ident "GENERIC32-$Revision: 1.1 $"
+#ident "GENERIC32-$Revision: 1.2 $"
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.8 src/sys/arch/usermode/conf/Makefile.usermode:1.9
--- src/sys/arch/usermode/conf/Makefile.usermode:1.8 Fri Aug 12 00:57:23 2011
+++ src/sys/arch/usermode/conf/Makefile.usermode Fri Aug 12 11:22:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.8 2011/08/12 00:57:23 jmcneill Exp $
+# $NetBSD: Makefile.usermode,v 1.9 2011/08/12 11:22:11 jmcneill Exp $
MACHINE_ARCH= usermode
USETOOLS?= no
@@ -46,6 +46,12 @@
## (6) port specific target dependencies
##
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+ @rm -f i386 && \
+ ln -s $S/arch/i386/include i386
+.endif
+
thunk.o: ${USERMODE}/usermode/thunk.c
${CC} ${COPTS} -I${.CURDIR} -c -o $@ ${USERMODE}/usermode/thunk.c
