summaryrefslogtreecommitdiff
path: root/tcg
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2017-01-13 09:30:40 -0800
committerRichard Henderson <rth@twiddle.net>2017-01-13 09:30:40 -0800
commita32b6ae8976ca78483001e98cedea2329076055f (patch)
tree1bec215684250d8a463d9aa764db726d20b5ff75 /tcg
parentb6af8ea60282df514f87d32e36afd1c9aeee28c8 (diff)
downloadqemu-a32b6ae8976ca78483001e98cedea2329076055f.tar.gz
tcg/s390: Fix merge error with facilities
The variable was renamed s390_facilities. Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'tcg')
-rw-r--r--tcg/s390/tcg-target.inc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
index 0682d01a4e..a679280b92 100644
--- a/tcg/s390/tcg-target.inc.c
+++ b/tcg/s390/tcg-target.inc.c
@@ -1096,7 +1096,7 @@ static int tgen_cmp(TCGContext *s, TCGType type, TCGCond c, TCGReg r1,
/* If we only got here because of load-and-test,
and we couldn't use that, then we need to load
the constant into a register. */
- if (!(facilities & FACILITY_EXT_IMM)) {
+ if (!(s390_facilities & FACILITY_EXT_IMM)) {
c2 = TCG_TMP0;
tcg_out_movi(s, type, c2, 0);
goto do_reg;