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 9f9d5a0..c905439 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.
+
 2012-01-08  Andrew Pinski  <andrew.pinski@caviumnetworks.com>
            Richard Sandiford  <rdsandiford@googlemail.com>
 

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 842d890..f23835a 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -16630,6 +16630,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 e8075e6..c638cdc 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 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.
+
+2012-01-08  Richard Sandiford  <rdsandiford@googlemail.com>
+
        * gas/mips/align3.s, gas/mips/align3.d: New testcase.
        * gas/mips/mips.exp: Run it.
 

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 597c572..92de0fa 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -913,6 +913,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]

diff --git a/gas/testsuite/gas/mips/tls-relw.d b/gas/testsuite/gas/mips/tls-relw.d
new file mode 100644 (file)
index 0000000..bc13b43
--- /dev/null
+++ b/gas/testsuite/gas/mips/tls-relw.d
@@ -0,0 +1,8 @@
+# as: -EB
+# objdump: -sj.data
+
+.*
+
+Contents of section \.data:
+ 0000 00000001 00000000 00000002 00000004  ................
+ 0010 00000000 00000003 00000010 00000000  ................

diff --git a/gas/testsuite/gas/mips/tls-relw.s b/gas/testsuite/gas/mips/tls-relw.s
new file mode 100644 (file)
index 0000000..6890685
--- /dev/null
+++ b/gas/testsuite/gas/mips/tls-relw.s
@@ -0,0 +1,12 @@
+       .data
+start:
+       .word   1
+a:
+       .tprelword t1
+       .word   2
+       .word   a-start
+b:
+       .dtprelword t2
+       .word   3
+       .word   b-start
+       .word   0