PR27140, ppc32 segmentation fault in make_stub

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.

	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/ChangeLog b/gold/ChangeLog
index 4b7b481f3676de9173763e74bf88f514da089303..117716643953db674e1bcef4ff5f0feca7ebdf1d 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-03  Alan Modra  <amodra@gmail.com>
+
+       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.
+
 2021-01-01  Nicolas Boulenguez  <nicolas@debian.org>
 
        * tilegx.cc: Correct comment spelling.

diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index eca9741a90dc5fb286736477fd6ead9137451eec..e2966ef096b0043cd40dc2f38f41f0f798abcdb7 100644 (file)
--- 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_))