aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-03-29 13:32:41 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-03-29 13:32:41 -0500
commit040b66f3f97ba9299c0be9da025a9197db654198 (patch)
tree70aaee53088cd85b3172e8237b9fe77ff3d817d1
parentcbd5979bb2ca8609ef19ebdfdc46043c46f0b42e (diff)
parentf638f0d3ae214d995cdd94578195700cda24597b (diff)
Merge remote-tracking branch 'origin/master' into staging
* origin/master: qemu tcg: Remove one entry of INDEX_op_ld_i64 from ppc_op_defs
-rw-r--r--tcg/ppc64/tcg-target.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 409a1ac1ce..f2ad9e3d85 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -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" } },