From 627b30b77e95fbdbb8b3b762cd75507380f99538 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 30 Nov 2012 05:01:20 +0000 Subject: [PATCH] * powerpc.c (Target_powerpc::Scan::global): Don't emit relative relocs against protected symbols when building 32-bit shared libs. --- gold/ChangeLog | 5 +++++ gold/powerpc.cc | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index ae44916..92cbe14 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,10 @@ 2012-11-30 Alan Modra + * powerpc.c (Target_powerpc::Scan::global): Don't emit relative + relocs against protected symbols when building 32-bit shared libs. + +2012-11-30 Alan Modra + * powerpc.cc (Target_powerpc::make_plt_section): Add symtab param. Call got_section() to make .got. Update all callers and their callers and so on. diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 0c5288f..a3bb9f2 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -3664,11 +3664,15 @@ Target_powerpc::Scan::global( target->copy_reloc(symtab, layout, object, data_shndx, output_section, gsym, reloc); } - else if (((size == 32 && r_type == elfcpp::R_POWERPC_ADDR32) - || (size == 64 && r_type == elfcpp::R_PPC64_ADDR64)) - && (gsym->can_use_relative_reloc(false) - || (size == 64 - && data_shndx == ppc_object->opd_shndx()))) + else if ((size == 32 + && r_type == elfcpp::R_POWERPC_ADDR32 + && gsym->can_use_relative_reloc(false) + && !(gsym->visibility() == elfcpp::STV_PROTECTED + && parameters->options().shared())) + || (size == 64 + && r_type == elfcpp::R_PPC64_ADDR64 + && (gsym->can_use_relative_reloc(false) + || data_shndx == ppc_object->opd_shndx()))) { Reloc_section* rela_dyn = target->rela_dyn_section(layout); unsigned int dynrel = elfcpp::R_POWERPC_RELATIVE; -- 2.7.4