daily update

[deliverable/binutils-gdb.git] / gold / errors.cc

diff --git a/gold/errors.cc b/gold/errors.cc
index d45d6a58b6153f963b90bc4cae89b3f21c4d9da8..618f9cd643e5e3bd01efe5029fd6a80abe72a64b 100644 (file)
--- a/gold/errors.cc
+++ b/gold/errors.cc
@@ -39,8 +39,8 @@ namespace gold
 const int Errors::max_undefined_error_report;
 
 Errors::Errors(const char* program_name)
-  : program_name_(program_name), lock_(NULL), 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_()
 {
 }
 
@@ -53,9 +53,7 @@ Errors::Errors(const char* program_name)
 bool
 Errors::initialize_lock()
 {
-  if (this->lock_ == NULL && parameters->options_valid())
-    this->lock_ = new Lock;
-  return this->lock_ != NULL;
+  return this->initialize_lock_.initialize();
 }
 
 // Increment a counter, holding the lock if available.