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/emultempl/sunos.em | |
| 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/emultempl/sunos.em')
| -rw-r--r-- | ld/emultempl/sunos.em | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em index bbd6075..5c6c0a6 100644 --- a/ld/emultempl/sunos.em +++ b/ld/emultempl/sunos.em @@ -157,7 +157,7 @@ gld${EMULATION_NAME}_find_so (lang_input_statement_type *inp) struct stat st; if (! inp->search_dirs_flag - || ! inp->is_archive + || ! inp->maybe_archive || ! inp->dynamic) return; @@ -889,7 +889,7 @@ gld${EMULATION_NAME}_count_need (lang_input_statement_type *inp) { ++need_entries; need_size += NEED_ENTRY_SIZE; - if (! inp->is_archive) + if (! inp->maybe_archive) need_size += strlen (inp->filename) + 1; else { @@ -917,7 +917,7 @@ gld${EMULATION_NAME}_set_need (lang_input_statement_type *inp) referential locality. */ bfd_put_32 (link_info.output_bfd, need_pnames - need_contents, need_pinfo); - if (! inp->is_archive) + if (! inp->maybe_archive) { bfd_put_32 (link_info.output_bfd, (bfd_vma) 0, need_pinfo + 4); bfd_put_16 (link_info.output_bfd, (bfd_vma) 0, need_pinfo + 8); |