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.
This commit is contained in:
Doug Kwan
2010-03-26 04:53:34 +00:00
parent 6c28cbf2b6
commit 4fcd97eb15
2 changed files with 10 additions and 4 deletions

View File

@ -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> 2010-03-24 Ian Lance Taylor <iant@google.com>
* testsuite/script_test_3.t: Add a TLS segment. * testsuite/script_test_3.t: Add a TLS segment.

View File

@ -5206,10 +5206,11 @@ Arm_exidx_fixup::update_offset_map(
{ {
if (this->section_offset_map_ == NULL) if (this->section_offset_map_ == NULL)
this->section_offset_map_ = new Arm_exidx_section_offset_map(); this->section_offset_map_ = new Arm_exidx_section_offset_map();
section_offset_type output_offset = section_offset_type output_offset;
(delete_entry if (delete_entry)
? Arm_exidx_input_section::invalid_offset output_offset = Arm_exidx_input_section::invalid_offset;
: input_offset - deleted_bytes); else
output_offset = input_offset - deleted_bytes;
(*this->section_offset_map_)[input_offset] = output_offset; (*this->section_offset_map_)[input_offset] = output_offset;
} }