diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 7 | ||||
| -rw-r--r-- | gas/config/tc-mips.c | 5 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/mips.exp | 1 |
4 files changed, 20 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 15fd7ed..fa8fe62 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2011-11-14 Maciej W. Rozycki <macro@codesourcery.com> + + Apply mainline patches + 2011-11-14 Maciej W. Rozycki <macro@codesourcery.com> + * config/tc-mips.c (can_swap_branch_p): Exclude microMIPS + variant frags too. + 2011-11-07 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> Apply mainline patches diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 57111d2..0e4c66e 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -3729,9 +3729,8 @@ can_swap_branch_p (struct mips_cl_insn *ip) /* If the previous instruction is in a variant frag other than this branch's one, we cannot do the swap. This does not apply to - MIPS16/microMIPS code, which uses variant frags for different - purposes. */ - if (!HAVE_CODE_COMPRESSION + MIPS16 code, which uses variant frags for different purposes. */ + if (!mips_opts.mips16 && history[0].frag && history[0].frag->fr_type == rs_machine_dependent) return FALSE; diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index c5a0c3d..0631572 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2011-11-14 Maciej W. Rozycki <macro@codesourcery.com> + + Apply mainline patches + 2011-11-14 Maciej W. Rozycki <macro@codesourcery.com> + * gas/mips/relax-swap3.d: New test. + * gas/mips/mips16@relax-swap3.d: Likewise. + * gas/mips/micromips@relax-swap3.d: Likewise. + * gas/mips/relax-swap3.s: New test source. + * gas/mips/mips.exp: Run the new tests. + 2011-10-25 Alan Modra <amodra@gmail.com> Apply mainline patches diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index b6fa3f0..cbaaa70 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -749,6 +749,7 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test "relax-swap1-mips1" run_dump_test "relax-swap1-mips2" run_dump_test "relax-swap2" + run_dump_test_arches "relax-swap3" [mips_arch_list_all] run_list_test_arches "relax-bposge" "-mdsp -relax-branch" \ [mips_arch_list_matching mips64r2 \ !micromips] |