diff options
| author | Richard Henderson | 2017-01-13 18:30:40 +0100 |
|---|---|---|
| committer | Richard Henderson | 2017-01-13 18:30:40 +0100 |
| commit | a32b6ae8976ca78483001e98cedea2329076055f (patch) | |
| tree | 1bec215684250d8a463d9aa764db726d20b5ff75 | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-requ... (diff) | |
| download | qemu-a32b6ae8976ca78483001e98cedea2329076055f.tar.gz qemu-a32b6ae8976ca78483001e98cedea2329076055f.tar.xz qemu-a32b6ae8976ca78483001e98cedea2329076055f.zip | |
tcg/s390: Fix merge error with facilities
The variable was renamed s390_facilities.
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | tcg/s390/tcg-target.inc.c | 2 |
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; |