FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly merge GNU_PROPERTY_X86_ISA_1_USED (x86_64).

Browse source 
gold/
	PR ld/23486
	* x86_64.cc (Target_x86_64::Target_x86_64): Initialize
	object_isa_1_used_.
	(Target_x86_64::object_isa_1_used_): New data member.
	(Target_x86_64::record_gnu_property): Save ISA_1_USED bits for object.
	(Target_x86_64::merge_gnu_properties): Merge ISA_1_USED bits.
This commit is contained in:
Cary Coutant 2018-08-07 21:35:12 -07:00
parent 045cf01286
commit a9fc784bac
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gold/ChangeLog
View file

@ -1,3 +1,12 @@
2018-08-07 Cary Coutant <ccoutant@gmail.com>
PR ld/23486
* x86_64.cc (Target_x86_64::Target_x86_64): Initialize
object_isa_1_used_.
(Target_x86_64::object_isa_1_used_): New data member.
(Target_x86_64::record_gnu_property): Save ISA_1_USED bits for object.
(Target_x86_64::merge_gnu_properties): Merge ISA_1_USED bits.
2018-08-06 Cary Coutant <ccoutant@gmail.com>
PR gold/23455

22
gold/x86_64.cc
View file

@ -706,7 +706,8 @@ class Target_x86_64 : public Sized_target<size, false>
rela_irelative_(NULL), copy_relocs_(elfcpp::R_X86_64_COPY),
got_mod_index_offset_(-1U), tlsdesc_reloc_info_(),
tls_base_symbol_defined_(false), isa_1_used_(0), isa_1_needed_(0),
feature_1_(0), object_feature_1_(0), seen_first_object_(false)
feature_1_(0), object_isa_1_used_(0), object_feature_1_(0),
seen_first_object_(false)
{ }
// Hook for a new output section.
@ -1382,6 +1383,11 @@ class Target_x86_64 : public Sized_target<size, false>
uint32_t isa_1_needed_;
uint32_t feature_1_;
// Target-specific properties from the current object.
// These bits get ORed into ISA_1_USED_ after all properties for the object
// have been processed. But if either is all zeroes (as when the property
// is absent from an object), the result should be all zeroes.
// (See PR ld/23486.)
uint32_t object_isa_1_used_;
// These bits get ANDed into FEATURE_1_ after all properties for the object
// have been processed.
uint32_t object_feature_1_;
@ -1610,7 +1616,7 @@ Target_x86_64<size>::record_gnu_property(
switch (pr_type)
{
case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
this->isa_1_used_ |= val;
this->object_isa_1_used_ |= val;
break;
case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED:
this->isa_1_needed_ |= val;
@ -1628,12 +1634,22 @@ void
Target_x86_64<size>::merge_gnu_properties(const Object*)
{
if (this->seen_first_object_)
this->feature_1_ &= this->object_feature_1_;
{
// If any object is missing the ISA_1_USED property, we must omit
// it from the output file.
if (this->object_isa_1_used_ == 0)
this->isa_1_used_ = 0;
else if (this->isa_1_used_ != 0)
this->isa_1_used_ |= this->object_isa_1_used_;
this->feature_1_ &= this->object_feature_1_;
}
else
{
this->isa_1_used_ = this->object_isa_1_used_;
this->feature_1_ = this->object_feature_1_;
this->seen_first_object_ = true;
}
this->object_isa_1_used_ = 0;
this->object_feature_1_ = 0;
}