diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-05 21:24:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-05 21:24:49 +0100 |
| commit | 627b4e23ccd2f9a12ab782efc63613bd7d5531c6 (patch) | |
| tree | 285c42ff321f2be9255adfa7d34717db3a04ad16 | |
| parent | 43b0ea1a41bd0a02debd48a18e0b5460148e3f40 (diff) | |
| parent | 2dc7553d0c0a3915c649e1a91b0f0be70b4674b3 (diff) | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160405' into staging
tcg/mips compilation fix
# gpg: Signature made Tue 05 Apr 2016 20:48:38 BST using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
* remotes/rth/tags/pull-tcg-20160405:
tcg/mips: Fix type of tcg_target_reg_alloc_order[]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tcg/mips/tcg-target.inc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index 297bd00910..682e19897d 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -76,7 +76,7 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { #define TCG_TMP1 TCG_REG_T9 /* check if we really need so many registers :P */ -static const TCGReg tcg_target_reg_alloc_order[] = { +static const int tcg_target_reg_alloc_order[] = { /* Call saved registers. */ TCG_REG_S0, TCG_REG_S1, |