gwj / at91sam9263 · Commits

Commit 824d560f0973d8e4c1ce4e614ed070e7c994bf02

Authored by bellard
1 parent 580a5e27

fixed kqemu config 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1289 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
configure
  View file @824d560
@@ -195,6 +195,7 @@ if test "$mingw32" = "yes" ; then @@ -195,6 +195,7 @@ if test "$mingw32" = "yes" ; then
195 EXESUF=".exe" 195 EXESUF=".exe"
196 gdbstub="no" 196 gdbstub="no"
197 oss="no" 197 oss="no"
  198 + kqemu="no"
198 fi 199 fi
199 200
200 if test -z "$target_list" ; then 201 if test -z "$target_list" ; then
@@ -609,6 +610,9 @@ if test "$target_cpu" = "i386" ; then @@ -609,6 +610,9 @@ if test "$target_cpu" = "i386" ; then
609 echo "TARGET_ARCH=i386" >> $config_mak 610 echo "TARGET_ARCH=i386" >> $config_mak
610 echo "#define TARGET_ARCH \"i386\"" >> $config_h 611 echo "#define TARGET_ARCH \"i386\"" >> $config_h
611 echo "#define TARGET_I386 1" >> $config_h 612 echo "#define TARGET_I386 1" >> $config_h
  613 + if test $kqemu = "yes" -a "$target_softmmu" = "yes" ; then
  614 + echo "#define USE_KQEMU 1" >> $config_h
  615 + fi
612 elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then 616 elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then
613 echo "TARGET_ARCH=arm" >> $config_mak 617 echo "TARGET_ARCH=arm" >> $config_mak
614 echo "#define TARGET_ARCH \"arm\"" >> $config_h 618 echo "#define TARGET_ARCH \"arm\"" >> $config_h
target-i386/cpu.h
  View file @824d560
@@ -39,9 +39,6 @@ @@ -39,9 +39,6 @@
39 #if defined(__i386__) && !defined(CONFIG_SOFTMMU) 39 #if defined(__i386__) && !defined(CONFIG_SOFTMMU)
40 #define USE_CODE_COPY 40 #define USE_CODE_COPY
41 #endif 41 #endif
42 -#if defined(CONFIG_KQEMU) && defined(__linux__) && defined(CONFIG_SOFTMMU) && defined(__i386__) && !defined(TARGET_X86_64)  
43 -#define USE_KQEMU  
44 -#endif  
45 42
46 #define R_EAX 0 43 #define R_EAX 0
47 #define R_ECX 1 44 #define R_ECX 1