M68K TLS support.

        ld/testsuite/
        * ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
        * ld-m68k/got-multigot-14-ok.d: Update.
        * ld-m68k/m68k-got.exp: Update.
        * ld-m68k/got-negative-12-13-14-34-ok.d: Update.
        * ld-m68k/got-negative-14-ok.d: Update.
        * ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
        * ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
        * ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
        * ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
        New test sources.
        * ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
        New test sources.
        * ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
        * ld-m68k/m68k.exp: Run new tests.
        (merge isa-a isa-a:nodiv): Fix.

        gas/testsuite/
        * gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
        * gas/m68k/all.exp: Run it.

        gas/
        * config/m68k-parse.h (enum pic_relocation): Add values for TLS
        relocations.
        * config/m68k-parse.y (yylex): Parse TLS relocations.
        * config/tc-m68k.c (m68k_elf_cons): New static function.
        (md_pseudo_table): Use it.
        (get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
        relocations.
        (md_apply_fix): Fix to set thread local flag.
        (m68k_elf_suffix): New static function; helper for m68k_elf_cons.

        include/elf/
        * m68k.h: Map TLS relocations to numbers.

        bfd/
        * bfd-in2.h: Regenerate.
        * elf32-m68k.c: Handle 2-slot GOT entries.  Rename variables and
        fields from n_entries to n_slots where appropriate, update comments.
        (HOWTO): Add TLS relocations.
        (reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
        (enum elf_m68k_got_offset_size): New enum.
        (struct elf_m68k_got_entry.type): Move field to ...
        (struct elf_m68k_got_entry_key): ... here.  Update all uses.
        (elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
        functions.
        (elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
        functions.
        (struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
        fields into n_entries array.  Update comments.
        (elf_m68k_init_got): Simplify, update all uses.
        (elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
        (ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
        GOT entries; update name, update all uses.
        (ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
        (elf_m68k_get_got_entry): Update.
        (elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
        simplify.
        (elf_m68k_remove_got_entry_type): Simplify.
        (elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
        (elf_m68k_can_merge_gots): Update.
        (elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
        (struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
        GOT entries, simplify.
        (elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
        (struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
        field, remove obsoleted local_n_entries field.
        (elf_m68k_partition_multi_got_2): New static function.
        (elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
        update.
        (elf_m68k_remove_got_entry_type): Update.
        (elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
        (elf_m68k_check_relocs): Handle TLS relocations.  Remove unnecessary
        update of sgot->size and srelgot->size.
        (elf_m68k_gc_sweep_hook): Update.
        (elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
        (elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
        TLS relocations.
        * reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
        * libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.

7 files changed, 43 insertions, 16 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index cba7ed9..31ab655 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2009-02-03  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
+	* ld-m68k/got-multigot-14-ok.d: Update.
+	* ld-m68k/m68k-got.exp: Update.
+	* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
+	* ld-m68k/got-negative-14-ok.d: Update.
+	* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
+	* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
+	* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
+	* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
+	New test sources.
+	* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
+	New test sources.
+	* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
+	* ld-m68k/m68k.exp: Run new tests.
+	(merge isa-a isa-a:nodiv): Fix.
+
 2009-02-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* ld-elf/eh-group2.s: New `.cfi_lsda' referencing `.gcc_except_table'.
diff --git a/ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d b/ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d
index de55032..176961b 100644
--- a/ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d
+++ b/ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d
@@ -10,9 +10,9 @@ Dynamic section at offset .* contains 9 entries:
  0x0000000a \(STRSZ\)                      [0-9]+ \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000007 \(RELA\)                       0x[0-9a-f]+
- 0x00000008 \(RELASZ\)                     294960 \(bytes\)
+ 0x00000008 \(RELASZ\)                     294936 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 24580 entries:
+Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 24578 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
diff --git a/ld/testsuite/ld-m68k/got-multigot-14-ok.d b/ld/testsuite/ld-m68k/got-multigot-14-ok.d
index dc2e64a..7ebc589 100644
--- a/ld/testsuite/ld-m68k/got-multigot-14-ok.d
+++ b/ld/testsuite/ld-m68k/got-multigot-14-ok.d
@@ -10,9 +10,9 @@ Dynamic section at offset .* contains 9 entries:
  0x0000000a \(STRSZ\)                      [0-9]+ \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000007 \(RELA\)                       0x[0-9a-f]+
- 0x00000008 \(RELASZ\)                     196608 \(bytes\)
+ 0x00000008 \(RELASZ\)                     196584 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 16384 entries:
+Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 16382 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
diff --git a/ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d b/ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d
index 402631c..451df80 100644
--- a/ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d
+++ b/ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d
@@ -10,9 +10,9 @@ Dynamic section at offset .* contains 9 entries:
  0x0000000a \(STRSZ\)                      [0-9]+ \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000007 \(RELA\)                       0x[0-9a-f]+
- 0x00000008 \(RELASZ\)                     196608 \(bytes\)
+ 0x00000008 \(RELASZ\)                     196584 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 16384 entries:
+Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 16382 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
diff --git a/ld/testsuite/ld-m68k/got-negative-14-ok.d b/ld/testsuite/ld-m68k/got-negative-14-ok.d
index 402631c..451df80 100644
--- a/ld/testsuite/ld-m68k/got-negative-14-ok.d
+++ b/ld/testsuite/ld-m68k/got-negative-14-ok.d
@@ -10,9 +10,9 @@ Dynamic section at offset .* contains 9 entries:
  0x0000000a \(STRSZ\)                      [0-9]+ \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000007 \(RELA\)                       0x[0-9a-f]+
- 0x00000008 \(RELASZ\)                     196608 \(bytes\)
+ 0x00000008 \(RELASZ\)                     196584 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 16384 entries:
+Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 16382 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
diff --git a/ld/testsuite/ld-m68k/m68k-got.exp b/ld/testsuite/ld-m68k/m68k-got.exp
index 4902eac..378e593 100644
--- a/ld/testsuite/ld-m68k/m68k-got.exp
+++ b/ld/testsuite/ld-m68k/m68k-got.exp
@@ -26,7 +26,7 @@ if { ![is_elf_format] || ![istarget m68k-*-*] } {
 # 1 - 1
 # 2 - 8189
 # 3 - 8190
-# 4 - 16384
+# 4 - 16382
 # 5 - 16385
 
 proc gen_got_test { testname } {
@@ -52,7 +52,7 @@ proc gen_got_test { testname } {
 	}
 	"got-14" {
 	    set start 1
-	    set count 16384
+	    set count 16382
 	    set xgot 0
 	}
 	"got-15" {
@@ -62,7 +62,7 @@ proc gen_got_test { testname } {
 	}
 	"got-34" {
 	    set start 8190
-	    set count 16384
+	    set count 16382
 	    set xgot 0
 	}
 	"got-35" {
@@ -164,7 +164,7 @@ proc got_test { testname } {
 	}
 	"got-negative-14-ok" {
 	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
-	    set count 16384
+	    set count 16382
 	}
 	"got-negative-15-er" {
 	    puts $ofd "#source: $objdir/tmpdir/got-15.s"
@@ -175,7 +175,7 @@ proc got_test { testname } {
 	    puts $ofd "#source: $objdir/tmpdir/got-13.s"
 	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
 	    puts $ofd "#source: $objdir/tmpdir/got-34.s"
-	    set count 16384
+	    set count 16382
 	}
 	"got-negative-12-13-14-35-er" {
 	    puts $ofd "#source: $objdir/tmpdir/got-12.s"
@@ -186,7 +186,7 @@ proc got_test { testname } {
 	}
 	"got-multigot-14-ok" {
 	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
-	    set count 16384
+	    set count 16382
 	}
 	"got-multigot-15-er" {
 	    puts $ofd "#source: $objdir/tmpdir/got-15.s"
@@ -198,7 +198,7 @@ proc got_test { testname } {
 	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
 	    puts $ofd "#source: $objdir/tmpdir/got-34.s"
 	    puts $ofd "#source: $objdir/tmpdir/got-35.s"
-	    set count 24580
+	    set count 24578
 	}
 	"got-xgot-15-ok" {
 	    puts $ofd "#source: $objdir/tmpdir/xgot-15.s"
diff --git a/ld/testsuite/ld-m68k/m68k.exp b/ld/testsuite/ld-m68k/m68k.exp
index ccdfda0..214c640 100644
--- a/ld/testsuite/ld-m68k/m68k.exp
+++ b/ld/testsuite/ld-m68k/m68k.exp
@@ -35,7 +35,7 @@ if { ![is_elf_format] || ![istarget m68k-*-*] } {
 
 set m68k_mergeok_tests {
     {"merge isa-a isa-a:nodiv" "-T merge.ld" ""
-	{isaa.s isaa-nodiv.s} {{objdump -p isaa.d}} "isaa"}
+	{isaa.s isaa-nodiv.s} {{objdump -p isaa.d}} "isaa-nodiv"}
     {"merge isa-a isa-b" "-T merge.ld" ""
 	{isaa.s isab.s} {{objdump -p isab.d}} "isab"}
     {"merge isa-a isa-aplus" "-T merge.ld" ""
@@ -66,3 +66,12 @@ foreach { id sources } { a { plt1.s } b { plt1-empty.s plt1.s } } {
 		 plt1-${id}-${arch}.so]]
     }
 }
+
+if { [istarget m68k-*-linux*] } then {
+    run_dump_test "tls-gd-1"
+    run_dump_test "tls-gd-2"
+    run_dump_test "tls-gd-ie-1"
+    run_dump_test "tls-ie-1"
+    run_dump_test "tls-ld-1"
+    run_dump_test "tls-ld-2"
+}