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.

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>
 

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.  */

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.
+
 2012-01-08  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gas/mips/align3.s, gas/mips/align3.d: New testcase.

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]

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  ................

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