diff options
Diffstat (limited to 'bfd/linker.c')
| -rw-r--r-- | bfd/linker.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bfd/linker.c b/bfd/linker.c index dec6d1d..86a7a19 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -1906,7 +1906,7 @@ _bfd_generic_final_link (bfd *abfd, struct bfd_link_info *info) if (! generic_add_output_symbol (abfd, &outsymalloc, NULL)) return FALSE; - if (info->relocatable) + if (bfd_link_relocatable (info)) { /* Allocate space for the output relocs for each section. */ for (o = abfd->sections; o != NULL; o = o->next) @@ -2210,7 +2210,7 @@ _bfd_generic_link_output_symbols (bfd *output_bfd, break; case discard_sec_merge: output = TRUE; - if (info->relocatable + if (bfd_link_relocatable (info) || ! (sym->section->flags & SEC_MERGE)) break; /* FALLTHROUGH */ @@ -2380,7 +2380,7 @@ _bfd_generic_reloc_link_order (bfd *abfd, { arelent *r; - if (! info->relocatable) + if (! bfd_link_relocatable (info)) abort (); if (sec->orelocation == NULL) abort (); @@ -2611,7 +2611,7 @@ default_indirect_link_order (bfd *output_bfd, BFD_ASSERT (input_section->output_offset == link_order->offset); BFD_ASSERT (input_section->size == link_order->size); - if (info->relocatable + if (bfd_link_relocatable (info) && input_section->reloc_count > 0 && output_section->orelocation == NULL) { @@ -2705,7 +2705,7 @@ default_indirect_link_order (bfd *output_bfd, goto error_return; new_contents = (bfd_get_relocated_section_contents (output_bfd, info, link_order, contents, - info->relocatable, + bfd_link_relocatable (info), _bfd_generic_link_get_symbols (input_bfd))); if (!new_contents) goto error_return; |