From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1suL-00036r-Nb for qemu-devel@nongnu.org; Tue, 01 Jul 2014 03:55:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1suA-0000SG-6N for qemu-devel@nongnu.org; Tue, 01 Jul 2014 03:55:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1stz-0000A8-GF for qemu-devel@nongnu.org; Tue, 01 Jul 2014 03:55:06 -0400 Message-ID: <53B2694A.3060900@redhat.com> Date: Tue, 01 Jul 2014 09:54:50 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1404199827-7823-1-git-send-email-aik@ozlabs.ru> <53B2662F.7040300@redhat.com> <53B2679F.10009@ozlabs.ru> In-Reply-To: <53B2679F.10009@ozlabs.ru> Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH fix for 2.1 v2] makefile: Fix tools compile List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy , qemu-devel@nongnu.org Cc: Peter Maydell Il 01/07/2014 09:47, Alexey Kardashevskiy ha scritto: > On 07/01/2014 05:41 PM, Paolo Bonzini wrote: >> Il 01/07/2014 09:30, Alexey Kardashevskiy ha scritto: >>> The existing test whether "-lm" needs to be included or not is >>> insufficient as it reports false negative on Fedora20/ppc64. >>> This happens because sin(0.0) is a constant value which compiler >>> can safely throw away and therefore there is no need to add "-lm". >>> As the result, qemu-nbd/qemu-io/qemu-img tools cannot compile. >>> >>> This adds a global variable and uses it in the test to prevent >>> from optimization. >>> >>> Signed-off-by: Alexey Kardashevskiy >>> >>> --- >>> Changes: >>> v2: >>> * previous s/sin/log/ replacement removed, a global variable is >>> used instead >>> --- >>> configure | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/configure b/configure >>> index 23ecb37..6dd44a9 100755 >>> --- a/configure >>> +++ b/configure >>> @@ -3453,7 +3453,7 @@ fi >>> # Do we need libm >>> cat > $TMPC << EOF >>> #include >>> -int main(void) { return isnan(sin(0.0)); } >>> +double x; int main(void) {return isnan(sin(x));} >>> EOF >>> if compile_prog "" "" ; then >>> : >>> >> >> Can you please test with this hunk on top: >> >> diff --git a/Makefile.target b/Makefile.target >> index 6089d29..137d0b0 100644 >> --- a/Makefile.target >> +++ b/Makefile.target >> @@ -163,10 +163,6 @@ dummy := $(call unnest-vars,.., \ >> all-obj-y += $(common-obj-y) >> all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) >> >> -ifndef CONFIG_HAIKU >> -LIBS+=-lm >> -endif >> - >> # build either PROG or PROGW >> $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a >> $(call LINK,$^) >> >> It should now be unnecessary. > > > Tried, all good. Thanks, applied to scsi-next. Paolo