diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-s390.c | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 75574a7fc5..470610ee8d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-01-21 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> + + * elf32-s390.c (elf32_s390_merge_private_bfd_data): New function. + (bfd_elf32_bfd_merge_private_bfd_data): New macro definition. + 2010-01-19 Cary Coutant <ccoutant@google.com> * dwarf2.c (read_attribute_value): Add DW_FORM_ref_sig8. diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 094a8dc38d..41178d6833 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -3483,6 +3483,13 @@ elf_s390_plt_sym_val (bfd_vma i, const asection *plt, return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE; } +static bfd_boolean +elf32_s390_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +{ + elf_elfheader (obfd)->e_flags |= elf_elfheader (ibfd)->e_flags; + return TRUE; +} + #define TARGET_BIG_SYM bfd_elf32_s390_vec #define TARGET_BIG_NAME "elf32-s390" @@ -3506,6 +3513,8 @@ elf_s390_plt_sym_val (bfd_vma i, const asection *plt, #define bfd_elf32_bfd_reloc_type_lookup elf_s390_reloc_type_lookup #define bfd_elf32_bfd_reloc_name_lookup elf_s390_reloc_name_lookup +#define bfd_elf32_bfd_merge_private_bfd_data elf32_s390_merge_private_bfd_data + #define elf_backend_adjust_dynamic_symbol elf_s390_adjust_dynamic_symbol #define elf_backend_check_relocs elf_s390_check_relocs #define elf_backend_copy_indirect_symbol elf_s390_copy_indirect_symbol |
