From patchwork Tue Feb 23 21:32:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 46099 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 ozlabs.org (Postfix) with ESMTPS id 86E01B7CCD for ; Wed, 24 Feb 2010 08:33:31 +1100 (EST) Received: from localhost ([127.0.0.1]:58715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nk2Nk-0008JZ-Mz for incoming@patchwork.ozlabs.org; Tue, 23 Feb 2010 16:33:28 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nk2N1-0008Fz-ER for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:32:43 -0500 Received: from [199.232.76.173] (port=35814 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nk2N0-0008Fd-R7 for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:32:42 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nk2Mz-0005eK-8A for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:32:42 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:60700) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nk2My-0005dW-KI for qemu-devel@nongnu.org; Tue, 23 Feb 2010 16:32:41 -0500 Received: from flocke.weilnetz.de (p54ADFB19.dip.t-dialin.net [84.173.251.25]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MMJXF-1Npp800I3R-008Ez7; Tue, 23 Feb 2010 22:32:25 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1Nk2Mi-0002zy-5m; Tue, 23 Feb 2010 22:32:24 +0100 From: Stefan Weil To: QEMU Developers X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <4B844517.6030607@linux.vnet.ibm.com> References: <4B844517.6030607@linux.vnet.ibm.com> X-Provags-ID: V01U2FsdGVkX19CY7fAdN02tPF+lsjTJIi+4aTbj3VcGBRL/su SnnfApQ7y0ooqBAsuXYbNL5cSXrnaD6TvC4c2gT+Spb0oTE9El rYZs+alpov4dat+7tgVrj2HWoYvugZtb4gdTNrCvViJO+JHTLn hlw== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] arm host: Fix linker warning (m68k targets) 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 Compilation of m68k-softmmu or m68k-linux-user on arm host (or cross compilation for arm) results in a linker warning: LINK m68k-softmmu/qemu-system-m68k m68k-dis.o: warning: definition of `floatformat_ieee_single_little' overriding common arm-dis.o: warning: common is here /usr/lib/gcc/arm-linux-gnueabi/4.3.2/../../../../arm-linux-gnueabi/bin/ld: Warning: size of symbol `floatformat_ieee_single_little' changed from 4 in arm-dis.o to 48 in m68k-dis.o floatformat_ieee_single_little is declared in arm-dis.c and m68k-dis.c, and both declarations don't match, so this is an error. The symbol is not needed in arm-dis.c, so I removed it there. Signed-off-by: Stefan Weil --- arm-dis.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arm-dis.c b/arm-dis.c index 2c67d8f..4fb899e 100644 --- a/arm-dis.c +++ b/arm-dis.c @@ -60,10 +60,8 @@ #define FPU_VFP_EXT_V3 0 #define FPU_NEON_EXT_V1 0 -int floatformat_ieee_single_little; /* Assume host uses ieee float. */ -static void floatformat_to_double (int *ignored, unsigned char *data, - double *dest) +static void floatformat_to_double (unsigned char *data, double *dest) { union { uint32_t i; @@ -2543,9 +2541,7 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb) valbytes[2] = (value >> 16) & 0xff; valbytes[3] = (value >> 24) & 0xff; - floatformat_to_double - (&floatformat_ieee_single_little, valbytes, - &fvalue); + floatformat_to_double (valbytes, &fvalue); func (stream, "#%.7g\t; 0x%.8lx", fvalue, value);