diff options
Diffstat (limited to 'bfd/elf32-s390.c')
| -rw-r--r-- | bfd/elf32-s390.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 7285ad6997..d3f87469ba 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -4171,12 +4171,14 @@ elf_s390_plt_sym_val (bfd_vma i, const asection *plt, object file when linking. */ static bfd_boolean -elf32_s390_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +elf32_s390_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; + if (!is_s390_elf (ibfd) || !is_s390_elf (obfd)) return TRUE; - if (!elf_s390_merge_obj_attributes (ibfd, obfd)) + if (!elf_s390_merge_obj_attributes (ibfd, info)) return FALSE; elf_elfheader (obfd)->e_flags |= elf_elfheader (ibfd)->e_flags; |