aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2012-11-02 19:50:36 +0000
committerRoland McGrath <roland@gnu.org>2012-11-02 19:50:36 +0000
commit20b07db77c2f6d2092fc3a678e027c1a0015ad40 (patch)
treec99ac8f16954d86cd2e2688c0477b75d675d624a
parent5d6dc2b13373cd8d1dfeeba09b6ac92a5f683f06 (diff)
downloadbinutils-20b07db77c2f6d2092fc3a678e027c1a0015ad40.tar.gz
gold/
* i386.cc (Target_i386::relocate_relocs): Remove extraneous typename from last change.
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/i386.cc5
2 files changed, 7 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 2bff665e1..91f97eb44 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-02 Roland McGrath <mcgrathr@google.com>
+
+ * i386.cc (Target_i386::relocate_relocs): Remove extraneous typename
+ from last change.
+
2012-11-01 Roland McGrath <mcgrathr@google.com>
* target.h (Sized_target::relocate_relocs): Use Elf_Off
diff --git a/gold/i386.cc b/gold/i386.cc
index fbf56701e..c26511569 100644
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -414,8 +414,7 @@ class Target_i386 : public Sized_target<32, false>
const unsigned char* prelocs,
size_t reloc_count,
Output_section* output_section,
- typename elfcpp::Elf_types<32>::Elf_Off
- offset_in_output_section,
+ elfcpp::Elf_types<32>::Elf_Off offset_in_output_section,
const Relocatable_relocs*,
unsigned char* view,
elfcpp::Elf_types<32>::Elf_Addr view_address,
@@ -3618,7 +3617,7 @@ Target_i386::relocate_relocs(
const unsigned char* prelocs,
size_t reloc_count,
Output_section* output_section,
- typename elfcpp::Elf_types<32>::Elf_Off offset_in_output_section,
+ elfcpp::Elf_types<32>::Elf_Off offset_in_output_section,
const Relocatable_relocs* rr,
unsigned char* view,
elfcpp::Elf_types<32>::Elf_Addr view_address,