diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-11-02 15:15:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-02 15:15:13 -0700 |
| commit | 12e6cad12d7085998eb3a784d567789ee3f9963b (patch) | |
| tree | 83f68003c49aa55efab0c244a8f76698435f4a36 /binutils-2.22/gold/arm.cc | |
| parent | 80bb05fa94a6c9e54fc36d1966562c777708897e (diff) | |
| parent | c898b73f6471a17e908c56becb8c102cf447d639 (diff) | |
| download | toolchain_binutils-12e6cad12d7085998eb3a784d567789ee3f9963b.tar.gz toolchain_binutils-12e6cad12d7085998eb3a784d567789ee3f9963b.tar.bz2 toolchain_binutils-12e6cad12d7085998eb3a784d567789ee3f9963b.zip | |
Merge "[2.22.90] Fix binutils-2.22/gold build in mingw"
Diffstat (limited to 'binutils-2.22/gold/arm.cc')
| -rw-r--r-- | binutils-2.22/gold/arm.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/binutils-2.22/gold/arm.cc b/binutils-2.22/gold/arm.cc index fa257a79..c93331c5 100644 --- a/binutils-2.22/gold/arm.cc +++ b/binutils-2.22/gold/arm.cc @@ -9683,7 +9683,7 @@ Target_arm<big_endian>::relocate_special_relocatable( Arm_address offset = reloc.get_r_offset(); Arm_address new_offset; - if (offset_in_output_section != invalid_address) + if (offset_in_output_section != static_cast<off_t>(invalid_address)) new_offset = offset + offset_in_output_section; else { @@ -9702,8 +9702,8 @@ Target_arm<big_endian>::relocate_special_relocatable( if (!parameters->options().relocatable()) { new_offset += view_address; - if (offset_in_output_section != invalid_address) - new_offset -= offset_in_output_section; + if (offset_in_output_section != static_cast<off_t>(invalid_address)) + new_offset -= offset_in_output_section; } reloc_write.put_r_offset(new_offset); |