Merge remote-tracking branch 'origin/master' into staging

* origin/master:
  qemu tcg: Remove one entry of INDEX_op_ld_i64 from ppc_op_defs
This commit is contained in:
Anthony Liguori 2012-03-29 13:32:41 -05:00
commit 040b66f3f9

View File

@ -1656,7 +1656,6 @@ static const TCGTargetOpDef ppc_op_defs[] = {
{ INDEX_op_ld16s_i64, { "r", "r" } },
{ INDEX_op_ld32u_i64, { "r", "r" } },
{ INDEX_op_ld32s_i64, { "r", "r" } },
{ INDEX_op_ld_i64, { "r", "r" } },
{ INDEX_op_add_i32, { "r", "r", "ri" } },
{ INDEX_op_mul_i32, { "r", "r", "ri" } },