darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix compilation error in mips.cc with some versions of GCC.

Browse source 
gold/
	* mips.cc (Mips_output_data_got::do_write): Add missing template
	args via typedef.
This commit is contained in:
Artemiy Volkov 2016-06-09 11:39:57 -07:00 committed by Cary Coutant
parent 5c41dbc302
commit a080d84da0
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gold/ChangeLog
View file

@ -1,3 +1,8 @@
2016-06-09 Artemiy Volkov <artemiyv@acm.org>
* mips.cc (Mips_output_data_got::do_write): Add missing template
args via typedef.
2016-05-30 Marcin Kościelnicki <koriakin@0x04.net> 2016-05-30 Marcin Kościelnicki <koriakin@0x04.net>
PR/19960 PR/19960

7
gold/mips.cc
View file

@ -6130,6 +6130,9 @@ template<int size, bool big_endian>
void void
Mips_output_data_got<size, big_endian>::do_write(Output_file* of) Mips_output_data_got<size, big_endian>::do_write(Output_file* of)
{ {
typedef Unordered_set<Mips_symbol<size>*, Mips_symbol_hash<size> >
Mips_stubs_entry_set;
// Call parent to write out GOT. // Call parent to write out GOT.
Output_data_got<size, big_endian>::do_write(of); Output_data_got<size, big_endian>::do_write(of);
@ -6142,7 +6145,7 @@ Mips_output_data_got<size, big_endian>::do_write(Output_file* of)
this->got_view_ = oview; this->got_view_ = oview;
// Write lazy stub addresses. // Write lazy stub addresses.
for (typename Unordered_set<Mips_symbol<size>*>::iterator for (typename Mips_stubs_entry_set::iterator
p = this->master_got_info_->global_got_symbols().begin(); p = this->master_got_info_->global_got_symbols().begin();
p != this->master_got_info_->global_got_symbols().end(); p != this->master_got_info_->global_got_symbols().end();
++p) ++p)
@ -6159,7 +6162,7 @@ Mips_output_data_got<size, big_endian>::do_write(Output_file* of)
} }
// Add +1 to GGA_NONE nonzero MIPS16 and microMIPS entries. // Add +1 to GGA_NONE nonzero MIPS16 and microMIPS entries.
for (typename Unordered_set<Mips_symbol<size>*>::iterator for (typename Mips_stubs_entry_set::iterator
p = this->master_got_info_->global_got_symbols().begin(); p = this->master_got_info_->global_got_symbols().begin();
p != this->master_got_info_->global_got_symbols().end(); p != this->master_got_info_->global_got_symbols().end();
++p) ++p)