From 64b1ae3731ea1d8ffe5bcd0a4b1046921c869fa4 Mon Sep 17 00:00:00 2001 From: Doug Kwan Date: Fri, 16 Oct 2009 18:34:53 +0000 Subject: [PATCH] 2009-10-16 Doug Kwan * output.cc (Output_segment::set_section_list_address): Cast expressions to unsigned long long type to avoid format warnings. --- gold/ChangeLog | 5 +++++ gold/output.cc | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index cb3254933cd..a18cf54ddff 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2009-10-16 Doug Kwan + + * output.cc (Output_segment::set_section_list_address): Cast + expressions to unsigned long long type to avoid format warnings. + 2009-10-15 Ian Lance Taylor * script.cc (Script_options::add_symbol_assignment): Always add a diff --git a/gold/output.cc b/gold/output.cc index e2d758520c2..29dad2b60e4 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -3503,15 +3503,20 @@ Output_segment::set_section_list_addresses(const Layout* layout, bool reset, else { Output_section* os = (*p)->output_section(); + + // Cast to unsigned long long to avoid format warnings. + unsigned long long previous_dot = + static_cast(addr + (off - startoff)); + unsigned long long dot = + static_cast((*p)->address()); + if (os == NULL) gold_error(_("dot moves backward in linker script " - "from 0x%llx to 0x%llx"), - addr + (off - startoff), (*p)->address()); + "from 0x%llx to 0x%llx"), previous_dot, dot); else gold_error(_("address of section '%s' moves backward " "from 0x%llx to 0x%llx"), - os->name(), addr + (off - startoff), - (*p)->address()); + os->name(), previous_dot, dot); } } (*p)->set_file_offset(off); -- 2.30.2