From a32b6ae8976ca78483001e98cedea2329076055f Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 13 Jan 2017 09:30:40 -0800 Subject: tcg/s390: Fix merge error with facilities The variable was renamed s390_facilities. Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.inc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tcg') 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; -- cgit v1.2.1