aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/dirsearch.cc5
2 files changed, 7 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 28ade01..4ac6808 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-02 Ian Lance Taylor <iant@google.com>
+
+ * dirsearch.cc (Dir_cache::read_files): Ignore ENOTDIR errors.
+
2011-07-01 Ian Lance Taylor <iant@google.com>
PR gold/12525
diff --git a/gold/dirsearch.cc b/gold/dirsearch.cc
index a149db5..1ae2055 100644
--- a/gold/dirsearch.cc
+++ b/gold/dirsearch.cc
@@ -66,8 +66,9 @@ Dir_cache::read_files()
DIR* d = opendir(this->dirname_);
if (d == NULL)
{
- // We ignore directories which do not exist.
- if (errno != ENOENT)
+ // We ignore directories which do not exist or are actually file
+ // names.
+ if (errno != ENOENT && errno != ENOTDIR)
gold::gold_error(_("%s: can not read directory: %s"),
this->dirname_, strerror(errno));
return;