From Craig Silverstein: avoid some signed/unsigned warnings from gcc 4.2.

diff --git a/gold/archive.cc b/gold/archive.cc
index bbd24c8b5256e7d8605540110721f011a72c5b90..d80718db75839de4c3bffbeea985dd75d819f9ab 100644 (file)
--- a/gold/archive.cc
+++ b/gold/archive.cc
@@ -334,7 +334,7 @@ Archive::include_all_members(Symbol_table* symtab, Layout* layout,
   off_t filesize = this->input_file_->file().filesize();
   while (true)
     {
-      if (filesize - off < sizeof(Archive_header))
+      if (filesize - off < static_cast<off_t>(sizeof(Archive_header)))
         {
           if (filesize != off)
             {
@@ -381,7 +381,7 @@ Archive::include_member(Symbol_table* symtab, Layout* layout,
   std::string n;
   this->read_header(off, &n);
 
-  size_t memoff = off + sizeof(Archive_header);
+  const off_t memoff = off + static_cast<off_t>(sizeof(Archive_header));
 
   // Read enough of the file to pick up the entire ELF header.
   unsigned char ehdr_buf[elfcpp::Elf_sizes<64>::ehdr_size];

diff --git a/gold/dynobj.cc b/gold/dynobj.cc
index 09e71263ac8f2200ef665af8968757f1fd476191..581772086de55aa5b46901167d49c30b85f41084 100644 (file)
--- a/gold/dynobj.cc
+++ b/gold/dynobj.cc
@@ -629,7 +629,7 @@ Sized_dynobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
 
   const int sym_size = This::sym_size;
   const size_t symcount = sd->symbols_size / sym_size;
-  if (symcount * sym_size != sd->symbols_size)
+  if (static_cast<off_t>(symcount * sym_size) != sd->symbols_size)
     {
       fprintf(stderr,
              _("%s: %s: size of dynamic symbols is not "

diff --git a/gold/layout.cc b/gold/layout.cc
index 83c8c6a025587200936bb66e321463b006ba194c..9dad4b09142a0edadbf427b85e23cabb974c03de 100644 (file)
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -891,7 +891,7 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
       off_t locsize = dyn_global_index * this->dynsym_section_->entsize();
       dynoff = this->dynsym_section_->offset() + locsize;
       dyncount = (this->dynsym_section_->data_size() - locsize) / symsize;
-      gold_assert(dyncount * symsize
+      gold_assert(static_cast<off_t>(dyncount * symsize)
                  == this->dynsym_section_->data_size() - locsize);
     }
 

diff --git a/gold/object.cc b/gold/object.cc
index 305190923c5f37f91fec16f7a7519f1a2410fc04..2dbd0f25e1f7af896a1ae98112ce976ca03632fc 100644 (file)
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -502,7 +502,7 @@ Sized_relobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
 
   const int sym_size = This::sym_size;
   size_t symcount = sd->symbols_size / sym_size;
-  if (symcount * sym_size != sd->symbols_size)
+  if (static_cast<off_t>(symcount * sym_size) != sd->symbols_size)
     {
       fprintf(stderr,
              _("%s: %s: size of symbols is not multiple of symbol size\n"),

diff --git a/gold/reloc.cc b/gold/reloc.cc
index ad3bb05ea4114a0bd0e7c1fdf9fde787d99f03b1..bf4b2d66ead92a6dbf4c1fcec9db20b8c45d0e20 100644 (file)
--- a/gold/reloc.cc
+++ b/gold/reloc.cc
@@ -231,7 +231,7 @@ Sized_relobj<size, big_endian>::do_read_relocs(Read_relocs_data* rd)
        }
 
       size_t reloc_count = sh_size / reloc_size;
-      if (reloc_count * reloc_size != sh_size)
+      if (static_cast<off_t>(reloc_count * reloc_size) != sh_size)
        {
          fprintf(stderr, _("%s: %s: reloc section %u size %lu uneven"),
                  program_name, this->name().c_str(), i,
@@ -478,7 +478,7 @@ Sized_relobj<size, big_endian>::relocate_sections(
        }
 
       size_t reloc_count = sh_size / reloc_size;
-      if (reloc_count * reloc_size != sh_size)
+      if (static_cast<off_t>(reloc_count * reloc_size) != sh_size)
        {
          fprintf(stderr, _("%s: %s: reloc section %u size %lu uneven"),
                  program_name, this->name().c_str(), i,