diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-mips.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index b02f315..1ce6dbb 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2010-07-06 Maciej W. Rozycki <macro@codesourcery.com> + + * config/tc-mips.c (nops_for_insn_or_target): Replace + MIPS16_INSN_BRANCH with MIPS16_INSN_UNCOND_BRANCH and + MIPS16_INSN_COND_BRANCH. + 2010-07-05 Jim Wilson <wilson@codesourcery.com> PR gas/10531 diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 4765ac7..4025f12 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2730,7 +2730,9 @@ nops_for_insn_or_target (const struct mips_cl_insn *hist, if (tmp_nops > nops) nops = tmp_nops; } - else if (mips_opts.mips16 && (insn->insn_mo->pinfo & MIPS16_INSN_BRANCH)) + else if (mips_opts.mips16 + && (insn->insn_mo->pinfo & (MIPS16_INSN_UNCOND_BRANCH + | MIPS16_INSN_COND_BRANCH))) { tmp_nops = nops_for_sequence (1, hist, insn); if (tmp_nops > nops) |