aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtemiy Volkov <artemiyv@acm.org>2016-06-09 11:39:57 -0700
committerCary Coutant <ccoutant@gmail.com>2016-06-09 11:39:57 -0700
commita080d84da0051128a7ec12c0fa87696589bcbeb7 (patch)
treed9c489485e23237338f1df7411846808fc898659
parent5c41dbc302c2dd87e201e4fd1d9ae3186f6e51a0 (diff)
downloadgdb-a080d84da0051128a7ec12c0fa87696589bcbeb7.zip
gdb-a080d84da0051128a7ec12c0fa87696589bcbeb7.tar.gz
gdb-a080d84da0051128a7ec12c0fa87696589bcbeb7.tar.bz2
Fix compilation error in mips.cc with some versions of GCC.
gold/ * mips.cc (Mips_output_data_got::do_write): Add missing template args via typedef.
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/mips.cc7
2 files changed, 10 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 90b10e5..5171ad0 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -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>
PR/19960
diff --git a/gold/mips.cc b/gold/mips.cc
index b8c74d0..e8a639b 100644
--- a/gold/mips.cc
+++ b/gold/mips.cc
@@ -6130,6 +6130,9 @@ template<int size, bool big_endian>
void
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.
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;
// 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().end();
++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.
- 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().end();
++p)