aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/arm.cc2
2 files changed, 7 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index ed61c25..c9ecbe7 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-21 Doug Kwan <dougkwan@google.com>
+
+ PR gold/11619
+ * arm.cc (Arm_input_section::do_output_offset): Add a cast to
+ avoid a compilation error.
+
2010-05-19 Rafael Espindola <espindola@google.com>
* script-sections.cc (Output_section_definition::allocate_to_segment):
diff --git a/gold/arm.cc b/gold/arm.cc
index 3dc2f22..31454e9 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -1202,7 +1202,7 @@ class Arm_input_section : public Output_relaxed_input_section
if ((object == this->relobj())
&& (shndx == this->shndx())
&& (offset >= 0)
- && (offset <= this->original_size_))
+ && (offset <= static_cast<section_offset_type>(this->original_size_)))
{
*poutput = offset;
return true;