diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-29 13:32:41 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-29 13:32:41 -0500 |
| commit | 040b66f3f97ba9299c0be9da025a9197db654198 (patch) | |
| tree | 70aaee53088cd85b3172e8237b9fe77ff3d817d1 | |
| parent | cbd5979bb2ca8609ef19ebdfdc46043c46f0b42e (diff) | |
| parent | f638f0d3ae214d995cdd94578195700cda24597b (diff) | |
| download | qemu-040b66f3f97ba9299c0be9da025a9197db654198.zip qemu-040b66f3f97ba9299c0be9da025a9197db654198.tar.gz qemu-040b66f3f97ba9299c0be9da025a9197db654198.tar.bz2 | |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 409a1ac..f2ad9e3 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" } }, |