forked from Imagelibrary/binutils-gdb
* elf.c (_bfd_elf_make_section_from_shdr): Set SEC_THREAD_LOCAL
for symbols from SHF_TLS section.
(_bfd_elf_print_private_bfd_data): Add PT_TLS.
(elf_fake_sections): Set SHF_TLS for SEC_THREAD_LOCAL sections.
(map_sections_to_segments): Build PT_TLS segment if necessary.
(assign_file_positions_for_segments): Likewise.
(get_program_header_size): Account for PT_TLS segment.
(swap_out_syms): Set type of BSF_THREAD_LOCAL symbols and symbols from
SEC_THREAD_LOCAL sections to STT_TLS.
* reloc.c: Add 386 and IA-64 TLS relocs.
* section.c (SEC_THREAD_LOCAL): Define.
(SEC_CONSTRUCTOR_TEXT, SEC_CONSTRUCTOR_DATA, SEC_CONSTRUCTOR_BSS):
Remove.
* elflink.h (elf_link_add_object_symbols): Support .tcommon.
(size_dynamic_sections): If DF_STATIC_TLS, set DF_FLAGS
unconditionally.
(struct elf_final_link_info): Add first_tls_sec.
(elf_bfd_final_link): Set first_tls_sec.
Compute elf_hash_table (info)->tls_segment.
(elf_link_output_extsym): Handle STT_TLS symbols.
(elf_link_input_bfd): Likewise.
* syms.c (BSF_THREAD_LOCAL): Define.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* elf32-i386.c (elf_i386_tls_transition, dtpoff_base, tpoff,
elf_i386_mkobject, elf_i386_object_p): New functions.
(elf_howto_table): Add TLS relocs.
(elf_i386_reloc_type_lookup): Support TLS relocs.
(elf_i386_info_to_howto_rel): Likewise.
(struct elf_i386_link_hash_entry): Add tls_type.
(struct elf_i386_obj_tdata): New.
(elf_i386_hash_entry, elf_i386_tdata, elf_i386_local_got_tls_type):
New macros.
(struct elf_i386_link_hash_table): Add tls_ldm_got.
(link_hash_newfunc): Clear tls_type.
(elf_i386_check_relocs): Support TLS relocs.
(elf_i386_gc_sweep_hook): Likewise.
(allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(bfd_elf32_mkobject, elf_backend_object_p): Define.
* elfxx-ia64.c (struct elfNN_ia64_dyn_sym_info): Add tprel_offset,
dtpmod_offset, dtprel_offset, tprel_done, dtpmod_done, dtprel_done,
want_tprel, want_dtpmod, want_dtprel.
(elfNN_ia64_tprel_base, elfNN_ia64_dtprel_base): New functions.
(ia64_howto_table): Add TLS relocs, rename R_IA64_LTOFF_TP22 to
R_IA64_LTOFF_TPREL22.
(elf_code_to_howto_index): Add TLS relocs.
(elfNN_ia64_check_relocs): Support TLS relocs.
(allocate_global_data_got): Account for TLS .got data.
(allocate_dynrel_entries): Account for TLS dynamic relocations.
(elfNN_ia64_install_value): Supprt TLS relocs.
(set_got_entry): Support TLS relocs.
(elfNN_ia64_relocate_section): Likewise.
* config/obj-elf.c (elf_common): Renamed from obj_elf_common.
(obj_elf_common): Call elf_common.
(obj_elf_tls_common): New function.
(elf_pseudo_tab): Support .tls_common.
(special_sections): Add .tdata and .tbss.
(obj_elf_change_section): Set SEC_THREAD_LOCAL for SHF_TLS
sections.
(obj_elf_parse_section_letters): Support T in section flags (SHF_TLS).
(obj_elf_parse_section_letters): Include T in error message.
* config/tc-ppc.c (ppc_section_letter): Likewise.
* config/tc-alpha.c (alpha_elf_section_letter): Likewise.
(tc_gen_reloc): Handle SEC_THREAD_LOCAL the same way as
SEC_MERGE.
* config/tc-sparc.c (md_apply_fix3): Likewise.
* config/tc-i386.c (tc_i386_fix_adjustable): Add TLS relocs.
Define them if not BFD_ASSEMBLER.
(lex_got): Support @TLSGD, @TLSLDM, @GOTTPOFF, @TPOFF, @DTPOFF
and @NTPOFF.
(md_apply_fix3): Add TLS relocs.
* config/tc-ia64.c (enum reloc_func): Add FUNC_DTP_MODULE,
FUNC_DTP_RELATIVE, FUNC_TP_RELATIVE, FUNC_LT_DTP_MODULE,
FUNC_LT_DTP_RELATIVE, FUNC_LT_TP_RELATIVE.
(pseudo_func): Support @dtpmod(), @dtprel() and @tprel().
(ia64_elf_section_letter): Include T in error message.
(md_begin): Support TLS operators.
(md_operand): Likewise.
(ia64_gen_real_reloc_type): Support TLS relocs.
* testsuite/gas/i386/tlspic.s: New file.
* testsuite/gas/i386/tlsd.s: New file.
* testsuite/gas/i386/tlsnopic.s: New file.
* testsuite/gas/i386/tlsd.d: New file.
* testsuite/gas/i386/tlsnopic.d: New file.
* testsuite/gas/i386/tlspic.d: New file.
* testsuite/gas/i386/i386.exp: Add tlsd, tlsnopic and tlspic tests.
* testsuite/gas/ia64/tls.s: New file.
* testsuite/gas/ia64/tls.d: New file.
* testsuite/gas/ia64/ia64.exp: Add tls test.
* write.c (adjust_reloc_syms): Don't change symbols in
SEC_THREAD_LOCAL sections to STT_SECTION + addend.
* elf/common.h (PT_TLS, SHF_TLS, STT_TLS, DF_STATIC_TLS): Define.
* elf/ia64.h (R_IA64_LTOFF_TPREL22): Renamed from R_IA64_LTOFF_TP22.
* elf/i386.h: Add TLS relocs.
* scripttempl/elf.sc: Add .rel{,a}.t{bss,data}, .tdata and .tbss.
* ldlang.c (lang_add_section): Set SEC_THREAD_LOCAL for
output section if necessary. Handle .tbss.
(lang_size_sections): Clear _raw_size for .tbss section
(it allocates space in PT_TLS segment only).
* ldwrite.c (build_link_order): Build link order for .tbss too.
* readelf.c (get_segment_type): Add PT_TLS.
(get_elf_section_flags): Add SHF_TLS.
(get_dynamic_flags): Optimize. Add DF_STATIC_TLS.
(process_dynamic_segment): Use puts instead of printf.
(get_symbol_type): Support STT_TLS.
* objdump.c (dump_section_header): Remove SEC_CONSTRUCTOR_TEXT,
SEC_CONSTRUCTOR_DATA, SEC_CONSTRUCTOR_BSS.
Add SEC_THREAD_LOCAL.
This commit is contained in:
Jakub Jelinek
71
bfd/elf.c
71
bfd/elf.c
@@ -591,6 +591,8 @@ _bfd_elf_make_section_from_shdr (abfd, hdr, name)
|
||||
if (hdr->sh_flags & SHF_GROUP)
|
||||
if (!setup_group (abfd, hdr, newsect))
|
||||
return false;
|
||||
if ((hdr->sh_flags & SHF_TLS) != 0)
|
||||
flags |= SEC_THREAD_LOCAL;
|
||||
|
||||
/* The debugging sections appear to be recognized only by name, not
|
||||
any sort of flag. */
|
||||
@@ -883,6 +885,7 @@ _bfd_elf_print_private_bfd_data (abfd, farg)
|
||||
case PT_NOTE: pt = "NOTE"; break;
|
||||
case PT_SHLIB: pt = "SHLIB"; break;
|
||||
case PT_PHDR: pt = "PHDR"; break;
|
||||
case PT_TLS: pt = "TLS"; break;
|
||||
case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
|
||||
default: sprintf (buf, "0x%lx", p->p_type); pt = buf; break;
|
||||
}
|
||||
@@ -2274,6 +2277,8 @@ elf_fake_sections (abfd, asect, failedptrarg)
|
||||
}
|
||||
if (elf_group_name (asect) != NULL)
|
||||
this_hdr->sh_flags |= SHF_GROUP;
|
||||
if ((asect->flags & SEC_THREAD_LOCAL) != 0)
|
||||
this_hdr->sh_flags |= SHF_TLS;
|
||||
|
||||
/* Check for processor-specific section types. */
|
||||
if (bed->elf_backend_fake_sections
|
||||
@@ -2956,6 +2961,8 @@ map_sections_to_segments (abfd)
|
||||
asection **hdrpp;
|
||||
boolean phdr_in_segment = true;
|
||||
boolean writable;
|
||||
int tls_count = 0;
|
||||
asection *first_tls = NULL;
|
||||
asection *dynsec, *eh_frame_hdr;
|
||||
bfd_size_type amt;
|
||||
|
||||
@@ -3194,6 +3201,39 @@ map_sections_to_segments (abfd)
|
||||
*pm = m;
|
||||
pm = &m->next;
|
||||
}
|
||||
if (s->flags & SEC_THREAD_LOCAL)
|
||||
{
|
||||
if (! tls_count)
|
||||
first_tls = s;
|
||||
tls_count++;
|
||||
}
|
||||
}
|
||||
|
||||
/* If there are any SHF_TLS output sections, add PT_TLS segment. */
|
||||
if (tls_count > 0)
|
||||
{
|
||||
int i;
|
||||
|
||||
amt = sizeof (struct elf_segment_map);
|
||||
amt += (tls_count - 1) * sizeof (asection *);
|
||||
m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
|
||||
if (m == NULL)
|
||||
goto error_return;
|
||||
m->next = NULL;
|
||||
m->p_type = PT_TLS;
|
||||
m->count = tls_count;
|
||||
/* Mandated PF_R. */
|
||||
m->p_flags = PF_R;
|
||||
m->p_flags_valid = 1;
|
||||
for (i = 0; i < tls_count; ++i)
|
||||
{
|
||||
BFD_ASSERT (first_tls->flags & SEC_THREAD_LOCAL);
|
||||
m->sections[i] = first_tls;
|
||||
first_tls = first_tls->next;
|
||||
}
|
||||
|
||||
*pm = m;
|
||||
pm = &m->next;
|
||||
}
|
||||
|
||||
/* If there is a .eh_frame_hdr section, throw in a PT_GNU_EH_FRAME
|
||||
@@ -3618,6 +3658,20 @@ Error: First section in segment (%s) starts at 0x%x whereas the segment starts a
|
||||
if ((flags & SEC_LOAD) != 0)
|
||||
p->p_filesz += sec->_raw_size;
|
||||
|
||||
if (p->p_type == PT_TLS
|
||||
&& sec->_raw_size == 0
|
||||
&& (sec->flags & SEC_HAS_CONTENTS) == 0)
|
||||
{
|
||||
struct bfd_link_order *o;
|
||||
bfd_vma tbss_size = 0;
|
||||
|
||||
for (o = sec->link_order_head; o != NULL; o = o->next)
|
||||
if (tbss_size < o->offset + o->size)
|
||||
tbss_size = o->offset + o->size;
|
||||
|
||||
p->p_memsz += tbss_size;
|
||||
}
|
||||
|
||||
if (align > p->p_align
|
||||
&& (p->p_type != PT_LOAD || (abfd->flags & D_PAGED) == 0))
|
||||
p->p_align = align;
|
||||
@@ -3752,6 +3806,16 @@ get_program_header_size (abfd)
|
||||
}
|
||||
}
|
||||
|
||||
for (s = abfd->sections; s != NULL; s = s->next)
|
||||
{
|
||||
if (s->flags & SEC_THREAD_LOCAL)
|
||||
{
|
||||
/* We need a PT_TLS segment. */
|
||||
++segs;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Let the backend count up any program headers it might need. */
|
||||
if (bed->elf_backend_additional_program_headers)
|
||||
{
|
||||
@@ -5045,13 +5109,18 @@ swap_out_syms (abfd, sttp, relocatable_p)
|
||||
sym.st_shndx = shndx;
|
||||
}
|
||||
|
||||
if ((flags & BSF_FUNCTION) != 0)
|
||||
if ((flags & BSF_THREAD_LOCAL) != 0)
|
||||
type = STT_TLS;
|
||||
else if ((flags & BSF_FUNCTION) != 0)
|
||||
type = STT_FUNC;
|
||||
else if ((flags & BSF_OBJECT) != 0)
|
||||
type = STT_OBJECT;
|
||||
else
|
||||
type = STT_NOTYPE;
|
||||
|
||||
if (syms[idx]->section->flags & SEC_THREAD_LOCAL)
|
||||
type = STT_TLS;
|
||||
|
||||
/* Processor-specific types */
|
||||
if (type_ptr != NULL
|
||||
&& bed->elf_backend_get_symbol_type)
|
||||
|
||||
Reference in New Issue
Block a user