diff options
Diffstat (limited to 'bfd/elf-s390-common.c')
| -rw-r--r-- | bfd/elf-s390-common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bfd/elf-s390-common.c b/bfd/elf-s390-common.c index 2170da0..61241dc 100644 --- a/bfd/elf-s390-common.c +++ b/bfd/elf-s390-common.c @@ -259,8 +259,9 @@ elf_s390_elf_sort_relocs_p (asection *sec) /* Merge object attributes from IBFD into OBFD. Raise an error if there are conflicting attributes. */ static bfd_boolean -elf_s390_merge_obj_attributes (bfd *ibfd, bfd *obfd) +elf_s390_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; obj_attribute *in_attr, *in_attrs; obj_attribute *out_attr, *out_attrs; @@ -309,7 +310,7 @@ elf_s390_merge_obj_attributes (bfd *ibfd, bfd *obfd) } /* Merge Tag_compatibility attributes and any common GNU ones. */ - _bfd_elf_merge_object_attributes (ibfd, obfd); + _bfd_elf_merge_object_attributes (ibfd, info); return TRUE; } |