gas/

	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.

	gas/testsuite/
	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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 15fd7ed418398a890e262384efe2ac663659e5f1..fa8fe62c42e20d1b09732fdc2a61376554d6c124 100644 (file)
--- 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 57111d2e8c602363125b7e2d97af54a5a74ecbb0..0e4c66efe86eb206e33593b9363103e51ac6a084 100644 (file)
--- 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 c5a0c3d5b6bc58ce3883bedeef0e23ea12494246..06315720f78324c049d04db50625b82047e05358 100644 (file)
--- 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 b6fa3f0f3cc1427433e7843c4daa27c660666540..cbaaa70e8d85eb26699cb9d61732cdbfa9f5f84d 100644 (file)
--- 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]