projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b6af8ea
)
tcg/s390: Fix merge error with facilities
author
Richard Henderson
<rth@twiddle.net>
Fri, 13 Jan 2017 17:30:40 +0000
(09:30 -0800)
committer
Richard Henderson
<rth@twiddle.net>
Fri, 13 Jan 2017 17:30:40 +0000
(09:30 -0800)
The variable was renamed s390_facilities.
Signed-off-by: Richard Henderson <rth@twiddle.net>
tcg/s390/tcg-target.inc.c
patch
|
blob
|
history
diff --git
a/tcg/s390/tcg-target.inc.c
b/tcg/s390/tcg-target.inc.c
index 0682d01a4eded5aaa77d805690af460de12d2ecc..a679280b92a022affcd76841d030c662bf212303 100644
(file)
--- 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;