diff options
| author | Ian Lance Taylor <ian@airs.com> | 2011-07-03 04:16:13 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2011-07-03 04:16:13 +0000 |
| commit | ae3a6d4fa3cfdf9daa38946945b2a6aa0c0e9fa8 (patch) | |
| tree | d60d9d7e627fc95eeaa1cdcb7a6e2e0905cbc6f8 | |
| parent | 85deb06ad204f352c9536e73a47791c3cd173d7c (diff) | |
| download | binutils-gdb-ae3a6d4fa3cfdf9daa38946945b2a6aa0c0e9fa8.tar.gz | |
* dirsearch.cc (Dir_cache::read_files): Ignore ENOTDIR errors.
| -rw-r--r-- | gold/ChangeLog | 4 | ||||
| -rw-r--r-- | gold/dirsearch.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 28ade01341b..4ac6808a412 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 a149db527d8..1ae2055dc46 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; |