X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Ferrors.cc;h=8c6c8246afd468bcb749b30afc120627e0aa3647;hb=d3ecddab5fc036fb57588a9bfff73575dc419052;hp=3aa3ece89729bd2db535ac1a4fbbd41225dbb70b;hpb=75f2446ec3c13eca3fe0c7cfdbb232e760d36596;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/errors.cc b/gold/errors.cc
index 3aa3ece897..8c6c8246af 100644
--- a/gold/errors.cc
+++ b/gold/errors.cc
@@ -1,6 +1,6 @@
 // errors.cc -- handle errors for gold
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2006-2019 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -39,20 +39,60 @@ namespace gold
 const int Errors::max_undefined_error_report;
 
 Errors::Errors(const char* program_name)
-  : program_name_(program_name), lock_(), error_count_(0), warning_count_(0),
-    undefined_symbols_()
+  : program_name_(program_name), lock_(NULL), initialize_lock_(&this->lock_),
+    error_count_(0), warning_count_(0), undefined_symbols_()
 {
 }
 
+// Initialize the lock_ field.  If we have not yet processed the
+// parameters, then we can't initialize, since we don't yet know
+// whether we are using threads.  That is OK, since if we haven't
+// processed the parameters, we haven't created any threads, and we
+// don't need a lock.  Return true if the lock is now initialized.
+
+bool
+Errors::initialize_lock()
+{
+  return this->initialize_lock_.initialize();
+}
+
+// Increment a counter, holding the lock if available.
+
+void
+Errors::increment_counter(int *counter)
+{
+  if (!this->initialize_lock())
+    {
+      // The lock does not exist, which means that we don't need it.
+      ++*counter;
+    }
+  else
+    {
+      Hold_lock h(*this->lock_);
+      ++*counter;
+    }
+}
+
 // Report a fatal error.
 
 void
 Errors::fatal(const char* format, va_list args)
 {
-  fprintf(stderr, "%s: ", this->program_name_);
+  fprintf(stderr, _("%s: fatal error: "), this->program_name_);
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
-  gold_exit(false);
+  gold_exit(GOLD_ERR);
+}
+
+// Report a fallback error.
+
+void
+Errors::fallback(const char* format, va_list args)
+{
+  fprintf(stderr, _("%s: fatal error: "), this->program_name_);
+  vfprintf(stderr, format, args);
+  fputc('\n', stderr);
+  gold_exit(GOLD_FALLBACK);
 }
 
 // Report an error.
@@ -60,13 +100,11 @@ Errors::fatal(const char* format, va_list args)
 void
 Errors::error(const char* format, va_list args)
 {
-  fprintf(stderr, "%s: ", this->program_name_);
+  fprintf(stderr, _("%s: error: "), this->program_name_);
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
-  {
-    Hold_lock h(this->lock_);
-    ++this->error_count_;
-  }
+
+  this->increment_counter(&this->error_count_);
 }
 
 // Report a warning.
@@ -77,10 +115,17 @@ Errors::warning(const char* format, va_list args)
   fprintf(stderr, _("%s: warning: "), this->program_name_);
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
-  {
-    Hold_lock h(this->lock_);
-    ++this->warning_count_;
-  }
+
+  this->increment_counter(&this->warning_count_);
+}
+
+// Print an informational message.
+
+void
+Errors::info(const char* format, va_list args)
+{
+  vfprintf(stderr, format, args);
+  fputc('\n', stderr);
 }
 
 // Report an error at a reloc location.
@@ -91,14 +136,12 @@ Errors::error_at_location(const Relocate_info<size, big_endian>* relinfo,
 			  size_t relnum, off_t reloffset,
 			  const char* format, va_list args)
 {
-  fprintf(stderr, "%s: %s: ", this->program_name_,
+  fprintf(stderr, _("%s: error: "),
 	  relinfo->location(relnum, reloffset).c_str());
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
-  {
-    Hold_lock h(this->lock_);
-    ++this->error_count_;
-  }
+
+  this->increment_counter(&this->error_count_);
 }
 
 // Report a warning at a reloc location.
@@ -109,35 +152,71 @@ Errors::warning_at_location(const Relocate_info<size, big_endian>* relinfo,
 			    size_t relnum, off_t reloffset,
 			    const char* format, va_list args)
 {
-  fprintf(stderr, _("%s: %s: warning: "), this->program_name_,
+  fprintf(stderr, _("%s: warning: "), 
 	  relinfo->location(relnum, reloffset).c_str());
   vfprintf(stderr, format, args);
   fputc('\n', stderr);
-  {
-    Hold_lock h(this->lock_);
-    ++this->warning_count_;
-  }
+
+  this->increment_counter(&this->warning_count_);
 }
 
-// Issue an undefined symbol error.
+// Issue an undefined symbol error with a caller-supplied location string.
 
-template<int size, bool big_endian>
 void
-Errors::undefined_symbol(const Symbol* sym,
-			 const Relocate_info<size, big_endian>* relinfo,
-			 size_t relnum, off_t reloffset)
+Errors::undefined_symbol(const Symbol* sym, const std::string& location)
 {
+  bool initialized = this->initialize_lock();
+  gold_assert(initialized);
+
+  const char* zmsg;
   {
-    Hold_lock h(this->lock_);
+    Hold_lock h(*this->lock_);
     if (++this->undefined_symbols_[sym] >= max_undefined_error_report)
       return;
-    ++this->error_count_;
+    if (parameters->options().warn_unresolved_symbols())
+      {
+	++this->warning_count_;
+	zmsg = _("warning");
+      }
+    else
+      {
+	++this->error_count_;
+	zmsg = _("error");
+      }
   }
-  fprintf(stderr, _("%s: %s: undefined reference to '%s'\n"),
-	  this->program_name_, relinfo->location(relnum, reloffset).c_str(),
-	  sym->name());
+
+  const char* const version = sym->version();
+  if (version == NULL)
+    fprintf(stderr, _("%s: %s: undefined reference to '%s'\n"),
+	    location.c_str(), zmsg, sym->demangled_name().c_str());
+  else
+    fprintf(stderr,
+            _("%s: %s: undefined reference to '%s', version '%s'\n"),
+	    location.c_str(), zmsg, sym->demangled_name().c_str(), version);
+
+  if (sym->is_cxx_vtable())
+    gold_info(_("%s: the vtable symbol may be undefined because "
+		"the class is missing its key function"),
+	      program_name);
+  if (sym->is_placeholder())
+    gold_info(_("%s: the symbol should have been defined by a plugin"),
+	      program_name);
 }
 
+// Issue a debugging message.
+
+void
+Errors::debug(const char* format, ...)
+{
+  fprintf(stderr, _("%s: "), this->program_name_);
+
+  va_list args;
+  va_start(args, format);
+  vfprintf(stderr, format, args);
+  va_end(args);
+
+  fputc('\n', stderr);
+}
 
 // The functions which the rest of the code actually calls.
 
@@ -152,6 +231,17 @@ gold_fatal(const char* format, ...)
   va_end(args);
 }
 
+// Report a fallback error.
+
+void
+gold_fallback(const char* format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  parameters->errors()->fallback(format, args);
+  va_end(args);
+}
+
 // Report an error.
 
 void
@@ -174,6 +264,17 @@ gold_warning(const char* format, ...)
   va_end(args);
 }
 
+// Print an informational message.
+
+void
+gold_info(const char* format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  parameters->errors()->info(format, args);
+  va_end(args);
+}
+
 // Report an error at a location.
 
 template<int size, bool big_endian>
@@ -206,13 +307,22 @@ gold_warning_at_location(const Relocate_info<size, big_endian>* relinfo,
 
 // Report an undefined symbol.
 
+void
+gold_undefined_symbol(const Symbol* sym)
+{
+  parameters->errors()->undefined_symbol(sym, sym->object()->name().c_str());
+}
+
+// Report an undefined symbol at a reloc location
+
 template<int size, bool big_endian>
 void
-gold_undefined_symbol(const Symbol* sym,
+gold_undefined_symbol_at_location(const Symbol* sym,
 		      const Relocate_info<size, big_endian>* relinfo,
 		      size_t relnum, off_t reloffset)
 {
-  parameters->errors()->undefined_symbol(sym, relinfo, relnum, reloffset);
+  parameters->errors()->undefined_symbol(sym,
+                                         relinfo->location(relnum, reloffset));
 }
 
 #ifdef HAVE_TARGET_32_LITTLE
@@ -282,33 +392,37 @@ gold_warning_at_location<64, true>(const Relocate_info<64, true>* relinfo,
 #ifdef HAVE_TARGET_32_LITTLE
 template
 void
-gold_undefined_symbol<32, false>(const Symbol* sym,
-				 const Relocate_info<32, false>* relinfo,
-				 size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<32, false>(
+    const Symbol* sym,
+    const Relocate_info<32, false>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 #ifdef HAVE_TARGET_32_BIG
 template
 void
-gold_undefined_symbol<32, true>(const Symbol* sym,
-				const Relocate_info<32, true>* relinfo,
-				size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<32, true>(
+    const Symbol* sym,
+    const Relocate_info<32, true>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 #ifdef HAVE_TARGET_64_LITTLE
 template
 void
-gold_undefined_symbol<64, false>(const Symbol* sym,
-				 const Relocate_info<64, false>* relinfo,
-				 size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<64, false>(
+    const Symbol* sym,
+    const Relocate_info<64, false>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 #ifdef HAVE_TARGET_64_BIG
 template
 void
-gold_undefined_symbol<64, true>(const Symbol* sym,
-				const Relocate_info<64, true>* relinfo,
-				size_t relnum, off_t reloffset);
+gold_undefined_symbol_at_location<64, true>(
+    const Symbol* sym,
+    const Relocate_info<64, true>* relinfo,
+    size_t relnum, off_t reloffset);
 #endif
 
 } // End namespace gold.