X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Ferrors.h;h=5602a76d85c54ce11a86c59bba6c942e0ead3297;hb=8c45011acd7a589c306e74563d00fb3fa5c14bbd;hp=17b72e10b368b5da6619bb5c19b8ba38e7ba8a13;hpb=c79126688f8211ab17a893c5e80b09811d424fc1;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/errors.h b/gold/errors.h
index 17b72e10b3..5602a76d85 100644
--- a/gold/errors.h
+++ b/gold/errors.h
@@ -1,6 +1,6 @@
 // errors.h -- handle errors for gold  -*- C++ -*-
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2006-2020 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -24,6 +24,7 @@
 #define GOLD_ERRORS_H
 
 #include <cstdarg>
+#include <string>
 
 #include "gold-threads.h"
 
@@ -49,6 +50,12 @@ class Errors
   void
   fatal(const char* format, va_list) ATTRIBUTE_NORETURN;
 
+  // Report a fallback error.  After printing the error, this must exit
+  // with a special status code indicating that fallback to
+  // --incremental-full is required.
+  void
+  fallback(const char* format, va_list) ATTRIBUTE_NORETURN;
+
   // Report an error and continue.
   void
   error(const char* format, va_list);
@@ -57,6 +64,10 @@ class Errors
   void
   warning(const char* format, va_list);
 
+  // Print an informational message and continue.
+  void
+  info(const char* format, va_list);
+
   // Report an error at a reloc location.
   template<int size, bool big_endian>
   void
@@ -71,14 +82,10 @@ class Errors
 		      size_t relnum, off_t reloffset,
 		      const char* format, va_list);
 
-  // Issue an undefined symbol error.  SYM is the undefined symbol.
-  // RELINFO is the general relocation info.  RELNUM is the number of
-  // the reloc, and RELOFFSET is the reloc's offset.
-  template<int size, bool big_endian>
+  // Issue an undefined symbol error.  LOCATION is the location of
+  // the error (typically an object file name or relocation info).
   void
-  undefined_symbol(const Symbol* sym,
-		   const Relocate_info<size, big_endian>* relinfo,
-		   size_t relnum, off_t reloffset);
+  undefined_symbol(const Symbol* sym, const std::string& location);
 
   // Report a debugging message.
   void
@@ -89,16 +96,25 @@ class Errors
   error_count() const
   { return this->error_count_; }
 
+  // Return the number of warnings.
+  int
+  warning_count() const
+  { return this->warning_count_; }
+
  private:
   Errors(const Errors&);
   Errors& operator=(const Errors&);
 
   // Initialize the lock.  We don't do this in the constructor because
   // lock initialization wants to know whether we are using threads or
-  // not.
-  void
+  // not.  This returns true if the lock is now initialized.
+  bool
   initialize_lock();
 
+  // Increment a counter, holding the lock.
+  void
+  increment_counter(int*);
+
   // The number of times we report an undefined symbol.
   static const int max_undefined_error_report = 5;
 
@@ -107,6 +123,8 @@ class Errors
   // This class can be accessed from multiple threads.  This lock is
   // used to control access to the data structures.
   Lock* lock_;
+  // Used to initialize the lock_ field exactly once.
+  Initialize_lock initialize_lock_;
   // Numbers of errors reported.
   int error_count_;
   // Number of warnings reported.