From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lv981-0006RI-Ei for qemu-devel@nongnu.org; Sat, 18 Apr 2009 07:54:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lv97x-0006Og-M2 for qemu-devel@nongnu.org; Sat, 18 Apr 2009 07:54:37 -0400 Received: from [199.232.76.173] (port=45226 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lv97x-0006Od-IZ for qemu-devel@nongnu.org; Sat, 18 Apr 2009 07:54:33 -0400 Received: from smtp-out3.tiscali.nl ([195.241.79.178]:36445) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lv97x-0004u9-2h for qemu-devel@nongnu.org; Sat, 18 Apr 2009 07:54:33 -0400 Received: from [212.123.169.34] (helo=[192.168.1.61]) by smtp-out3.tiscali.nl with esmtp id 1Lv97u-0004o4-0U for ; Sat, 18 Apr 2009 13:54:30 +0200 From: Paul Bolle Content-Type: text/plain Date: Sat, 18 Apr 2009 13:54:29 +0200 Message-Id: <1240055669.12170.20.camel@localhost.localdomain> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] kqemu: only compile kqemu.o if actually needed Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- If this is accepted a next step could be to merge CONFIG_KQEMU and USE_KQEMU. Makefile.target | 5 ++++- configure | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile.target b/Makefile.target index dae339b..b27696a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -131,8 +131,11 @@ all: $(PROGS) ######################################################### # cpu emulator library -LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\ +LIBOBJS=exec.o translate-all.o cpu-exec.o\ translate.o host-utils.o +ifdef CONFIG_KQEMU +LIBOBJS+= kqemu.o +endif # TCG code generator LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) diff --git a/configure b/configure index af35713..1d96635 100755 --- a/configure +++ b/configure @@ -1766,6 +1766,7 @@ case "$target_cpu" in echo "#define TARGET_I386 1" >> $config_h if test $kqemu = "yes" -a "$target_softmmu" = "yes" then + echo "CONFIG_KQEMU=yes" >> $config_mak echo "#define USE_KQEMU 1" >> $config_h fi if test "$kvm" = "yes" ; then @@ -1781,6 +1782,7 @@ case "$target_cpu" in echo "#define TARGET_X86_64 1" >> $config_h if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" then + echo "CONFIG_KQEMU=yes" >> $config_mak echo "#define USE_KQEMU 1" >> $config_h fi if test "$kvm" = "yes" ; then -- 1.6.2.2