From 41549dfbcc747d0dc4a97c9a427c3a29e9878f05 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 12 Jan 2016 12:21:53 -0800
Subject: [PATCH] Fix compile error with use of 'typename' outside of template

	* i386.cc (Target_i386::Classify_reloc::get_r_addend): Remove
	'typename'.
---
 gold/ChangeLog | 5 +++++
 gold/i386.cc   | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index c16b4a3ec22..3560e2f8afc 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386.cc (Target_i386::Classify_reloc::get_r_addend): Remove
+	'typename'.
+
 2016-01-12  Cary Coutant  <ccoutant@gmail.com>
 
 	* arm.cc (Target_arm::Classify_reloc::get_r_addend): New method.
diff --git a/gold/i386.cc b/gold/i386.cc
index 3715e5eaf85..7946cf79dcd 100644
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -743,11 +743,10 @@ class Target_i386 : public Sized_target<32, false>
       public gold::Default_classify_reloc<elfcpp::SHT_REL, 32, false>
   {
    public:
-    typedef typename Reloc_types<elfcpp::SHT_REL, 32, false>::Reloc
-	Reltype;
+    typedef Reloc_types<elfcpp::SHT_REL, 32, false>::Reloc Reltype;
 
     // Return the explicit addend of the relocation (return 0 for SHT_REL).
-    static typename elfcpp::Elf_types<32>::Elf_Swxword
+    static elfcpp::Elf_types<32>::Elf_Swxword
     get_r_addend(const Reltype*)
     { return 0; }
 
-- 
2.30.2