From patchwork Fri Mar 1 13:33:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 224346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 43EA12C02A0 for ; Sat, 2 Mar 2013 00:41:24 +1100 (EST) Received: from localhost ([::1]:45386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQDC-0004OQ-FN for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 08:41:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ6S-0003XD-LO for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBQ6O-0007Ra-W5 for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:24 -0500 Received: from mail-qa0-f54.google.com ([209.85.216.54]:55096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ6O-0007RQ-SX for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:20 -0500 Received: by mail-qa0-f54.google.com with SMTP id hg5so2150732qab.20 for ; Fri, 01 Mar 2013 05:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=Hf+07ZtEh3X8APTpQs+l3nJ+bJADSs2WUIY2GXkOk2U=; b=otBTWT2Ys9af59UQNUYPJTy/eOyIfgRMeicdQiV6ivOCD18EytNrDMUlu5rbGbTmuD rIzszhxtrbetg0dYK4iavrEfJ/h5Ez/uk72fqWOmeEGGJjBccp5cw7poHbJbI/xCdh93 QvDym1ab01reym44nUA9k9tlTl9+ZaNu3NTNsFO05E0PrOltoKyRrtkkWDU6Eg5k8Pkj ZznETcSKk85NbuCMy8CMH2AWfewyPjM03hGKD+LqIOs+4QdQN1zK2ELgtEKgPDEv/LOf Hf2gxzLj+7mX2wKNf/NmJJXULGY0yFEsrFZiHHcW0lDZK2f8s8X+FXWrsq7nG2omOm56 uQsw== X-Received: by 10.229.207.129 with SMTP id fy1mr3608602qcb.77.1362144860458; Fri, 01 Mar 2013 05:34:20 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id hr1sm19338754qeb.3.2013.03.01.05.34.18 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 01 Mar 2013 05:34:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 14:33:41 +0100 Message-Id: <1362144829-26979-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> References: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.54 Cc: peter.maydell@linaro.org, afaerber@suse.de Subject: [Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulators if libfdt available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- Makefile.target | 1 + configure | 7 +------ hw/arm/Makefile.objs | 1 - hw/microblaze/Makefile.objs | 1 - hw/ppc/Makefile.objs | 1 - 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile.target b/Makefile.target index ca657b3..2bd6d14 100644 --- a/Makefile.target +++ b/Makefile.target @@ -111,6 +111,7 @@ CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y) obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o obj-y += qtest.o obj-y += hw/ +obj-$(CONFIG_FDT) += device_tree.o obj-$(CONFIG_KVM) += kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-y += memory.o savevm.o cputlb.o diff --git a/configure b/configure index 19738ac..8fdc2cf 100755 --- a/configure +++ b/configure @@ -2416,6 +2416,7 @@ int main(void) { return 0; } EOF if compile_prog "" "$fdt_libs" ; then fdt=yes + libs_softmmu="$libs_softmmu $fdt_libs" else if test "$fdt" = "yes" ; then feature_not_found "fdt" @@ -3981,7 +3982,6 @@ case "$target_arch2" in target_nptl="yes" gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" target_llong_alignment=4 - target_libs_softmmu="$fdt_libs" ;; cris) target_nptl="yes" @@ -4000,7 +4000,6 @@ case "$target_arch2" in TARGET_ARCH=microblaze bflt="yes" target_nptl="yes" - target_libs_softmmu="$fdt_libs" ;; mips|mipsel) TARGET_ARCH=mips @@ -4025,21 +4024,18 @@ case "$target_arch2" in ppc) gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_nptl="yes" - target_libs_softmmu="$fdt_libs" ;; ppcemb) TARGET_BASE_ARCH=ppc TARGET_ABI_DIR=ppc gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_nptl="yes" - target_libs_softmmu="$fdt_libs" ;; ppc64) TARGET_BASE_ARCH=ppc TARGET_ABI_DIR=ppc gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_long_alignment=8 - target_libs_softmmu="$fdt_libs" ;; ppc64abi32) TARGET_ARCH=ppc64 @@ -4047,7 +4043,6 @@ case "$target_arch2" in TARGET_ABI_DIR=ppc echo "TARGET_ABI32=y" >> $config_target_mak gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" - target_libs_softmmu="$fdt_libs" ;; sh4|sh4eb) TARGET_ARCH=sh4 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 4c10985..3eb1366 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -31,6 +31,5 @@ obj-y += strongarm.o obj-y += collie.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o obj-y += kzm.o -obj-$(CONFIG_FDT) += ../device_tree.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index 3028e65..2ff8048 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -5,6 +5,5 @@ obj-y += xilinx_spi.o obj-y += microblaze_pic_cpu.o obj-y += xilinx_ethlite.o -obj-$(CONFIG_FDT) += ../device_tree.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index f762050..bbbe78e 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -16,7 +16,6 @@ obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o obj-y += virtex_ml507.o # PowerPC OpenPIC obj-y += openpic.o -obj-$(CONFIG_FDT) += ../device_tree.o # Xilinx PPC peripherals obj-y += xilinx_ethlite.o