aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/arm.cc6
2 files changed, 7 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 4952be1..e617cde 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,9 @@
2009-10-30 Doug Kwan <dougkwan@google.com>
+ * arm.cc (Stub_addend_reader): Fix bug in previouls check-in.
+
+2009-10-30 Doug Kwan <dougkwan@google.com>
+
* arm.cc (Stub_addend_reader): New struct template definition
and partial specializations.
(Stub_addend_reader::operator()): New method definition for a
diff --git a/gold/arm.cc b/gold/arm.cc
index 420769f..3e2d70d 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -1042,8 +1042,7 @@ struct Stub_addend_reader
unsigned int /* r_type */,
const unsigned char* /* view */,
const typename Reloc_types<sh_type,
- 32, big_endian>::Reloc& /* reloc */) const
- { gold_unreachable(); }
+ 32, big_endian>::Reloc& /* reloc */) const;
};
// Specialized Stub_addend_reader for SHT_REL type relocation sections.
@@ -1071,7 +1070,8 @@ struct Stub_addend_reader<elfcpp::SHT_RELA, big_endian>
unsigned int,
const unsigned char*,
const typename Reloc_types<elfcpp::SHT_RELA, 32,
- big_endian>::Reloc& reloc) const;
+ big_endian>::Reloc& reloc) const
+ { return reloc.get_r_addend(); }
};
// Utilities for manipulating integers of up to 32-bits