svn commit: r211058 - in head/sys: conf modules/x86bios

[Jung-uk Kim]

Author: jkim
Date: Sun Aug  8 06:18:05 2010
New Revision: 211058
URL: http://svn.freebsd.org/changeset/base/211058

Log:
  Do not build real mode emulator for i386.  We use VM86 again since r210877.

Modified:
  head/sys/conf/files.i386
  head/sys/modules/x86bios/Makefile

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Sun Aug  8 02:51:32 2010	(r211057)
+++ head/sys/conf/files.i386	Sun Aug  8 06:18:05 2010	(r211058)
@@ -369,10 +369,9 @@ i386/xbox/xboxfb.c		optional xboxfb
 dev/fb/boot_font.c		optional xboxfb
 i386/xbox/pic16l.s		optional xbox
 #
-# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
+# x86 real mode BIOS support, required by atkbdc/dpms/vesa
 #
 compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | vesa
-contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
 #
 # x86 shared code between IA32, AMD64 and PC98 architectures
 #

Modified: head/sys/modules/x86bios/Makefile
==============================================================================
--- head/sys/modules/x86bios/Makefile	Sun Aug  8 02:51:32 2010	(r211057)
+++ head/sys/modules/x86bios/Makefile	Sun Aug  8 06:18:05 2010	(r211058)
@@ -6,6 +6,9 @@ SRCS+=	bus_if.h device_if.h pci_if.h
 
 .PATH:	${.CURDIR}/../../contrib/x86emu
 .PATH:	${.CURDIR}/../../compat/x86bios
-SRCS+=	x86bios.c x86emu.c
+SRCS+=	x86bios.c
+.if ${MACHINE_ARCH} != "i386"
+SRCS+=	x86emu.c
+.endif
 
 .include <bsd.kmod.mk>