gas/

	* config/tc-mips.c (s_tls_rel_directive): Call mips_clear_insn_labels.

gas/testsuite/
	* gas/mips/tls-relw.s, gas/mips/tls-relw.d: New test.
	* gas/mips/mips.exp: Run it.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 41316a96056a5b3966e36863725adc967496f1d1..df24933d6c36d5dcda4fdbd78b281e415bcde2b1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-08  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * config/tc-mips.c (s_tls_rel_directive): Call mips_clear_insn_labels.
+
 2011-12-19  Chung-Lin Tang  <cltang@codesourcery.com>
 
        Backport from mainline:

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 0fb3a6eeb31e63c26c6dfc106bf05c84dc96f466..53244509d28c852f401cc5faf661db4ec26b13b8 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -16591,6 +16591,7 @@ s_tls_rel_directive (const size_t bytes, const char *dirstr,
   md_number_to_chars (p, 0, bytes);
   fix_new_exp (frag_now, p - frag_now->fr_literal, bytes, &ex, FALSE, rtype);
   demand_empty_rest_of_line ();
+  mips_clear_insn_labels ();
 }
 
 /* Handle .dtprelword.  */

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 06315720f78324c049d04db50625b82047e05358..cbb230981d5caa7c843a0d87078b59adaa755d84 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-08  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * gas/mips/tls-relw.s, gas/mips/tls-relw.d: New test.
+       * gas/mips/mips.exp: Run it.
+
 2011-11-14  Maciej W. Rozycki  <macro@codesourcery.com>
 
        Apply mainline patches

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index cbaaa70e8d85eb26699cb9d61732cdbfa9f5f84d..2f49a2a7d81cc6f8b7799f5fa7bc31b985035cda 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -878,6 +878,7 @@ if { [istarget mips*-*-vxworks*] } {
 
        run_list_test "tls-ill" "-32"
        run_dump_test "tls-o32"
+       run_dump_test "tls-relw"
        run_dump_test "jalr2"
 
        run_dump_test_arches "aent"     [mips_arch_list_matching mips1]