From a080d84da0051128a7ec12c0fa87696589bcbeb7 Mon Sep 17 00:00:00 2001
From: Artemiy Volkov <artemiyv@acm.org>
Date: Thu, 9 Jun 2016 11:39:57 -0700
Subject: [PATCH] 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.
---
 gold/ChangeLog | 5 +++++
 gold/mips.cc   | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 90b10e55aa8..5171ad0a99b 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 b8c74d0a61a..e8a639b9828 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)
-- 
2.30.2