MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[GOLD] powerpc incremental-dump assertion failure

Browse Source 
incremental-dump wants to instantiate Target_powerpc without options
being set up.  This patch fixes
  internal error in options, at gold/parameters.h:92

	* powerpc.cc (Target_powerpc::no_tprel_opt_): Rename from tprel_opt_.
	Init to false.
	(Target_powerpc::tprel_opt): Test parameters->options().tls_optimize().
	(Target_powerpc::set_tprel_opt): Delete.
	(Target_powerpc::set_no_tprel_opt): New function.  Update all uses
	of set_tprel_opt.
This commit is contained in:
Alan Modra 2020-11-17 15:13:37 +10:30
parent f1e05b1978
commit 4e0e019fa8
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gold/ChangeLog
View File

@ -1,3 +1,12 @@
2020-11-17 Alan Modra <amodra@gmail.com>
* powerpc.cc (Target_powerpc::no_tprel_opt_): Rename from tprel_opt_.
Init to false.
(Target_powerpc::tprel_opt): Test parameters->options().tls_optimize().
(Target_powerpc::set_tprel_opt): Delete.
(Target_powerpc::set_no_tprel_opt): New function. Update all uses
of set_tprel_opt.
2020-11-16 Michael Hudson-Doyle <michael.hudson@canonical.com> 2020-11-16 Michael Hudson-Doyle <michael.hudson@canonical.com>
PR 26902 PR 26902

19
gold/powerpc.cc
View File

@ -649,8 +649,7 @@ class Target_powerpc : public Sized_target<size, big_endian>
stub_tables_(), branch_lookup_table_(), branch_info_(), tocsave_loc_(), stub_tables_(), branch_lookup_table_(), branch_info_(), tocsave_loc_(),
power10_relocs_(false), plt_thread_safe_(false), plt_localentry0_(false), power10_relocs_(false), plt_thread_safe_(false), plt_localentry0_(false),
plt_localentry0_init_(false), has_localentry0_(false), plt_localentry0_init_(false), has_localentry0_(false),
has_tls_get_addr_opt_(false), has_tls_get_addr_opt_(false), no_tprel_opt_(false),
tprel_opt_(parameters->options().tls_optimize()),
relax_failed_(false), relax_fail_count_(0), relax_failed_(false), relax_fail_count_(0),
stub_group_size_(0), savres_section_(0), stub_group_size_(0), savres_section_(0),
tls_get_addr_(NULL), tls_get_addr_opt_(NULL), tls_get_addr_(NULL), tls_get_addr_opt_(NULL),
@ -1154,11 +1153,11 @@ class Target_powerpc : public Sized_target<size, big_endian>
bool bool
tprel_opt() const tprel_opt() const
{ return this->tprel_opt_; } { return !this->no_tprel_opt_ && parameters->options().tls_optimize(); }
void void
set_tprel_opt(bool val) set_no_tprel_opt()
{ this->tprel_opt_ = val; } { this->no_tprel_opt_ = true; }
// Remember any symbols seen with non-zero localentry, even those // Remember any symbols seen with non-zero localentry, even those
// not providing a definition // not providing a definition
@ -1717,7 +1716,7 @@ class Target_powerpc : public Sized_target<size, big_endian>
bool plt_localentry0_init_; bool plt_localentry0_init_;
bool has_localentry0_; bool has_localentry0_;
bool has_tls_get_addr_opt_; bool has_tls_get_addr_opt_;
bool tprel_opt_; bool no_tprel_opt_;
bool relax_failed_; bool relax_failed_;
int relax_fail_count_; int relax_fail_count_;
@ -8471,7 +8470,7 @@ Target_powerpc<size, big_endian>::Scan::local(
uint32_t insn = elfcpp::Swap<32, big_endian>::readval(view + off); uint32_t insn = elfcpp::Swap<32, big_endian>::readval(view + off);
if ((insn & ((0x3fu << 26) | 0x1f << 16)) if ((insn & ((0x3fu << 26) | 0x1f << 16))
!= ((15u << 26) | ((size == 32 ? 2 : 13) << 16))) != ((15u << 26) | ((size == 32 ? 2 : 13) << 16)))
target->set_tprel_opt(false); target->set_no_tprel_opt();
} }
} }
break; break;
@ -8486,7 +8485,7 @@ Target_powerpc<size, big_endian>::Scan::local(
break; break;
// Fall through. // Fall through.
case elfcpp::R_POWERPC_TPREL16_HI: case elfcpp::R_POWERPC_TPREL16_HI:
target->set_tprel_opt(false); target->set_no_tprel_opt();
break; break;
default: default:
break; break;
@ -9268,7 +9267,7 @@ Target_powerpc<size, big_endian>::Scan::global(
uint32_t insn = elfcpp::Swap<32, big_endian>::readval(view + off); uint32_t insn = elfcpp::Swap<32, big_endian>::readval(view + off);
if ((insn & ((0x3fu << 26) | 0x1f << 16)) if ((insn & ((0x3fu << 26) | 0x1f << 16))
!= ((15u << 26) | ((size == 32 ? 2 : 13) << 16))) != ((15u << 26) | ((size == 32 ? 2 : 13) << 16)))
target->set_tprel_opt(false); target->set_no_tprel_opt();
} }
} }
break; break;
@ -9283,7 +9282,7 @@ Target_powerpc<size, big_endian>::Scan::global(
break; break;
// Fall through. // Fall through.
case elfcpp::R_POWERPC_TPREL16_HI: case elfcpp::R_POWERPC_TPREL16_HI:
target->set_tprel_opt(false); target->set_no_tprel_opt();
break; break;
default: default:
break; break;