From patchwork Mon Aug 3 12:46:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 5542DB6F2B for ; Tue, 4 Aug 2009 01:03:30 +1000 (EST) Received: from localhost ([127.0.0.1]:40527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXz4N-0001VH-7l for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 11:03:23 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzu-0003rL-6R for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzp-0003oA-Ml for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:37 -0400 Received: from [199.232.76.173] (port=51725 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzp-0003nz-Em for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:33 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40891) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzo-0007Bu-Sq for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:33 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73CoWrJ007389; Mon, 3 Aug 2009 08:50:32 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73CoVKM026942; Mon, 3 Aug 2009 08:50:31 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8N6009715; Mon, 3 Aug 2009 08:50:30 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:53 +0200 Message-Id: <735ee142267577c421b8d7ac45245449b2ef7e01.1249301360.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 62/81] Move dis-* selection to configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile.target | 53 ++++++++++++----------------------------------------- configure | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 41 deletions(-) diff --git a/Makefile.target b/Makefile.target index 78f89d5..9053b00 100644 --- a/Makefile.target +++ b/Makefile.target @@ -57,49 +57,20 @@ ifeq ($(TARGET_BASE_ARCH), alpha) libobj-y += alpha_palcode.o endif -ifeq ($(TARGET_BASE_ARCH), cris) -libobj-y += cris-dis.o -endif - # NOTE: the disassembler code is only needed for debugging libobj-y += disas.o -ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386) -USE_I386_DIS=y -endif -ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64) -USE_I386_DIS=y -endif -libobj-$(USE_I386_DIS) += i386-dis.o -ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha) -libobj-y += alpha-dis.o -endif -ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc) -libobj-y += ppc-dis.o -endif -ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) -libobj-y += microblaze-dis.o -endif -ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) -libobj-y += mips-dis.o -endif -ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc) -libobj-y += sparc-dis.o -endif -ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm) -libobj-y += arm-dis.o -endif -ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k) -libobj-y += m68k-dis.o -endif -ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4) -libobj-y += sh4-dis.o -endif -ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa) -libobj-y += hppa-dis.o -endif -ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390) -libobj-y += s390-dis.o -endif +libobj-$(CONFIG_ALPHA_DIS) += alpha-dis.o +libobj-$(CONFIG_ARM_DIS) += arm-dis.o +libobj-$(CONFIG_CRIS_DIS) += cris-dis.o +libobj-$(CONFIG_HPPA_DIS) += hppa-dis.o +libobj-$(CONFIG_I386_DIS) += i386-dis.o +libobj-$(CONFIG_M68K_DIS) += m68k-dis.o +libobj-$(CONFIG_MICROBLAZE_DIS) += microblaze-dis.o +libobj-$(CONFIG_MIPS_DIS) += mips-dis.o +libobj-$(CONFIG_PPC_DIS) += ppc-dis.o +libobj-$(CONFIG_S390_DIS) += s390-dis.o +libobj-$(CONFIG_SH4_DIS) += sh4-dis.o +libobj-$(CONFIG_SPARC_DIS) += sparc-dis.o # libqemu diff --git a/configure b/configure index e2e11f4..a6494ca 100755 --- a/configure +++ b/configure @@ -2076,6 +2076,47 @@ fi cflags="-I\$(SRC_PATH)/tcg $cflags" cflags="-I\$(SRC_PATH)/fpu $cflags" +for i in $ARCH $TARGET_BASE_ARCH ; do + case "$i" in + alpha) + echo "CONFIG_ALPHA_DIS=y" >> $config_mak + ;; + arm) + echo "CONFIG_ARM_DIS=y" >> $config_mak + ;; + cris) + echo "CONFIG_CRIS_DIS=y" >> $config_mak + ;; + hppa) + echo "CONFIG_HPPA_DIS=y" >> $config_mak + ;; + i386|x86_64) + echo "CONFIG_I386_DIS=y" >> $config_mak + ;; + m68k) + echo "CONFIG_M68K_DIS=y" >> $config_mak + ;; + microblaze) + echo "CONFIG_MICROBLAZE_DIS=y" >> $config_mak + ;; + mips*) + echo "CONFIG_MIPS_DIS=y" >> $config_mak + ;; + ppc*) + echo "CONFIG_PPC_DIS=y" >> $config_mak + ;; + s390) + echo "CONFIG_S390_DIS=y" >> $config_mak + ;; + sh4) + echo "CONFIG_SH4_DIS=y" >> $config_mak + ;; + sparc*) + echo "CONFIG_SPARC_DIS=y" >> $config_mak + ;; + esac +done + case "$ARCH" in alpha) # Ensure there's only a single GP