espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-09-12 01:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

From Craig Silverstein: x86_64 TLS support.

Browse Source
This commit is contained in:
Ian Lance Taylor
2007-10-04 22:28:36 +00:00
parent 0eadd5b433
commit d61c17ea24
2 changed files with 179 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gold/i386.cc
View File

@ -741,6 +741,8 @@ Target_i386::Scan::local(const General_options&,
case elfcpp::R_386_GLOB_DAT: case elfcpp::R_386_GLOB_DAT:
case elfcpp::R_386_JUMP_SLOT: case elfcpp::R_386_JUMP_SLOT:
case elfcpp::R_386_RELATIVE: case elfcpp::R_386_RELATIVE:
// These are outstanding tls relocs, which are unexpected when
// linking.
case elfcpp::R_386_TLS_TPOFF: case elfcpp::R_386_TLS_TPOFF:
case elfcpp::R_386_TLS_DTPMOD32: case elfcpp::R_386_TLS_DTPMOD32:
case elfcpp::R_386_TLS_DTPOFF32: case elfcpp::R_386_TLS_DTPOFF32:
@ -751,6 +753,8 @@ Target_i386::Scan::local(const General_options&,
gold_exit(false); gold_exit(false);
break; break;
// These are initial tls relocs, which are expected when
// linking.
case elfcpp::R_386_TLS_IE: case elfcpp::R_386_TLS_IE:
case elfcpp::R_386_TLS_GOTIE: case elfcpp::R_386_TLS_GOTIE:
case elfcpp::R_386_TLS_LE: case elfcpp::R_386_TLS_LE:
@ -902,6 +906,8 @@ Target_i386::Scan::global(const General_options& options,
case elfcpp::R_386_GLOB_DAT: case elfcpp::R_386_GLOB_DAT:
case elfcpp::R_386_JUMP_SLOT: case elfcpp::R_386_JUMP_SLOT:
case elfcpp::R_386_RELATIVE: case elfcpp::R_386_RELATIVE:
// These are outstanding tls relocs, which are unexpected when
// linking.
case elfcpp::R_386_TLS_TPOFF: case elfcpp::R_386_TLS_TPOFF:
case elfcpp::R_386_TLS_DTPMOD32: case elfcpp::R_386_TLS_DTPMOD32:
case elfcpp::R_386_TLS_DTPOFF32: case elfcpp::R_386_TLS_DTPOFF32:
@ -912,6 +918,8 @@ Target_i386::Scan::global(const General_options& options,
gold_exit(false); gold_exit(false);
break; break;
// These are initial tls relocs, which are expected when
// linking.
case elfcpp::R_386_TLS_IE: case elfcpp::R_386_TLS_IE:
case elfcpp::R_386_TLS_GOTIE: case elfcpp::R_386_TLS_GOTIE:
case elfcpp::R_386_TLS_LE: case elfcpp::R_386_TLS_LE:
@ -1164,6 +1172,8 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo,
case elfcpp::R_386_GLOB_DAT: case elfcpp::R_386_GLOB_DAT:
case elfcpp::R_386_JUMP_SLOT: case elfcpp::R_386_JUMP_SLOT:
case elfcpp::R_386_RELATIVE: case elfcpp::R_386_RELATIVE:
// These are outstanding tls relocs, which are unexpected when
// linking.
case elfcpp::R_386_TLS_TPOFF: case elfcpp::R_386_TLS_TPOFF:
case elfcpp::R_386_TLS_DTPMOD32: case elfcpp::R_386_TLS_DTPMOD32:
case elfcpp::R_386_TLS_DTPOFF32: case elfcpp::R_386_TLS_DTPOFF32:
@ -1176,6 +1186,8 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo,
gold_exit(false); gold_exit(false);
break; break;
// These are initial tls relocs, which are expected when
// linking.
case elfcpp::R_386_TLS_IE: case elfcpp::R_386_TLS_IE:
case elfcpp::R_386_TLS_GOTIE: case elfcpp::R_386_TLS_GOTIE:
case elfcpp::R_386_TLS_LE: case elfcpp::R_386_TLS_LE:
@ -1440,7 +1452,8 @@ Target_i386::Relocate::tls_gd_to_le(const Relocate_info<32, false>* relinfo,
{ {
Target_i386::Relocate::check_tls(relinfo, relnum, rel, Target_i386::Relocate::check_tls(relinfo, relnum, rel,
(op1 & 0xf8) == 0x80 && (op1 & 7) != 4); (op1 & 0xf8) == 0x80 && (op1 & 7) != 4);
if (rel.get_r_offset() + 9 < view_size && view[9] == 0x90) if (static_cast<off_t>(rel.get_r_offset() + 9) < view_size
&& view[9] == 0x90)
{ {
// There is a trailing nop. Use the size byte subl. // There is a trailing nop. Use the size byte subl.
memcpy(view - 2, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12); memcpy(view - 2, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);

448
gold/x86_64.cc
View File

@ -53,7 +53,11 @@ using namespace gold;
class Output_data_plt_x86_64; class Output_data_plt_x86_64;
// The x86_64 target class. // The x86_64 target class.
// See the ABI at http://www.x86-64.org/documentation/abi.pdf // See the ABI at
// http://www.x86-64.org/documentation/abi.pdf
// TLS info comes from
// http://people.redhat.com/drepper/tls.pdf
// http://ia32-abi.googlegroups.com/web/RFC-TLSDESC-x86.txt?gda=kWQJPEQAAACEfYQFX0dubPQ2NuO4whhjkR4HAp8tBMb_I0iuUeQslmG1qiJ7UbTIup-M2XPURDRiZJyPR4BqKR2agJ-5jfT5Ley2_-oiOJ4zLNAGCw24Bg
class Target_x86_64 : public Sized_target<64, false> class Target_x86_64 : public Sized_target<64, false>
{ {
@ -558,11 +562,11 @@ Target_x86_64::make_plt_entry(Symbol_table* symtab, Layout* layout,
void void
Target_x86_64::copy_reloc(const General_options* options, Target_x86_64::copy_reloc(const General_options* options,
Symbol_table* symtab, Symbol_table* symtab,
Layout* layout, Layout* layout,
Sized_relobj<64, false>* object, Sized_relobj<64, false>* object,
unsigned int data_shndx, Symbol* gsym, unsigned int data_shndx, Symbol* gsym,
const elfcpp::Rela<64, false>& rel) const elfcpp::Rela<64, false>& rel)
{ {
Sized_symbol<64>* ssym; Sized_symbol<64>* ssym;
ssym = symtab->get_sized_symbol SELECT_SIZE_NAME(64) (gsym ssym = symtab->get_sized_symbol SELECT_SIZE_NAME(64) (gsym
@ -621,7 +625,6 @@ Target_x86_64::copy_reloc(const General_options* options,
// Add the COPY reloc. // Add the COPY reloc.
ssym->set_needs_dynsym_entry(); ssym->set_needs_dynsym_entry();
Reloc_section* rel_dyn = this->rel_dyn_section(layout); Reloc_section* rel_dyn = this->rel_dyn_section(layout);
// TODO(csilvers): should last arg here be rel.get_r_addend?
rel_dyn->add_global(ssym, elfcpp::R_X86_64_COPY, dynbss, offset, 0); rel_dyn->add_global(ssym, elfcpp::R_X86_64_COPY, dynbss, offset, 0);
} }
} }
@ -634,8 +637,6 @@ Target_x86_64::copy_reloc(const General_options* options,
unsigned int unsigned int
Target_x86_64::optimize_tls_reloc(bool is_final, int r_type) Target_x86_64::optimize_tls_reloc(bool is_final, int r_type)
{ {
return is_final ? r_type : 0;
#if 0
// If we are generating a shared library, then we can't do anything // If we are generating a shared library, then we can't do anything
// in the linker. // in the linker.
if (parameters->output_is_shared()) if (parameters->output_is_shared())
@ -644,37 +645,32 @@ Target_x86_64::optimize_tls_reloc(bool is_final, int r_type)
switch (r_type) switch (r_type)
{ {
case elfcpp::R_X86_64_TLSGD: case elfcpp::R_X86_64_TLSGD:
case elfcpp::R_X86_64_GOTPC32_TLSDESC: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSDESC_CALL: // TODO(csilvers): correct?
// These are Global-Dynamic which permits fully general TLS // These are Global-Dynamic which permits fully general TLS
// access. Since we know that we are generating an executable, // access. Since we know that we are generating an executable,
// we can convert this to Initial-Exec. If we also know that // we can convert this to Initial-Exec. If we also know that
// this is a local symbol, we can further switch to Local-Exec. // this is a local symbol, we can further switch to Local-Exec.
if (is_final) if (is_final)
return elfcpp::R_X86_64_TLS_LE_64; return elfcpp::R_X86_64_TPOFF32;
return elfcpp::R_X86_64_TLS_IE_64; return elfcpp::R_X86_64_GOTTPOFF; // used for Initial-exec
case elfcpp::R_X86_64_TLS_LDM: case elfcpp::R_X86_64_TLSLD:
// This is Local-Dynamic, which refers to a local symbol in the // This is Local-Dynamic, which refers to a local symbol in the
// dynamic TLS block. Since we know that we generating an // dynamic TLS block. Since we know that we generating an
// executable, we can switch to Local-Exec. // executable, we can switch to Local-Exec.
return elfcpp::R_X86_64_TLS_LE_64; return elfcpp::R_X86_64_TPOFF32;
case elfcpp::R_X86_64_TLS_LDO_64: case elfcpp::R_X86_64_GOTTPOFF:
// Another type of Local-Dynamic relocation.
return elfcpp::R_X86_64_TLS_LE;
case elfcpp::R_X86_64_TLS_IE:
case elfcpp::R_X86_64_TLS_GOTIE:
case elfcpp::R_X86_64_TLS_IE_64:
// These are Initial-Exec relocs which get the thread offset // These are Initial-Exec relocs which get the thread offset
// from the GOT. If we know that we are linking against the // from the GOT. If we know that we are linking against the
// local symbol, we can switch to Local-Exec, which links the // local symbol, we can switch to Local-Exec, which links the
// thread offset into the instruction. // thread offset into the instruction.
if (is_final) if (is_final)
return elfcpp::R_X86_64_TLS_LE_64; return elfcpp::R_X86_64_TPOFF32;
return r_type; return r_type;
case elfcpp::R_X86_64_TLS_LE: case elfcpp::R_X86_64_TPOFF32:
case elfcpp::R_X86_64_TLS_LE_64:
// When we already have Local-Exec, there is nothing further we // When we already have Local-Exec, there is nothing further we
// can do. // can do.
return r_type; return r_type;
@ -682,21 +678,20 @@ Target_x86_64::optimize_tls_reloc(bool is_final, int r_type)
default: default:
gold_unreachable(); gold_unreachable();
} }
#endif
} }
// Scan a relocation for a local symbol. // Scan a relocation for a local symbol.
inline void inline void
Target_x86_64::Scan::local(const General_options&, Target_x86_64::Scan::local(const General_options&,
Symbol_table* symtab, Symbol_table* symtab,
Layout* layout, Layout* layout,
Target_x86_64* target, Target_x86_64* target,
Sized_relobj<64, false>* object, Sized_relobj<64, false>* object,
unsigned int, unsigned int,
const elfcpp::Rela<64, false>&, const elfcpp::Rela<64, false>&,
unsigned int r_type, unsigned int r_type,
const elfcpp::Sym<64, false>&) const elfcpp::Sym<64, false>&)
{ {
switch (r_type) switch (r_type)
{ {
@ -733,51 +728,40 @@ Target_x86_64::Scan::local(const General_options&,
case elfcpp::R_X86_64_GLOB_DAT: case elfcpp::R_X86_64_GLOB_DAT:
case elfcpp::R_X86_64_JUMP_SLOT: case elfcpp::R_X86_64_JUMP_SLOT:
case elfcpp::R_X86_64_RELATIVE: case elfcpp::R_X86_64_RELATIVE:
// These are outstanding tls relocs, which are unexpected when linking
case elfcpp::R_X86_64_TPOFF64: case elfcpp::R_X86_64_TPOFF64:
case elfcpp::R_X86_64_TPOFF32:
case elfcpp::R_X86_64_DTPMOD64: case elfcpp::R_X86_64_DTPMOD64:
case elfcpp::R_X86_64_DTPOFF64: case elfcpp::R_X86_64_DTPOFF64:
case elfcpp::R_X86_64_DTPOFF32: case elfcpp::R_X86_64_DTPOFF32:
case elfcpp::R_X86_64_GOTTPOFF: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSDESC: case elfcpp::R_X86_64_TLSDESC:
case elfcpp::R_X86_64_GOTPC32_TLSDESC: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSDESC_CALL: // TODO(csilvers): correct?
fprintf(stderr, _("%s: %s: unexpected reloc %u in object file\n"), fprintf(stderr, _("%s: %s: unexpected reloc %u in object file\n"),
program_name, object->name().c_str(), r_type); program_name, object->name().c_str(), r_type);
gold_exit(false); gold_exit(false);
break; break;
#if 0 // These are initial tls relocs, which are expected when linking
case elfcpp::R_X86_64_TLSGD: // TODO(csilvers): correct? case elfcpp::R_X86_64_TLSGD: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSLD: // TODO(csilvers): correct? case elfcpp::R_X86_64_TLSLD: // TODO(csilvers): correct?
case elfcpp::R_X86_64_GOTTPOFF: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_IE: case elfcpp::R_X86_64_TPOFF32: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_GOTIE: case elfcpp::R_X86_64_GOTPC32_TLSDESC: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_LE: case elfcpp::R_X86_64_TLSDESC_CALL: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_GD:
case elfcpp::R_386_TLS_LDM:
case elfcpp::R_386_TLS_LDO_64:
case elfcpp::R_386_TLS_IE_64:
case elfcpp::R_386_TLS_LE_64:
{ {
bool output_is_shared = parameters->output_is_shared(); bool output_is_shared = parameters->output_is_shared();
r_type = Target_x86_64::optimize_tls_reloc(!output_is_shared, r_type = Target_x86_64::optimize_tls_reloc(!output_is_shared, r_type);
r_type);
switch (r_type) switch (r_type)
{ {
case elfcpp::R_X86_64_TLS_LE: case elfcpp::R_X86_64_TPOFF32: // Local-exec
case elfcpp::R_X86_64_TLS_LE_64:
// FIXME: If generating a shared object, we need to copy // FIXME: If generating a shared object, we need to copy
// this relocation into the object. // this relocation into the object.
gold_assert(!output_is_shared); gold_assert(!output_is_shared);
break; break;
case elfcpp::R_X86_64_TLS_IE: case elfcpp::R_X86_64_GOTTPOFF: // Initial-exec
case elfcpp::R_X86_64_TLS_GOTIE: case elfcpp::R_X86_64_TLSGD: // General Dynamic
case elfcpp::R_X86_64_TLS_GD: case elfcpp::R_X86_64_TLSLD: // Local Dynamic
case elfcpp::R_X86_64_TLS_LDM: case elfcpp::R_X86_64_GOTPC32_TLSDESC:
case elfcpp::R_X86_64_TLS_LDO_64: case elfcpp::R_X86_64_TLSDESC_CALL:
case elfcpp::R_X86_64_TLS_IE_64:
fprintf(stderr, fprintf(stderr,
_("%s: %s: unsupported reloc %u against local symbol\n"), _("%s: %s: unsupported reloc %u against local symbol\n"),
program_name, object->name().c_str(), r_type); program_name, object->name().c_str(), r_type);
@ -785,7 +769,6 @@ Target_x86_64::Scan::local(const General_options&,
} }
} }
break; break;
#endif
case elfcpp::R_X86_64_GOT64: // TODO(csilvers): correct? case elfcpp::R_X86_64_GOT64: // TODO(csilvers): correct?
case elfcpp::R_X86_64_GOT32: case elfcpp::R_X86_64_GOT32:
@ -795,16 +778,6 @@ Target_x86_64::Scan::local(const General_options&,
case elfcpp::R_X86_64_PLT32: case elfcpp::R_X86_64_PLT32:
case elfcpp::R_X86_64_SIZE32: // TODO(csilvers): correct? case elfcpp::R_X86_64_SIZE32: // TODO(csilvers): correct?
case elfcpp::R_X86_64_SIZE64: // TODO(csilvers): correct? case elfcpp::R_X86_64_SIZE64: // TODO(csilvers): correct?
#if 0
case elfcpp::R_386_TLS_GD_64:
case elfcpp::R_386_TLS_GD_PUSH:
case elfcpp::R_386_TLS_GD_CALL:
case elfcpp::R_386_TLS_GD_POP:
case elfcpp::R_386_TLS_LDM_64:
case elfcpp::R_386_TLS_LDM_PUSH:
case elfcpp::R_386_TLS_LDM_CALL:
case elfcpp::R_386_TLS_LDM_POP:
#endif
default: default:
fprintf(stderr, _("%s: %s: unsupported reloc %u against local symbol\n"), fprintf(stderr, _("%s: %s: unsupported reloc %u against local symbol\n"),
program_name, object->name().c_str(), r_type); program_name, object->name().c_str(), r_type);
@ -817,14 +790,14 @@ Target_x86_64::Scan::local(const General_options&,
inline void inline void
Target_x86_64::Scan::global(const General_options& options, Target_x86_64::Scan::global(const General_options& options,
Symbol_table* symtab, Symbol_table* symtab,
Layout* layout, Layout* layout,
Target_x86_64* target, Target_x86_64* target,
Sized_relobj<64, false>* object, Sized_relobj<64, false>* object,
unsigned int data_shndx, unsigned int data_shndx,
const elfcpp::Rela<64, false>& reloc, const elfcpp::Rela<64, false>& reloc,
unsigned int r_type, unsigned int r_type,
Symbol* gsym) Symbol* gsym)
{ {
switch (r_type) switch (r_type)
{ {
@ -916,50 +889,40 @@ Target_x86_64::Scan::global(const General_options& options,
case elfcpp::R_X86_64_GLOB_DAT: case elfcpp::R_X86_64_GLOB_DAT:
case elfcpp::R_X86_64_JUMP_SLOT: case elfcpp::R_X86_64_JUMP_SLOT:
case elfcpp::R_X86_64_RELATIVE: case elfcpp::R_X86_64_RELATIVE:
// These are outstanding tls relocs, which are unexpected when linking
case elfcpp::R_X86_64_TPOFF64: case elfcpp::R_X86_64_TPOFF64:
case elfcpp::R_X86_64_TPOFF32:
case elfcpp::R_X86_64_DTPMOD64: case elfcpp::R_X86_64_DTPMOD64:
case elfcpp::R_X86_64_DTPOFF64: case elfcpp::R_X86_64_DTPOFF64:
case elfcpp::R_X86_64_DTPOFF32: case elfcpp::R_X86_64_DTPOFF32:
case elfcpp::R_X86_64_GOTTPOFF: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSDESC: case elfcpp::R_X86_64_TLSDESC:
case elfcpp::R_X86_64_GOTPC32_TLSDESC: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSDESC_CALL: // TODO(csilvers): correct?
fprintf(stderr, _("%s: %s: unexpected reloc %u in object file\n"), fprintf(stderr, _("%s: %s: unexpected reloc %u in object file\n"),
program_name, object->name().c_str(), r_type); program_name, object->name().c_str(), r_type);
gold_exit(false); gold_exit(false);
break; break;
#if 0 // These are initial tls relocs, which are expected for global()
case elfcpp::R_X86_64_TLSGD: // TODO(csilvers): correct? case elfcpp::R_X86_64_TLSGD: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSLD: // TODO(csilvers): correct? case elfcpp::R_X86_64_TLSLD: // TODO(csilvers): correct?
case elfcpp::R_X86_64_GOTTPOFF: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_IE: case elfcpp::R_X86_64_TPOFF32: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_GOTIE: case elfcpp::R_X86_64_GOTPC32_TLSDESC: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_LE: case elfcpp::R_X86_64_TLSDESC_CALL: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_GD:
case elfcpp::R_386_TLS_LDM:
case elfcpp::R_386_TLS_LDO_64:
case elfcpp::R_386_TLS_IE_64:
case elfcpp::R_386_TLS_LE_64:
{ {
const bool is_final = gsym->final_value_is_known(); const bool is_final = gsym->final_value_is_known();
r_type = Target_x86_64::optimize_tls_reloc(is_final, r_type); r_type = Target_x86_64::optimize_tls_reloc(is_final, r_type);
switch (r_type) switch (r_type)
{ {
case elfcpp::R_386_TLS_LE: case elfcpp::R_X86_64_TPOFF32: // Local-exec
case elfcpp::R_386_TLS_LE_64:
// FIXME: If generating a shared object, we need to copy // FIXME: If generating a shared object, we need to copy
// this relocation into the object. // this relocation into the object.
gold_assert(!parameters->output_is_shared()); gold_assert(!parameters->output_is_shared());
break; break;
case elfcpp::R_386_TLS_IE: case elfcpp::R_X86_64_GOTTPOFF: // Initial-exec
case elfcpp::R_386_TLS_GOTIE: case elfcpp::R_X86_64_TLSGD: // General Dynamic
case elfcpp::R_386_TLS_GD: case elfcpp::R_X86_64_TLSLD: // Local Dynamic
case elfcpp::R_386_TLS_LDM: case elfcpp::R_X86_64_GOTPC32_TLSDESC:
case elfcpp::R_386_TLS_LDO_64: case elfcpp::R_X86_64_TLSDESC_CALL:
case elfcpp::R_386_TLS_IE_64:
fprintf(stderr, fprintf(stderr,
_("%s: %s: unsupported reloc %u " _("%s: %s: unsupported reloc %u "
"against global symbol %s\n"), "against global symbol %s\n"),
@ -969,20 +932,9 @@ Target_x86_64::Scan::global(const General_options& options,
} }
} }
break; break;
#endif
case elfcpp::R_X86_64_SIZE32: // TODO(csilvers): correct? case elfcpp::R_X86_64_SIZE32: // TODO(csilvers): correct?
case elfcpp::R_X86_64_SIZE64: // TODO(csilvers): correct? case elfcpp::R_X86_64_SIZE64: // TODO(csilvers): correct?
#if 0
case elfcpp::R_386_TLS_GD_64:
case elfcpp::R_386_TLS_GD_PUSH:
case elfcpp::R_386_TLS_GD_CALL:
case elfcpp::R_386_TLS_GD_POP:
case elfcpp::R_386_TLS_LDM_64:
case elfcpp::R_386_TLS_LDM_PUSH:
case elfcpp::R_386_TLS_LDM_CALL:
case elfcpp::R_386_TLS_LDM_POP:
#endif
default: default:
fprintf(stderr, fprintf(stderr,
_("%s: %s: unsupported reloc %u against global symbol %s\n"), _("%s: %s: unsupported reloc %u against global symbol %s\n"),
@ -995,16 +947,16 @@ Target_x86_64::Scan::global(const General_options& options,
void void
Target_x86_64::scan_relocs(const General_options& options, Target_x86_64::scan_relocs(const General_options& options,
Symbol_table* symtab, Symbol_table* symtab,
Layout* layout, Layout* layout,
Sized_relobj<64, false>* object, Sized_relobj<64, false>* object,
unsigned int data_shndx, unsigned int data_shndx,
unsigned int sh_type, unsigned int sh_type,
const unsigned char* prelocs, const unsigned char* prelocs,
size_t reloc_count, size_t reloc_count,
size_t local_symbol_count, size_t local_symbol_count,
const unsigned char* plocal_symbols, const unsigned char* plocal_symbols,
Symbol** global_symbols) Symbol** global_symbols)
{ {
if (sh_type == elfcpp::SHT_REL) if (sh_type == elfcpp::SHT_REL)
{ {
@ -1254,15 +1206,12 @@ Target_x86_64::Relocate::relocate(const Relocate_info<64, false>* relinfo,
case elfcpp::R_X86_64_GLOB_DAT: case elfcpp::R_X86_64_GLOB_DAT:
case elfcpp::R_X86_64_JUMP_SLOT: case elfcpp::R_X86_64_JUMP_SLOT:
case elfcpp::R_X86_64_RELATIVE: case elfcpp::R_X86_64_RELATIVE:
// These are outstanding tls relocs, which are unexpected when linking
case elfcpp::R_X86_64_TPOFF64: case elfcpp::R_X86_64_TPOFF64:
case elfcpp::R_X86_64_TPOFF32:
case elfcpp::R_X86_64_DTPMOD64: case elfcpp::R_X86_64_DTPMOD64:
case elfcpp::R_X86_64_DTPOFF64: case elfcpp::R_X86_64_DTPOFF64:
case elfcpp::R_X86_64_DTPOFF32: case elfcpp::R_X86_64_DTPOFF32:
case elfcpp::R_X86_64_GOTTPOFF: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSDESC: case elfcpp::R_X86_64_TLSDESC:
case elfcpp::R_X86_64_GOTPC32_TLSDESC: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSDESC_CALL: // TODO(csilvers): correct?
fprintf(stderr, _("%s: %s: unexpected reloc %u in object file\n"), fprintf(stderr, _("%s: %s: unexpected reloc %u in object file\n"),
program_name, program_name,
relinfo->location(relnum, rel.get_r_offset()).c_str(), relinfo->location(relnum, rel.get_r_offset()).c_str(),
@ -1270,38 +1219,20 @@ Target_x86_64::Relocate::relocate(const Relocate_info<64, false>* relinfo,
gold_exit(false); gold_exit(false);
break; break;
#if 0 // These are initial tls relocs, which are expected when linking
case elfcpp::R_X86_64_TLSGD: // TODO(csilvers): correct? case elfcpp::R_X86_64_TLSGD: // TODO(csilvers): correct?
case elfcpp::R_X86_64_TLSLD: // TODO(csilvers): correct? case elfcpp::R_X86_64_TLSLD: // TODO(csilvers): correct?
case elfcpp::R_X86_64_GOTTPOFF: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_IE: case elfcpp::R_X86_64_TPOFF32: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_GOTIE: case elfcpp::R_X86_64_GOTPC32_TLSDESC: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_LE: case elfcpp::R_X86_64_TLSDESC_CALL: // TODO(csilvers): correct?
case elfcpp::R_386_TLS_GD:
case elfcpp::R_386_TLS_LDM:
case elfcpp::R_386_TLS_LDO_64:
case elfcpp::R_386_TLS_IE_64:
case elfcpp::R_386_TLS_LE_64:
this->relocate_tls(relinfo, relnum, rel, r_type, gsym, psymval, view, this->relocate_tls(relinfo, relnum, rel, r_type, gsym, psymval, view,
address, view_size); address, view_size);
break; break;
#else
view_size++; // this is to make view_size used
#endif
case elfcpp::R_X86_64_SIZE32: // TODO(csilvers): correct? case elfcpp::R_X86_64_SIZE32: // TODO(csilvers): correct?
case elfcpp::R_X86_64_SIZE64: // TODO(csilvers): correct? case elfcpp::R_X86_64_SIZE64: // TODO(csilvers): correct?
case elfcpp::R_X86_64_PLTOFF64: // TODO(csilvers): implement me! case elfcpp::R_X86_64_PLTOFF64: // TODO(csilvers): implement me!
#if 0
case elfcpp::R_386_TLS_GD_64:
case elfcpp::R_386_TLS_GD_PUSH:
case elfcpp::R_386_TLS_GD_CALL:
case elfcpp::R_386_TLS_GD_POP:
case elfcpp::R_386_TLS_LDM_64:
case elfcpp::R_386_TLS_LDM_PUSH:
case elfcpp::R_386_TLS_LDM_CALL:
case elfcpp::R_386_TLS_LDM_POP:
#endif
default: default:
fprintf(stderr, _("%s: %s: unsupported reloc %u\n"), fprintf(stderr, _("%s: %s: unsupported reloc %u\n"),
program_name, program_name,
@ -1317,17 +1248,16 @@ Target_x86_64::Relocate::relocate(const Relocate_info<64, false>* relinfo,
// Perform a TLS relocation. // Perform a TLS relocation.
inline void inline void
Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>*, // relinfo, Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>* relinfo,
size_t , // relnum, size_t relnum,
const elfcpp::Rela<64, false>& , // rel, const elfcpp::Rela<64, false>& rel,
unsigned int , // r_type, unsigned int r_type,
const Sized_symbol<64>* , // gsym, const Sized_symbol<64>* gsym,
const Symbol_value<64>* , // psymval, const Symbol_value<64>* psymval,
unsigned char* , // view, unsigned char* view,
elfcpp::Elf_types<64>::Elf_Addr, elfcpp::Elf_types<64>::Elf_Addr,
off_t)// view_size) off_t view_size)
{ {
#if 0
Output_segment* tls_segment = relinfo->layout->tls_segment(); Output_segment* tls_segment = relinfo->layout->tls_segment();
if (tls_segment == NULL) if (tls_segment == NULL)
{ {
@ -1346,35 +1276,28 @@ Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>*, // relinf
Target_x86_64::optimize_tls_reloc(is_final, r_type); Target_x86_64::optimize_tls_reloc(is_final, r_type);
switch (r_type) switch (r_type)
{ {
case elfcpp::R_X86_64_TLS_LE_64: case elfcpp::R_X86_64_TPOFF32: // Local-exec reloc
value = tls_segment->vaddr() + tls_segment->memsz() - value;
Relocate_functions<64, false>::rel64(view, value);
break;
case elfcpp::R_X86_64_TLS_LE:
value = value - (tls_segment->vaddr() + tls_segment->memsz()); value = value - (tls_segment->vaddr() + tls_segment->memsz());
Relocate_functions<64, false>::rel64(view, value); Relocate_functions<64, false>::rel32(view, value);
break; break;
case elfcpp::R_X86_64_TLS_IE: case elfcpp::R_X86_64_GOTTPOFF: // Initial-exec reloc
case elfcpp::R_X86_64_TLS_GOTIE: if (opt_r_type == elfcpp::R_X86_64_TPOFF32)
case elfcpp::R_X86_64_TLS_IE_64:
if (opt_r_type == elfcpp::R_X86_64_TLS_LE_64)
{ {
Target_x86_64::Relocate::tls_ie_to_le(relinfo, relnum, tls_segment, Target_x86_64::Relocate::tls_ie_to_le(relinfo, relnum, tls_segment,
rel, r_type, value, view, rel, r_type, value, view,
view_size); view_size);
break; break;
} }
fprintf(stderr, _("%s: %s: unsupported reloc type %u\n"), fprintf(stderr, _("%s: %s: unsupported reloc type %u\n"),
program_name, program_name,
relinfo->location(relnum, rel.get_r_offset()).c_str(), relinfo->location(relnum, rel.get_r_offset()).c_str(),
r_type); r_type);
// gold_exit(false); // gold_exit(false);
break; break;
case elfcpp::R_X86_64_TLS_GD: case elfcpp::R_X86_64_TLSGD:
if (opt_r_type == elfcpp::R_X86_64_TLS_LE_64) if (opt_r_type == elfcpp::R_X86_64_TPOFF32)
{ {
this->tls_gd_to_le(relinfo, relnum, tls_segment, this->tls_gd_to_le(relinfo, relnum, tls_segment,
rel, r_type, value, view, rel, r_type, value, view,
@ -1388,8 +1311,7 @@ Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>*, // relinf
// gold_exit(false); // gold_exit(false);
break; break;
case elfcpp::R_X86_64_TLS_LDM: case elfcpp::R_X86_64_TLSLD:
case elfcpp::R_X86_64_TLS_LDO_64:
fprintf(stderr, _("%s: %s: unsupported reloc %u\n"), fprintf(stderr, _("%s: %s: unsupported reloc %u\n"),
program_name, program_name,
relinfo->location(relnum, rel.get_r_offset()).c_str(), relinfo->location(relnum, rel.get_r_offset()).c_str(),
@ -1397,122 +1319,82 @@ Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>*, // relinf
// gold_exit(false); // gold_exit(false);
break; break;
} }
#endif
} }
// Do a relocation in which we convert a TLS Initial-Exec to a // Do a relocation in which we convert a TLS Initial-Exec to a
// Local-Exec. // Local-Exec.
// TODO(csilvers): verify this is right.
inline void inline void
Target_x86_64::Relocate::tls_ie_to_le(const Relocate_info<64, false>* , // relinfo, Target_x86_64::Relocate::tls_ie_to_le(const Relocate_info<64, false>* relinfo,
size_t , // relnum, size_t relnum,
Output_segment* , // tls_segment, Output_segment* tls_segment,
const elfcpp::Rela<64, false>& , // rel, const elfcpp::Rela<64, false>& rel,
unsigned int , // r_type, unsigned int,
elfcpp::Elf_types<64>::Elf_Addr , // value, elfcpp::Elf_types<64>::Elf_Addr value,
unsigned char* , // view, unsigned char* view,
off_t) // view_size) off_t view_size)
{ {
#if 0
// We have to actually change the instructions, which means that we // We have to actually change the instructions, which means that we
// need to examine the opcodes to figure out which instruction we // need to examine the opcodes to figure out which instruction we
// are looking at. // are looking at.
if (r_type == elfcpp::R_X86_64_TLS_IE)
// movl %gs:XX,%eax ==> movl $YY,%eax
// movl %gs:XX,%reg ==> movl $YY,%reg
// addl %gs:XX,%reg ==> addl $YY,%reg
Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, -1);
Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, 4);
unsigned char op1 = view[-1];
if (op1 == 0xa1)
{ {
// movl %gs:XX,%eax ==> movl $YY,%eax // movl XX,%eax ==> movl $YY,%eax
// movl %gs:XX,%reg ==> movl $YY,%reg view[-1] = 0xb8;
// addl %gs:XX,%reg ==> addl $YY,%reg
Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, -1);
Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, 4);
unsigned char op1 = view[-1];
if (op1 == 0xa1)
{
// movl XX,%eax ==> movl $YY,%eax
view[-1] = 0xb8;
}
else
{
Target_x86_64::Relocate::check_range(relinfo, relnum, rel,
view_size, -2);
unsigned char op2 = view[-2];
if (op2 == 0x8b)
{
// movl XX,%reg ==> movl $YY,%reg
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
(op1 & 0xc7) == 0x05);
view[-2] = 0xc7;
view[-1] = 0xc0 | ((op1 >> 3) & 7);
}
else if (op2 == 0x03)
{
// addl XX,%reg ==> addl $YY,%reg
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
(op1 & 0xc7) == 0x05);
view[-2] = 0x81;
view[-1] = 0xc0 | ((op1 >> 3) & 7);
}
else
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, 0);
}
} }
else else
{ {
// subl %gs:XX(%reg1),%reg2 ==> subl $YY,%reg2 Target_x86_64::Relocate::check_range(relinfo, relnum, rel,
// movl %gs:XX(%reg1),%reg2 ==> movl $YY,%reg2 view_size, -2);
// addl %gs:XX(%reg1),%reg2 ==> addl $YY,$reg2
Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, -2);
Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, 4);
unsigned char op1 = view[-1];
unsigned char op2 = view[-2]; unsigned char op2 = view[-2];
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
(op1 & 0xc0) == 0x80 && (op1 & 7) != 4);
if (op2 == 0x8b) if (op2 == 0x8b)
{ {
// movl %gs:XX(%reg1),%reg2 ==> movl $YY,%reg2 // movl XX,%reg ==> movl $YY,%reg
view[-2] = 0xc7; Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
view[-1] = 0xc0 | ((op1 >> 3) & 7); (op1 & 0xc7) == 0x05);
} view[-2] = 0xc7;
else if (op2 == 0x2b) view[-1] = 0xc0 | ((op1 >> 3) & 7);
{ }
// subl %gs:XX(%reg1),%reg2 ==> subl $YY,%reg2
view[-2] = 0x81;
view[-1] = 0xe8 | ((op1 >> 3) & 7);
}
else if (op2 == 0x03) else if (op2 == 0x03)
{ {
// addl %gs:XX(%reg1),%reg2 ==> addl $YY,$reg2 // addl XX,%reg ==> addl $YY,%reg
view[-2] = 0x81; Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
view[-1] = 0xc0 | ((op1 >> 3) & 7); (op1 & 0xc7) == 0x05);
} view[-2] = 0x81;
view[-1] = 0xc0 | ((op1 >> 3) & 7);
}
else else
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, 0); Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, 0);
} }
value = tls_segment->vaddr() + tls_segment->memsz() - value; value = value - (tls_segment->vaddr() + tls_segment->memsz());
if (r_type == elfcpp::R_X86_64_TLS_IE || r_type == elfcpp::R_X86_64_TLS_GOTIE) Relocate_functions<64, false>::rel32(view, value);
value = - value;
Relocate_functions<64, false>::rel64(view, value);
#endif
} }
// Do a relocation in which we convert a TLS Global-Dynamic to a // Do a relocation in which we convert a TLS Global-Dynamic to a
// Local-Exec. // Local-Exec.
// TODO(csilvers): verify this is right.
inline void inline void
Target_x86_64::Relocate::tls_gd_to_le(const Relocate_info<64, false>* , // relinfo, Target_x86_64::Relocate::tls_gd_to_le(const Relocate_info<64, false>* relinfo,
size_t , // relnum, size_t relnum,
Output_segment* , // tls_segment, Output_segment* tls_segment,
const elfcpp::Rela<64, false>& , // rel, const elfcpp::Rela<64, false>& rel,
unsigned int, unsigned int,
elfcpp::Elf_types<64>::Elf_Addr , // value, elfcpp::Elf_types<64>::Elf_Addr value,
unsigned char* , // view, unsigned char* view,
off_t)// view_size) off_t view_size)
{ {
#if 0
// leal foo(,%reg,1),%eax; call ___tls_get_addr // leal foo(,%reg,1),%eax; call ___tls_get_addr
// ==> movl %gs,0,%eax; subl $foo@tpoff,%eax // ==> movl %gs,0,%eax; subl $foo@tpoff,%eax
// leal foo(%reg),%eax; call ___tls_get_addr // leal foo(%reg),%eax; call ___tls_get_addr
@ -1525,9 +1407,9 @@ Target_x86_64::Relocate::tls_gd_to_le(const Relocate_info<64, false>* , // relin
unsigned char op2 = view[-2]; unsigned char op2 = view[-2];
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
op2 == 0x8d || op2 == 0x04); op2 == 0x8d || op2 == 0x04);
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
view[4] == 0xe8); view[4] == 0xe8);
int roff = 5; int roff = 5;
@ -1535,17 +1417,18 @@ Target_x86_64::Relocate::tls_gd_to_le(const Relocate_info<64, false>* , // relin
{ {
Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, -3); Target_x86_64::Relocate::check_range(relinfo, relnum, rel, view_size, -3);
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
view[-3] == 0x8d); view[-3] == 0x8d);
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
((op1 & 0xc7) == 0x05 ((op1 & 0xc7) == 0x05
&& op1 != (4 << 3))); && op1 != (4 << 3)));
memcpy(view - 3, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12); memcpy(view - 3, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
} }
else else
{ {
Target_x86_64::Relocate::check_tls(relinfo, relnum, rel, Target_x86_64::Relocate::check_tls(relinfo, relnum, rel,
(op1 & 0xf8) == 0x80 && (op1 & 7) != 4); (op1 & 0xf8) == 0x80 && (op1 & 7) != 4);
if (rel.get_r_offset() + 9 < view_size && view[9] == 0x90) if (static_cast<off_t>(rel.get_r_offset() + 9) < view_size
&& view[9] == 0x90)
{ {
// There is a trailing nop. Use the size byte subl. // There is a trailing nop. Use the size byte subl.
memcpy(view - 2, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12); memcpy(view - 2, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
@ -1559,21 +1442,20 @@ Target_x86_64::Relocate::tls_gd_to_le(const Relocate_info<64, false>* , // relin
} }
value = tls_segment->vaddr() + tls_segment->memsz() - value; value = tls_segment->vaddr() + tls_segment->memsz() - value;
Relocate_functions<64, false>::rel64(view + roff, value); Relocate_functions<64, false>::rel32(view + roff, value);
// The next reloc should be a PLT32 reloc against __tls_get_addr. // The next reloc should be a PLT32 reloc against __tls_get_addr.
// We can skip it. // We can skip it.
this->skip_call_tls_get_addr_ = true; this->skip_call_tls_get_addr_ = true;
#endif
} }
// Check the range for a TLS relocation. // Check the range for a TLS relocation.
inline void inline void
Target_x86_64::Relocate::check_range(const Relocate_info<64, false>* relinfo, Target_x86_64::Relocate::check_range(const Relocate_info<64, false>* relinfo,
size_t relnum, size_t relnum,
const elfcpp::Rela<64, false>& rel, const elfcpp::Rela<64, false>& rel,
off_t view_size, off_t off) off_t view_size, off_t off)
{ {
off_t offset = rel.get_r_offset() + off; off_t offset = rel.get_r_offset() + off;
if (offset < 0 || offset > view_size) if (offset < 0 || offset > view_size)
@ -1589,9 +1471,9 @@ Target_x86_64::Relocate::check_range(const Relocate_info<64, false>* relinfo,
inline void inline void
Target_x86_64::Relocate::check_tls(const Relocate_info<64, false>* relinfo, Target_x86_64::Relocate::check_tls(const Relocate_info<64, false>* relinfo,
size_t relnum, size_t relnum,
const elfcpp::Rela<64, false>& rel, const elfcpp::Rela<64, false>& rel,
bool valid) bool valid)
{ {
if (!valid) if (!valid)
{ {
@ -1607,12 +1489,12 @@ Target_x86_64::Relocate::check_tls(const Relocate_info<64, false>* relinfo,
void void
Target_x86_64::relocate_section(const Relocate_info<64, false>* relinfo, Target_x86_64::relocate_section(const Relocate_info<64, false>* relinfo,
unsigned int sh_type, unsigned int sh_type,
const unsigned char* prelocs, const unsigned char* prelocs,
size_t reloc_count, size_t reloc_count,
unsigned char* view, unsigned char* view,
elfcpp::Elf_types<64>::Elf_Addr address, elfcpp::Elf_types<64>::Elf_Addr address,
off_t view_size) off_t view_size)
{ {
gold_assert(sh_type == elfcpp::SHT_RELA); gold_assert(sh_type == elfcpp::SHT_RELA);