From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Stefan Weil Date: Tue, 23 Feb 2010 22:32:23 +0100 Message-Id: <1266960743-11496-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <4B844517.6030607@linux.vnet.ibm.com> References: <4B844517.6030607@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] arm host: Fix linker warning (m68k targets) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: aliguori@linux.vnet.ibm.com 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); -- 1.6.6.1