gcc 4.1.0 portability fixes.

diff --git a/gold/layout.h b/gold/layout.h
index 527d2da1f7686d6936bef86cbc06ba3fe31c6d60..89ad8c497064253a38d4aaf7331331508b49e959 100644 (file)
--- a/gold/layout.h
+++ b/gold/layout.h
@@ -154,8 +154,7 @@ class Layout
 
   // Return whether SEG1 comes before SEG2 in the output file.
   static bool
-  Layout::segment_precedes(const Output_segment* seg1,
-                          const Output_segment* seg2);
+  segment_precedes(const Output_segment* seg1, const Output_segment* seg2);
 
   // Map from section flags to segment flags.
   static elfcpp::Elf_Word

diff --git a/gold/stringpool.cc b/gold/stringpool.cc
index 9a709e00d8978e71fa64d0b9a8257837fbd7057f..6437d015ce30eef415e47f093e33fd364d404f40 100644 (file)
--- a/gold/stringpool.cc
+++ b/gold/stringpool.cc
@@ -31,7 +31,7 @@ Stringpool::Stringpool_hash::operator()(const char* s) const
   // Fowler/Noll/Vo (FNV) hash (type FNV-1a).
   if (sizeof(size_t) == 8)
     {
-      size_t result = 14695981039346656037ULL;
+      size_t result = static_cast<size_t>(14695981039346656037ULL);
       while (*s != '\0')
        {
          result &= (size_t) *s++;