From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF2Pm-0007N9-Js for qemu-devel@nongnu.org; Mon, 11 Mar 2013 09:05:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UF2Pk-00072x-3l for qemu-devel@nongnu.org; Mon, 11 Mar 2013 09:05:18 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:43344) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF2Pj-00072L-I7 for qemu-devel@nongnu.org; Mon, 11 Mar 2013 09:05:16 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Mar 2013 22:55:11 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id BE723357804E for ; Tue, 12 Mar 2013 00:05:08 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2BCqFXG10682568 for ; Mon, 11 Mar 2013 23:52:17 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2BD55Uq023659 for ; Tue, 12 Mar 2013 00:05:06 +1100 From: Anthony Liguori In-Reply-To: <1362997886-9470-1-git-send-email-pbonzini@redhat.com> References: <1362997886-9470-1-git-send-email-pbonzini@redhat.com> Date: Mon, 11 Mar 2013 08:04:59 -0500 Message-ID: <87y5dum6is.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, peter.maydell@linaro.org Paolo Bonzini writes: > A conflict was resolved the wrong way when merging commit 320ba5f (build: > always link device_tree.o into emulators if libfdt available, 2013-02-05). > This causes a build failure for the arm-softmmu target due to multiply > defined symbol. > > Signed-off-by: Paolo Bonzini Applied, thanks. I've added libfdt to my build server to prevent this in the future. Regards, Anthony Liguori > --- > hw/arm/Makefile.objs | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index 2d9c69d..f5f7d0e 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o > obj-y += framebuffer.o > obj-y += strongarm.o > obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o > -obj-$(CONFIG_FDT) += ../device_tree.o > obj-$(CONFIG_KVM) += kvm/arm_gic.o > > obj-y := $(addprefix ../,$(obj-y)) > -- > 1.8.1.4