diff options
Diffstat (limited to 'ld/emultempl')
| -rw-r--r-- | ld/emultempl/aix.em | 2 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 4 | ||||
| -rw-r--r-- | ld/emultempl/linux.em | 2 | ||||
| -rw-r--r-- | ld/emultempl/pe.em | 2 | ||||
| -rw-r--r-- | ld/emultempl/pep.em | 2 | ||||
| -rw-r--r-- | ld/emultempl/sunos.em | 6 | ||||
| -rw-r--r-- | ld/emultempl/vms.em | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em index 4dc36c3..5ccb25c 100644 --- a/ld/emultempl/aix.em +++ b/ld/emultempl/aix.em @@ -1426,7 +1426,7 @@ gld${EMULATION_NAME}_open_dynamic_archive (const char *arch, { char *path; - if (!entry->is_archive) + if (!entry->maybe_archive) return FALSE; path = concat (search->name, "/lib", entry->filename, arch, ".a", NULL); diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 1950efe..34cc82c7 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -1618,7 +1618,7 @@ gld${EMULATION_NAME}_open_dynamic_archive const char *filename; char *string; - if (! entry->is_archive) + if (! entry->maybe_archive) return FALSE; filename = entry->filename; @@ -1672,7 +1672,7 @@ gld${EMULATION_NAME}_open_dynamic_archive if (bfd_check_format (entry->the_bfd, bfd_object) && (entry->the_bfd->flags & DYNAMIC) != 0) { - ASSERT (entry->is_archive && entry->search_dirs_flag); + ASSERT (entry->maybe_archive && entry->search_dirs_flag); /* Rather than duplicating the logic above. Just use the filename we recorded earlier. */ diff --git a/ld/emultempl/linux.em b/ld/emultempl/linux.em index 2a2a960..db62830 100644 --- a/ld/emultempl/linux.em +++ b/ld/emultempl/linux.em @@ -62,7 +62,7 @@ gld${EMULATION_NAME}_open_dynamic_archive { char *string; - if (! entry->is_archive) + if (! entry->maybe_archive) return FALSE; string = (char *) xmalloc (strlen (search->name) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 24c1fe7..df0678d 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -2086,7 +2086,7 @@ gld_${EMULATION_NAME}_open_dynamic_archive unsigned int i; - if (! entry->is_archive) + if (! entry->maybe_archive) return FALSE; filename = entry->filename; diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index 444704b..4ab7489 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -1824,7 +1824,7 @@ gld_${EMULATION_NAME}_open_dynamic_archive unsigned int i; - if (! entry->is_archive) + if (! entry->maybe_archive) return FALSE; filename = entry->filename; 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); diff --git a/ld/emultempl/vms.em b/ld/emultempl/vms.em index f21796b..fb8fd53 100644 --- a/ld/emultempl/vms.em +++ b/ld/emultempl/vms.em @@ -52,7 +52,7 @@ gld${EMULATION_NAME}_open_dynamic_archive (const char *arch ATTRIBUTE_UNUSED, { char *string; - if (! entry->is_archive) + if (! entry->maybe_archive) return FALSE; string = (char *) xmalloc (strlen (search->name) |