Change requested in launchpad bug #1288352
[packages/centos6/qemu.git] / 0097-tcg-i386-fix-build-with-march-i686.patch
1 From 5d3868bb343df0c13240521e36d0cc942c7a2d04 Mon Sep 17 00:00:00 2001
2 From: Aurelien Jarno <aurelien@aurel32.net>
3 Date: Wed, 26 Sep 2012 00:30:12 +0200
4 Subject: [PATCH] tcg/i386: fix build with -march < i686
5
6 The movcond_i32 op has to be protected with TCG_TARGET_HAS_movcond_i32
7 to fix the build with -march < i686.
8
9 Thanks to Richard Henderson for the hint.
10
11 Reported-by: Alex Barcelo <abarcelo@ac.upc.edu>
12 Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
13 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
14 ---
15  tcg/i386/tcg-target.c | 2 ++
16  1 file changed, 2 insertions(+)
17
18 diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
19 index 85c6b81..616ef23 100644
20 --- a/tcg/i386/tcg-target.c
21 +++ b/tcg/i386/tcg-target.c
22 @@ -1907,7 +1907,9 @@ static const TCGTargetOpDef x86_op_defs[] = {
23      { INDEX_op_setcond_i32, { "q", "r", "ri" } },
24  
25      { INDEX_op_deposit_i32, { "Q", "0", "Q" } },
26 +#if TCG_TARGET_HAS_movcond_i32
27      { INDEX_op_movcond_i32, { "r", "r", "ri", "r", "0" } },
28 +#endif
29  
30  #if TCG_TARGET_REG_BITS == 32
31      { INDEX_op_mulu2_i32, { "a", "d", "a", "r" } },
32 -- 
33 1.7.12.1
34