daily update

[deliverable/binutils-gdb.git] / gold / output.cc

diff --git a/gold/output.cc b/gold/output.cc
index e2d758520c28e29e07dd48d48a22f7860f20da27..29dad2b60e49aa88ffd10f471d56cb7d2e527f7d 100644 (file)
--- 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<unsigned long long>(addr + (off - startoff));
+                 unsigned long long dot =
+                   static_cast<unsigned long long>((*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);