2010-03-25 Doug Kwan <dougkwan@google.com>

	* gold/arm.cc (Arm_exidx_fixup::update_offset_map): Rearrange code
	to avoid a conversion warning on a 32-bit host.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index d8b8d79..0688cdd 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-25  Doug Kwan  <dougkwan@google.com>
+
+       * gold/arm.cc (Arm_exidx_fixup::update_offset_map): Rearrange code
+       to avoid a conversion warning on a 32-bit host.
+
 2010-03-24  Ian Lance Taylor  <iant@google.com>
 
        * testsuite/script_test_3.t: Add a TLS segment.

diff --git a/gold/arm.cc b/gold/arm.cc
index 890646e..aac5f75 100644 (file)
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -5206,10 +5206,11 @@ Arm_exidx_fixup::update_offset_map(
 {
   if (this->section_offset_map_ == NULL)
     this->section_offset_map_ = new Arm_exidx_section_offset_map();
-  section_offset_type output_offset =
-    (delete_entry
-     ? Arm_exidx_input_section::invalid_offset
-     : input_offset - deleted_bytes);
+  section_offset_type output_offset;
+  if (delete_entry)
+    output_offset = Arm_exidx_input_section::invalid_offset;
+  else
+    output_offset = input_offset - deleted_bytes;
   (*this->section_offset_map_)[input_offset] = output_offset;
 }