Commit 2d6ebb0c2c4152545677ce92ccd4684eb20b931a
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
Showing
2 changed files
with
6 additions
and
1 deletions
Makefile.target
| ... | ... | @@ -131,8 +131,11 @@ all: $(PROGS) |
| 131 | 131 | |
| 132 | 132 | ######################################################### |
| 133 | 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 | 135 | translate.o host-utils.o |
| 136 | +ifdef CONFIG_KQEMU | |
| 137 | +LIBOBJS+= kqemu.o | |
| 138 | +endif | |
| 136 | 139 | # TCG code generator |
| 137 | 140 | LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o |
| 138 | 141 | CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) | ... | ... |
configure
| ... | ... | @@ -1769,6 +1769,7 @@ case "$target_cpu" in |
| 1769 | 1769 | echo "#define TARGET_I386 1" >> $config_h |
| 1770 | 1770 | if test $kqemu = "yes" -a "$target_softmmu" = "yes" |
| 1771 | 1771 | then |
| 1772 | + echo "CONFIG_KQEMU=yes" >> $config_mak | |
| 1772 | 1773 | echo "#define USE_KQEMU 1" >> $config_h |
| 1773 | 1774 | fi |
| 1774 | 1775 | if test "$kvm" = "yes" ; then |
| ... | ... | @@ -1784,6 +1785,7 @@ case "$target_cpu" in |
| 1784 | 1785 | echo "#define TARGET_X86_64 1" >> $config_h |
| 1785 | 1786 | if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" |
| 1786 | 1787 | then |
| 1788 | + echo "CONFIG_KQEMU=yes" >> $config_mak | |
| 1787 | 1789 | echo "#define USE_KQEMU 1" >> $config_h |
| 1788 | 1790 | fi |
| 1789 | 1791 | if test "$kvm" = "yes" ; then | ... | ... |