[src/trunk]: src/sys/arch/usermode/conf Make GENERIC32 build on amd64

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e989bb7d8115
branches:  trunk
changeset: 768236:e989bb7d8115
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Aug 12 11:22:11 2011 +0000

description:
Make GENERIC32 build on amd64

diffstat:

 sys/arch/usermode/conf/GENERIC32         |  7 +++++--
 sys/arch/usermode/conf/Makefile.usermode |  8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 8e989cc8f34e -r e989bb7d8115 sys/arch/usermode/conf/GENERIC32
--- a/sys/arch/usermode/conf/GENERIC32  Fri Aug 12 08:47:05 2011 +0000
+++ b/sys/arch/usermode/conf/GENERIC32  Fri Aug 12 11:22:11 2011 +0000
@@ -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 $"
 
diff -r 8e989cc8f34e -r e989bb7d8115 sys/arch/usermode/conf/Makefile.usermode
--- a/sys/arch/usermode/conf/Makefile.usermode  Fri Aug 12 08:47:05 2011 +0000
+++ b/sys/arch/usermode/conf/Makefile.usermode  Fri Aug 12 11:22:11 2011 +0000
@@ -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