From Craig Silverstein: Fix error message, add this->.

diff --git a/gold/merge.h b/gold/merge.h
index adafb0bc389f5e38a82c5ea7b4c42ea66e3fbe5b..529037c6941f4f89381ffcf84d662e45d8c2efab 100644 (file)
--- a/gold/merge.h
+++ b/gold/merge.h
@@ -243,7 +243,7 @@ class Output_merge_string : public Output_merge_base
   // Clears all the data in the stringpool, to save on memory.
   void
   clear_stringpool()
-  { stringpool_.clear(); }
+  { this->stringpool_.clear(); }
 
  private:
   // As we see input sections, we build a mapping from object, section

diff --git a/gold/options.cc b/gold/options.cc
index f5fc8dab351d43bd10dacf5c6bed568219ca361d..20ddc6ad386aadeb16adec2dabc2423358d45ddd 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -386,7 +386,7 @@ options::Command_line_options::options[] =
                  "(default is none)"),
               N_("--compress-debug-sections=[none" ZLIB_STR "]"),
               TWO_DASHES,
-              &General_options::set_compress_debug_symbols),
+              &General_options::set_compress_debug_sections),
   GENERAL_NOARG('\0', "demangle", N_("Demangle C++ symbols in log messages"),
                 NULL, TWO_DASHES, &General_options::set_demangle),
   GENERAL_NOARG('\0', "no-demangle",

diff --git a/gold/options.h b/gold/options.h
index 776d3db3ebb67708134ace8566a55493149863b4..9cb317e54f0214f889ed1eef0c900d85660e9bea 100644 (file)
--- a/gold/options.h
+++ b/gold/options.h
@@ -365,7 +365,7 @@ class General_options
   set_symbolic()
   { this->symbolic_ = true; }
 
-  void set_compress_debug_symbols(const char* arg)
+  void set_compress_debug_sections(const char* arg)
   {
     if (strcmp(arg, "none") == 0)
       this->compress_debug_sections_ = NO_COMPRESSION;
@@ -374,7 +374,7 @@ class General_options
       this->compress_debug_sections_ = ZLIB_COMPRESSION;
 #endif
     else
-      gold_fatal(_("unsupported argument to --compress-debug-symbols: %s"),
+      gold_fatal(_("unsupported argument to --compress-debug-sections: %s"),
                  arg);
   }