From acc276d812bb5fced6a057e2ee3454ca70299a24 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 17 Oct 2012 14:33:41 +0000 Subject: [PATCH] * powerpc.cc (Target_powerpc::Scan::local, global): Always emit dynamic relocs for GOT_TPREL got entries, without symbol if resolving locally. (Target_powerpc::do_gc_add_reference): Don't add for dynamic objects. (Target_powerpc::scan_relocs): Define _GLOBAL_OFFSET_TABLE_ early. (Target_powerpc::Relocate:relocate): REL32 reloc may be unaligned. --- gold/ChangeLog | 9 ++++++ gold/powerpc.cc | 91 ++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 79 insertions(+), 21 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 1f13f22..91c01b8 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,12 @@ +2012-10-18 Alan Modra + + * powerpc.cc (Target_powerpc::Scan::local, global): Always emit + dynamic relocs for GOT_TPREL got entries, without symbol if + resolving locally. + (Target_powerpc::do_gc_add_reference): Don't add for dynamic objects. + (Target_powerpc::scan_relocs): Define _GLOBAL_OFFSET_TABLE_ early. + (Target_powerpc::Relocate:relocate): REL32 reloc may be unaligned. + 2012-10-17 Alan Modra PR gold/14726 diff --git a/gold/powerpc.cc b/gold/powerpc.cc index eb09c7e..6938602 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -3411,10 +3411,19 @@ Target_powerpc::Scan::local( const tls::Tls_optimization tls_type = target->optimize_tls_ie(true); if (tls_type == tls::TLSOPT_NONE) { - Output_data_got_powerpc* got - = target->got_section(symtab, layout); unsigned int r_sym = elfcpp::elf_r_sym(reloc.get_r_info()); - got->add_local_tls(object, r_sym, GOT_TYPE_TPREL); + if (!object->local_has_got_offset(r_sym, GOT_TYPE_TPREL)) + { + Output_data_got_powerpc* got + = target->got_section(symtab, layout); + unsigned int off = got->add_constant(0); + object->set_local_got_offset(r_sym, GOT_TYPE_TPREL, off); + + Reloc_section* rela_dyn = target->rela_dyn_section(layout); + rela_dyn->add_symbolless_local_addend(object, r_sym, + elfcpp::R_POWERPC_TPREL, + got, off, 0); + } } else if (tls_type == tls::TLSOPT_TO_LE) { @@ -3729,11 +3738,26 @@ Target_powerpc::Scan::global( } else if (tls_type == tls::TLSOPT_TO_IE) { - Output_data_got_powerpc* got - = target->got_section(symtab, layout); - got->add_global_with_rel(gsym, GOT_TYPE_TPREL, - target->rela_dyn_section(layout), - elfcpp::R_POWERPC_TPREL); + if (!gsym->has_got_offset(GOT_TYPE_TPREL)) + { + Output_data_got_powerpc* got + = target->got_section(symtab, layout); + Reloc_section* rela_dyn = target->rela_dyn_section(layout); + if (gsym->is_undefined() + || gsym->is_from_dynobj()) + { + got->add_global_with_rel(gsym, GOT_TYPE_TPREL, rela_dyn, + elfcpp::R_POWERPC_TPREL); + } + else + { + unsigned int off = got->add_constant(0); + gsym->set_got_offset(GOT_TYPE_TPREL, off); + unsigned int dynrel = elfcpp::R_POWERPC_TPREL; + rela_dyn->add_symbolless_global_addend(gsym, dynrel, + got, off, 0); + } + } } else if (tls_type == tls::TLSOPT_TO_LE) { @@ -3795,17 +3819,26 @@ Target_powerpc::Scan::global( const tls::Tls_optimization tls_type = target->optimize_tls_ie(final); if (tls_type == tls::TLSOPT_NONE) { - Output_data_got_powerpc* got - = target->got_section(symtab, layout); - if (!gsym->final_value_is_known() - && (gsym->is_from_dynobj() - || gsym->is_undefined() - || gsym->is_preemptible())) - got->add_global_with_rel(gsym, GOT_TYPE_TPREL, - target->rela_dyn_section(layout), - elfcpp::R_POWERPC_TPREL); - else - got->add_global_tls(gsym, GOT_TYPE_TPREL); + if (!gsym->has_got_offset(GOT_TYPE_TPREL)) + { + Output_data_got_powerpc* got + = target->got_section(symtab, layout); + Reloc_section* rela_dyn = target->rela_dyn_section(layout); + if (gsym->is_undefined() + || gsym->is_from_dynobj()) + { + got->add_global_with_rel(gsym, GOT_TYPE_TPREL, rela_dyn, + elfcpp::R_POWERPC_TPREL); + } + else + { + unsigned int off = got->add_constant(0); + gsym->set_got_offset(GOT_TYPE_TPREL, off); + unsigned int dynrel = elfcpp::R_POWERPC_TPREL; + rela_dyn->add_symbolless_global_addend(gsym, dynrel, + got, off, 0); + } + } } else if (tls_type == tls::TLSOPT_TO_LE) { @@ -3902,7 +3935,9 @@ Target_powerpc::do_gc_add_reference( { Powerpc_relobj* ppc_object = static_cast*>(dst_obj); - if (size == 64 && dst_shndx == ppc_object->opd_shndx()) + if (size == 64 + && !ppc_object->is_dynamic() + && dst_shndx == ppc_object->opd_shndx()) { if (ppc_object->opd_valid()) { @@ -3978,6 +4013,20 @@ Target_powerpc::scan_relocs( if (size == 32) { + // Define a weak hidden _GLOBAL_OFFSET_TABLE_ to ensure it isn't + // seen as undefined when scanning relocs (and thus requires + // non-relative dynamic relocs). The proper value will be + // updated later. + Symbol *gotsym = symtab->lookup("_GLOBAL_OFFSET_TABLE_", NULL); + if (gotsym != NULL && gotsym->is_undefined()) + symtab->define_in_output_data("_GLOBAL_OFFSET_TABLE_", NULL, + Symbol_table::PREDEFINED, + this->got_section(symtab, layout), 0, 0, + elfcpp::STT_OBJECT, + elfcpp::STB_WEAK, + elfcpp::STV_HIDDEN, 0, + false, false); + static Output_data_space* sdata; // Define _SDA_BASE_ at the start of the .sdata section. @@ -4776,10 +4825,10 @@ Target_powerpc::Relocate::relocate( break; case elfcpp::R_POWERPC_ADDR32: - case elfcpp::R_POWERPC_REL32: status = Reloc::addr32(view, value, overflow); break; + case elfcpp::R_POWERPC_REL32: case elfcpp::R_POWERPC_UADDR32: status = Reloc::addr32_u(view, value, overflow); break; -- 2.7.4