* PR27140, ppc32 segmentation fault in make_stub
@ 2021-01-03 2:22 Alan Modra
0 siblings, 0 replies; only message in thread
From: Alan Modra @ 2021-01-03 2:22 UTC (permalink / raw)
To: binutils
This fixes a thinko in commit fa40fbe4849. st_other global entry bits
are relevant only for 64-bit ELFv2. PowerPC gold leaves local sym
vector of st_other bits as NULL for 32-bit, hence the segfault.
Committed.
PR 27140
* powerpc.cc (Target_powerpc::Branch_info::make_stub): Only access
object->st_other() when 64-bit.
(Stub_table::add_long_branch_entry): Ignore "other" when 32-bit.
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index eca9741a90..e2966ef096 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -3536,7 +3536,7 @@ Target_powerpc<size, big_endian>::Branch_info::make_stub(
from += (this->object_->output_section(this->shndx_)->address()
+ this->offset_);
Address to;
- unsigned int other;
+ unsigned int other = 0;
if (gsym != NULL)
{
switch (gsym->source())
@@ -3564,7 +3564,8 @@ Target_powerpc<size, big_endian>::Branch_info::make_stub(
to = symtab->compute_final_value<size>(gsym, &status);
if (status != Symbol_table::CFVS_OK)
return true;
- other = gsym->nonvis() >> 3;
+ if (size == 64)
+ other = gsym->nonvis() >> 3;
}
else
{
@@ -3581,7 +3582,8 @@ Target_powerpc<size, big_endian>::Branch_info::make_stub(
|| !symval.has_output_value())
return true;
to = symval.value(this->object_, 0);
- other = this->object_->st_other(this->r_sym_) >> 5;
+ if (size == 64)
+ other = this->object_->st_other(this->r_sym_) >> 5;
}
if (!(size == 32 && this->r_type_ == elfcpp::R_PPC_PLTREL24))
to += this->addend_;
@@ -5303,7 +5305,7 @@ Stub_table<size, big_endian>::add_long_branch_entry(
this->need_resize_ = true;
p.first->second.toc_ = true;
}
- if (p.first->second.other_ == 0)
+ if (size == 64 && p.first->second.other_ == 0)
p.first->second.other_ = other;
gold_assert(save_res == p.first->second.save_res_);
if (p.second || (this->resizing_ && !p.first->second.iter_))
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-03 2:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-03 2:22 PR27140, ppc32 segmentation fault in make_stub Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).