diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2010-12-06 00:07:06 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2010-12-06 00:07:06 +0000 |
| commit | b7f95647fd61692f386a504b17a32326259d54cf (patch) | |
| tree | f93957b0053cf4ed1ed0566bf7db2c29c3265b0a /ld/ldfile.c | |
| parent | cfac8028e44df8140ee4fa9a3d554b1df23e0c0c (diff) | |
| download | fsf-binutils-gdb-b7f95647fd61692f386a504b17a32326259d54cf.zip fsf-binutils-gdb-b7f95647fd61692f386a504b17a32326259d54cf.tar.gz fsf-binutils-gdb-b7f95647fd61692f386a504b17a32326259d54cf.tar.bz2 | |
Replace is_archive with maybe_archive.
2010-12-05 H.J. Lu <hongjiu.lu@intel.com>
* ldfile.c (ldfile_open_file_search): Check maybe_archive instead
of is_archive.
* emultempl/aix.em: Likewise.
* emultempl/elf32.em: Likewise.
* emultempl/linux.em: Likewise.
* emultempl/pe.em: Likewise.
* emultempl/pep.em: Likewise.
* emultempl/sunos.em: Likewise.
* emultempl/vms.em: Likewise.
* ldlang.c (new_afile): Set maybe_archive instead of is_archive..
* ldlang.h (lang_input_statement_struct): Replace is_archive
with maybe_archive.
Diffstat (limited to 'ld/ldfile.c')
| -rw-r--r-- | ld/ldfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c index 3d9feb5..a9a6954 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -370,7 +370,7 @@ ldfile_open_file_search (const char *arch, /* If this is not an archive, try to open it in the current directory first. */ - if (! entry->is_archive) + if (! entry->maybe_archive) { if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename)) { @@ -407,7 +407,7 @@ ldfile_open_file_search (const char *arch, } } - if (entry->is_archive) + if (entry->maybe_archive) string = concat (search->name, slash, lib, entry->filename, arch, suffix, (const char *) NULL); else |