OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mips: Fix TLS LDM GOT entry. 

gold/
	* mips.cc (Mips_got_entry::hash()): Shift addend to reduce
	possibility of collisions.
	(Mips_got_entry::equals): Fix case for GOT_TLS_LDM
	entries.
This commit is contained in:
Vladimir Radosavljevic 2017-03-15 16:49:16 -07:00 committed by Cary Coutant
parent 4d78db49e6
commit aab2c17756
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gold/ChangeLog
View File

@ -1,3 +1,10 @@
2017-03-15 Vladimir Radosavljevic <Vladimir.Radosavljevic@imgtec.com>
* mips.cc (Mips_got_entry::hash()): Shift addend to reduce
possibility of collisions.
(Mips_got_entry::equals): Fix case for GOT_TLS_LDM
entries.
2017-03-15 Vladimir Radosavljevic <Vladimir.Radosavljevic@imgtec.com>
* mips.cc (Mips_relobj::merge_processor_specific_data_): New data

16
gold/mips.cc
View File

@ -474,22 +474,24 @@ class Mips_got_entry
? this->d.object->name().c_str()
: this->d.sym->name());
size_t addend = this->addend_;
return name_hash_value ^ this->symndx_ ^ addend;
return name_hash_value ^ this->symndx_ ^ (addend << 16);
}
// Return whether this entry is equal to OTHER.
bool
equals(Mips_got_entry<size, big_endian>* other) const
{
if (this->symndx_ != other->symndx_
|| this->tls_type_ != other->tls_type_)
return false;
if (this->tls_type_ == GOT_TLS_LDM)
return true;
return ((this->tls_type_ == other->tls_type_)
&& (this->symndx_ == other->symndx_)
&& ((this->symndx_ != -1U)
? (this->d.object == other->d.object)
: (this->d.sym == other->d.sym))
&& (this->addend_ == other->addend_));
return (((this->symndx_ != -1U)
? (this->d.object == other->d.object)
: (this->d.sym == other->d.sym))
&& (this->addend_ == other->addend_));
}
// Return input object that needs this GOT entry.