From: balrog Date: Sun, 7 Dec 2008 23:35:47 +0000 (+0000) Subject: Fix 64-bit targets compilation on ARM host. X-Git-Tag: 0.10.0-0maemo1~396 X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=aef3a282a44e1a3009a6b77dd0c28b4b14ded672;p=qemu Fix 64-bit targets compilation on ARM host. Only fix compilation, probably doesn't run. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5947 c046a42c-6fe2-441c-8c8c-71466251a162 --- diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index c4cae8a..8e99dd0 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -858,10 +858,10 @@ static inline void tcg_out_qemu_ld(TCGContext *s, int cond, else data_reg2 = 0; /* surpress warning */ addr_reg = *args++; -#if TARGET_LONG_BITS == 64 - addr_reg2 = *args++; -#endif #ifdef CONFIG_SOFTMMU +# if TARGET_LONG_BITS == 64 + addr_reg2 = *args++; +# endif mem_index = *args; s_bits = opc & 3; @@ -1036,10 +1036,10 @@ static inline void tcg_out_qemu_st(TCGContext *s, int cond, else data_reg2 = 0; /* surpress warning */ addr_reg = *args++; -#if TARGET_LONG_BITS == 64 - addr_reg2 = *args++; -#endif #ifdef CONFIG_SOFTMMU +# if TARGET_LONG_BITS == 64 + addr_reg2 = *args++; +# endif mem_index = *args; s_bits = opc & 3;