* descriptors.cc (Descriptors::open): Report correct name in error

	message.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 4f5833b00b0fa9bcf3bbfd52e326d7db61a90501..ac910cd15d868215d31c577fb238e68b96a1d62e 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-14  Ian Lance Taylor  <iant@google.com>
+
+       * descriptors.cc (Descriptors::open): Report correct name in error
+       message.
+
 2010-07-13  Doug Kwan  <dougkwan@google.com>
 
        * arm.cc (Arm_input_section::Arm_input_section): For a

diff --git a/gold/descriptors.cc b/gold/descriptors.cc
index f4a02d03296caaf2cc1b6eeaf12204785b31ac12..db8ad6753dea4b921a479e3b17e909e0308724ac 100644 (file)
--- a/gold/descriptors.cc
+++ b/gold/descriptors.cc
@@ -113,8 +113,7 @@ Descriptors::open(int descriptor, const char* name, int flags, int mode)
              {
                Hold_lock hl(*this->lock_);
 
-               gold_error(_("file %s was removed during the link"),
-                          this->open_descriptors_[descriptor].name);
+               gold_error(_("file %s was removed during the link"), name);
              }
 
              errno = ENOENT;