gwj / at91sam9263 · Commits

Commit 2d6ebb0c2c4152545677ce92ccd4684eb20b931a

Authored by blueswir1
1 parent e5289087

kqemu: only compile kqemu.o if actually needed 

kqemu.o is compiled even if kqemu support is disabled. This is useless
(kqemu.o should provide nothing that is actually used in that case) and
slightly confusing. So introduce CONFIG_KQEMU for optionally compiling
kqemu.o.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7185 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
Makefile.target
  View file @2d6ebb0
@@ -131,8 +131,11 @@ all: $(PROGS) @@ -131,8 +131,11 @@ all: $(PROGS)
131 131
132 ######################################################### 132 #########################################################
133 # cpu emulator library 133 # cpu emulator library
134 -LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\ 134 +LIBOBJS=exec.o translate-all.o cpu-exec.o\
135 translate.o host-utils.o 135 translate.o host-utils.o
  136 +ifdef CONFIG_KQEMU
  137 +LIBOBJS+= kqemu.o
  138 +endif
136 # TCG code generator 139 # TCG code generator
137 LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o 140 LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o
138 CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) 141 CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
configure
  View file @2d6ebb0
@@ -1769,6 +1769,7 @@ case &quot;$target_cpu&quot; in @@ -1769,6 +1769,7 @@ case &quot;$target_cpu&quot; in
1769 echo "#define TARGET_I386 1" >> $config_h 1769 echo "#define TARGET_I386 1" >> $config_h
1770 if test $kqemu = "yes" -a "$target_softmmu" = "yes" 1770 if test $kqemu = "yes" -a "$target_softmmu" = "yes"
1771 then 1771 then
  1772 + echo "CONFIG_KQEMU=yes" >> $config_mak
1772 echo "#define USE_KQEMU 1" >> $config_h 1773 echo "#define USE_KQEMU 1" >> $config_h
1773 fi 1774 fi
1774 if test "$kvm" = "yes" ; then 1775 if test "$kvm" = "yes" ; then
@@ -1784,6 +1785,7 @@ case &quot;$target_cpu&quot; in @@ -1784,6 +1785,7 @@ case &quot;$target_cpu&quot; in
1784 echo "#define TARGET_X86_64 1" >> $config_h 1785 echo "#define TARGET_X86_64 1" >> $config_h
1785 if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" 1786 if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"
1786 then 1787 then
  1788 + echo "CONFIG_KQEMU=yes" >> $config_mak
1787 echo "#define USE_KQEMU 1" >> $config_h 1789 echo "#define USE_KQEMU 1" >> $config_h
1788 fi 1790 fi
1789 if test "$kvm" = "yes" ; then 1791 if test "$kvm" = "yes" ; then