aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-02-12 18:58:00 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-02-12 18:58:00 +0000
commit824d560f0973d8e4c1ce4e614ed070e7c994bf02 (patch)
treed0e253d7ea1e993579e2f2bb2ed9b23afe0b15e4
parent580a5e27c63809abd633290950e387daedddcafa (diff)
fixed kqemu config
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1289 c046a42c-6fe2-441c-8c8c-71466251a162
-rwxr-xr-xconfigure4
-rw-r--r--target-i386/cpu.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 21ea62a52d..cc21847c8f 100755
--- a/configure
+++ b/configure
@@ -195,6 +195,7 @@ if test "$mingw32" = "yes" ; then
EXESUF=".exe"
gdbstub="no"
oss="no"
+ kqemu="no"
fi
if test -z "$target_list" ; then
@@ -609,6 +610,9 @@ if test "$target_cpu" = "i386" ; then
echo "TARGET_ARCH=i386" >> $config_mak
echo "#define TARGET_ARCH \"i386\"" >> $config_h
echo "#define TARGET_I386 1" >> $config_h
+ if test $kqemu = "yes" -a "$target_softmmu" = "yes" ; then
+ echo "#define USE_KQEMU 1" >> $config_h
+ fi
elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then
echo "TARGET_ARCH=arm" >> $config_mak
echo "#define TARGET_ARCH \"arm\"" >> $config_h
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 38f9595af9..154d8bfdae 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -39,9 +39,6 @@
#if defined(__i386__) && !defined(CONFIG_SOFTMMU)
#define USE_CODE_COPY
#endif
-#if defined(CONFIG_KQEMU) && defined(__linux__) && defined(CONFIG_SOFTMMU) && defined(__i386__) && !defined(TARGET_X86_64)
-#define USE_KQEMU
-#endif
#define R_EAX 0
#define R_ECX 1