From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L9TAD-0007YG-9A
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 18:35:49 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L9TAC-0007Xj-Ir
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 18:35:48 -0500
Received: from [199.232.76.173] (port=52942 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L9TAC-0007Xd-Fa
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 18:35:48 -0500
Received: from savannah.gnu.org ([199.232.41.3]:53318 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L9TAC-00076d-8y
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 18:35:48 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L9TAB-0002S7-Gd
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 23:35:47 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1L9TAB-0002S2-Bb
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 23:35:47 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1L9TAB-0002S2-Bb@cvs.savannah.gnu.org>
Date: Sun, 07 Dec 2008 23:35:47 +0000
Subject: [Qemu-devel] [5947] Fix 64-bit targets compilation on ARM host.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5947
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5947
Author:   balrog
Date:     2008-12-07 23:35:47 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Fix 64-bit targets compilation on ARM host.

Only fix compilation, probably doesn't run.

Modified Paths:
--------------
    trunk/tcg/arm/tcg-target.c

Modified: trunk/tcg/arm/tcg-target.c
===================================================================
--- trunk/tcg/arm/tcg-target.c	2008-12-07 23:33:34 UTC (rev 5946)
+++ trunk/tcg/arm/tcg-target.c	2008-12-07 23:35:47 UTC (rev 5947)
@@ -858,10 +858,10 @@
     else
         data_reg2 = 0; /* surpress warning */
     addr_reg = *args++;
-#if TARGET_LONG_BITS == 64
+#ifdef CONFIG_SOFTMMU
+# if TARGET_LONG_BITS == 64
     addr_reg2 = *args++;
-#endif
-#ifdef CONFIG_SOFTMMU
+# endif
     mem_index = *args;
     s_bits = opc & 3;
 
@@ -1036,10 +1036,10 @@
     else
         data_reg2 = 0; /* surpress warning */
     addr_reg = *args++;
-#if TARGET_LONG_BITS == 64
+#ifdef CONFIG_SOFTMMU
+# if TARGET_LONG_BITS == 64
     addr_reg2 = *args++;
-#endif
-#ifdef CONFIG_SOFTMMU
+# endif
     mem_index = *args;
     s_bits = opc & 3;