* mapfile.cc (Mapfile::print_input_section): Change -1U to -1ULL.

* object.cc (Sized_relobj::do_layout): Use constant invalid_address
	instead of -1U.
	(Sized_relobj::do_finalize_local_symbols): Likewise.
	(Sized_relobj::map_to_kept_section): Likewise.
	* object.h (Sized_relobj::invalid_address): New constant.
	(Sized_relobj::do_output_section_offset): Check for invalid_address
	and return -1ULL.
	* output.cc (Output_reloc::local_section_offset): Use constant
	invalid_address instead of -1U.
	(Output_reloc::get_address): Likewise.
	(Output_section::output_address): Change -1U to -1ULL.
	* output.h (Output_reloc::invalid_address): New constant.
	* reloc.cc (Sized_relobj::write_sections): Use constant
	invalid_address instead of -1U.
	(Sized_relobj::relocate_sections): Likewise.
	* symtab.cc (Symbol_table::sized_finalize_symbol): Handle symbol
	values for merge sections.
	* target-reloc.h (relocate_for_relocatable): Use constant
	invalid_address instead of -1U.
This commit is contained in:
Cary Coutant
2008-09-29 21:10:26 +00:00
parent 1927a18f31
commit eff458138e
9 changed files with 75 additions and 33 deletions

View File

@@ -450,6 +450,7 @@ relocate_for_relocatable(
typedef typename Reloc_types<sh_type, size, big_endian>::Reloc_write
Reltype_write;
const int reloc_size = Reloc_types<sh_type, size, big_endian>::reloc_size;
const Address invalid_address = static_cast<Address>(0) - 1;
Sized_relobj<size, big_endian>* const object = relinfo->object;
const unsigned int local_count = object->local_symbol_count();
@@ -524,7 +525,7 @@ relocate_for_relocatable(
Address offset = reloc.get_r_offset();
Address new_offset;
if (offset_in_output_section != -1U)
if (offset_in_output_section != invalid_address)
new_offset = offset + offset_in_output_section;
else
{
@@ -543,7 +544,7 @@ relocate_for_relocatable(
if (!parameters->options().relocatable())
{
new_offset += view_address;
if (offset_in_output_section != -1U)
if (offset_in_output_section != invalid_address)
new_offset -= offset_in_output_section;
}