From: Richard Sandiford Date: Sun, 8 Jan 2012 12:34:31 +0000 (+0000) Subject: gas/ X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0bf142111325bf7b230282de786111b8a8f86c3;p=thirdparty%2Fbinutils-gdb.git 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 41316a96056..df24933d6c3 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2012-01-08 Richard Sandiford + + * config/tc-mips.c (s_tls_rel_directive): Call mips_clear_insn_labels. + 2011-12-19 Chung-Lin Tang Backport from mainline: diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 0fb3a6eeb31..53244509d28 100644 --- 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 06315720f78..cbb230981d5 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-08 Richard Sandiford + + * gas/mips/tls-relw.s, gas/mips/tls-relw.d: New test. + * gas/mips/mips.exp: Run it. + 2011-11-14 Maciej W. Rozycki Apply mainline patches diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index cbaaa70e8d8..2f49a2a7d81 100644 --- 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]