From 783659f926cc0c9a76d12590b01c75fd0caa58bb Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 14 Jul 2010 10:38:59 +0000
Subject: [PATCH] 	* descriptors.cc (Descriptors::open): Report correct
 name in error 	message.

---
 gold/ChangeLog      | 5 +++++
 gold/descriptors.cc | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 4f5833b00b..ac910cd15d 100644
--- 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 f4a02d0329..db8ad6753d 100644
--- 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;