From patchwork Mon Aug 3 12:46:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30565 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 66A25B6F34 for ; Tue, 4 Aug 2009 01:01:39 +1000 (EST) Received: from localhost ([127.0.0.1]:39796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXz2e-0000kd-9J for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 11:01:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzt-0003qb-Lk 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 1MXwzo-0003nW-Iy for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:36 -0400 Received: from [199.232.76.173] (port=51724 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzo-0003nQ-Dj for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:32 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40889) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzn-0007BU-JO for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:32 -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 n73CoUw4007379; Mon, 3 Aug 2009 08:50:31 -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 n73CoTrx026938; Mon, 3 Aug 2009 08:50:30 -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 n73Cn8N5009715; Mon, 3 Aug 2009 08:50:28 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:52 +0200 Message-Id: <3ff72bd04d47e0116ee0e10b959c9eaa27b02b49.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 61/81] Added CONFIG_NEED_MMU for microblaze and cris 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 | 4 +--- configure | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.target b/Makefile.target index 7fff12d..78f89d5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -47,6 +47,7 @@ libobj-y += tcg/tcg.o tcg/tcg-runtime.o libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o libobj-y += op_helper.o helper.o +libobj-$(CONFIG_NEED_MMU) += mmu.o ifeq ($(TARGET_BASE_ARCH), arm) libobj-y += neon_helper.o iwmmxt_helper.o @@ -58,8 +59,6 @@ endif ifeq ($(TARGET_BASE_ARCH), cris) libobj-y += cris-dis.o - -libobj-$(CONFIG_SOFTMMU) += mmu.o endif # NOTE: the disassembler code is only needed for debugging @@ -79,7 +78,6 @@ libobj-y += ppc-dis.o endif ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) libobj-y += microblaze-dis.o -libobj-$(CONFIG_SOFTMMU) += mmu.o endif ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) libobj-y += mips-dis.o diff --git a/configure b/configure index b5055e2..e2e11f4 100755 --- a/configure +++ b/configure @@ -2086,6 +2086,12 @@ ia64) ;; esac +if test "$target_softmmu" = "yes" -a \( \ + "$TARGET_ARCH" = "microblaze" -o \ + "$TARGET_ARCH" = "cris" \) ; then + echo "CONFIG_NEED_MMU=y" >> $config_mak +fi + if test "$gprof" = "yes" ; then echo "TARGET_GPROF=yes" >> $config_mak if test "$target_linux_user" = "yes" ; then