mirror of https://github.com/bochs-emu/Bochs
- fix it so that cpu/mmx.o is compiled in when MMX is enabled.
This commit is contained in:
Bryce Denney
parent
f780d81523
commit
61ff7bbb06
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.86 2002/08/26 15:31:19 bdenney Exp .
|
||||
# From configure.in Id: configure.in,v 1.87 2002/08/26 16:17:10 bdenney Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.53.
|
||||
#
|
||||
|
|
@ -9524,8 +9524,7 @@ fi;
|
|||
|
||||
echo "$as_me:$LINENO: checking for MMX support" >&5
|
||||
echo $ECHO_N "checking for MMX support... $ECHO_C" >&6
|
||||
MMX_VAR=''
|
||||
MMX_GLUE_OBJ=''
|
||||
MMX_OBJS=''
|
||||
# Check whether --enable-mmx or --disable-mmx was given.
|
||||
if test "${enable_mmx+set}" = set; then
|
||||
enableval="$enable_mmx"
|
||||
|
|
@ -9536,7 +9535,7 @@ echo "${ECHO_T}yes" >&6
|
|||
#define BX_SUPPORT_MMX 1
|
||||
_ACEOF
|
||||
|
||||
MMX_OBJ='mmx.o'
|
||||
MMX_OBJS='mmx.o'
|
||||
elif test "$enableval" = no; then
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
|
@ -11709,7 +11708,7 @@ s,@BX_LOADER_OBJS@,$BX_LOADER_OBJS,;t t
|
|||
s,@INSTRUMENT_DIR@,$INSTRUMENT_DIR,;t t
|
||||
s,@INSTRUMENT_VAR@,$INSTRUMENT_VAR,;t t
|
||||
s,@VIDEO_OBJS@,$VIDEO_OBJS,;t t
|
||||
s,@MMX_OBJ@,$MMX_OBJ,;t t
|
||||
s,@MMX_OBJS@,$MMX_OBJS,;t t
|
||||
s,@FPU_VAR@,$FPU_VAR,;t t
|
||||
s,@FPU_GLUE_OBJ@,$FPU_GLUE_OBJ,;t t
|
||||
s,@CDROM_OBJS@,$CDROM_OBJS,;t t
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
|
|||
|
||||
AC_PREREQ(2.4)
|
||||
AC_INIT(bochs.h)
|
||||
AC_REVISION([[$Id: configure.in,v 1.87 2002-08-26 16:17:10 bdenney Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.88 2002-08-26 16:40:21 bdenney Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl // Put Bochs version information right here so that it gets substituted
|
||||
|
|
@ -856,14 +856,13 @@ AC_ARG_ENABLE(vbe,
|
|||
)
|
||||
|
||||
AC_MSG_CHECKING(for MMX support)
|
||||
MMX_VAR=''
|
||||
MMX_GLUE_OBJ=''
|
||||
MMX_OBJS=''
|
||||
AC_ARG_ENABLE(mmx,
|
||||
[ --enable-mmx compile in MMX emulation],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_SUPPORT_MMX, 1)
|
||||
MMX_OBJ='mmx.o'
|
||||
MMX_OBJS='mmx.o'
|
||||
elif test "$enableval" = no; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(BX_SUPPORT_MMX, 0)
|
||||
|
|
@ -874,7 +873,7 @@ AC_ARG_ENABLE(mmx,
|
|||
AC_DEFINE(BX_SUPPORT_MMX, 0)
|
||||
]
|
||||
)
|
||||
AC_SUBST(MMX_OBJ)
|
||||
AC_SUBST(MMX_OBJS)
|
||||
|
||||
AC_MSG_CHECKING(for FPU emulation)
|
||||
FPU_VAR=''
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ RANLIB = @RANLIB@
|
|||
|
||||
BX_INCDIRS = -I.. -I$(srcdir)/.. -I../@INSTRUMENT_DIR@ -I$(srcdir)/../@INSTRUMENT_DIR@
|
||||
|
||||
MMX_OBJS = @MMX_OBJS@
|
||||
APIC_OBJS = @APIC_OBJS@
|
||||
|
||||
OBJS = \
|
||||
|
|
@ -91,7 +92,7 @@ OBJS = \
|
|||
soft_int.o \
|
||||
string.o \
|
||||
bcd.o \
|
||||
###must be a tab here-> mmx.o \
|
||||
$(MMX_OBJS) \
|
||||
$(APIC_OBJS)
|
||||
|
||||
BX_INCLUDES = ../bochs.h ../config.h
|
||||
|
|
@ -438,17 +439,17 @@ logical8.o: logical8.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
|
|||
../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
|
||||
../iodev/guest2host.h ../iodev/slowdown_timer.h \
|
||||
../instrument/stubs/instrument.h
|
||||
#mmx.o: mmx.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../debug/debug.h \
|
||||
# ../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
|
||||
# ../cpu/lazy_flags.h ../memory/memory.h ../pc_system.h ../gui/gui.h \
|
||||
# ../gui/control.h ../gui/keymap.h ../iodev/iodev.h ../iodev/pci.h \
|
||||
# ../iodev/vga.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
|
||||
# ../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
|
||||
# ../iodev/keyboard.h ../iodev/parallel.h ../iodev/pic.h ../iodev/pit.h \
|
||||
# ../iodev/pit_wrap.h ../iodev/pit82c54.h ../iodev/serial.h \
|
||||
# ../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
|
||||
# ../iodev/guest2host.h ../iodev/slowdown_timer.h \
|
||||
# ../instrument/stubs/instrument.h
|
||||
mmx.o: mmx.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../debug/debug.h \
|
||||
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
|
||||
../cpu/lazy_flags.h ../memory/memory.h ../pc_system.h ../gui/gui.h \
|
||||
../gui/control.h ../gui/keymap.h ../iodev/iodev.h ../iodev/pci.h \
|
||||
../iodev/vga.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
|
||||
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
|
||||
../iodev/keyboard.h ../iodev/parallel.h ../iodev/pic.h ../iodev/pit.h \
|
||||
../iodev/pit_wrap.h ../iodev/pit82c54.h ../iodev/serial.h \
|
||||
../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
|
||||
../iodev/guest2host.h ../iodev/slowdown_timer.h \
|
||||
../instrument/stubs/instrument.h
|
||||
mult16.o: mult16.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../debug/debug.h \
|
||||
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
|
||||
../cpu/lazy_flags.h ../memory/memory.h ../pc_system.h ../gui/gui.h \
|
||||
|
|
|
|||
Loading…
Reference in New Issue