* elf-bfd.h (enum elf_link_info_type): New.

[deliverable/binutils-gdb.git] / bfd / elfxx-ia64.c

diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index ca1d7e1966c77407c8118fb1c3f72f976117ea10..6abd6909dd7cb60fd87f12b6ceab7cd6defdc4ad 100644 (file)
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -3489,7 +3489,8 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
          value = _bfd_elf_rela_local_sym (output_bfd, sym, sym_sec, rel);
          if ((sym_sec->flags & SEC_MERGE)
              && ELF_ST_TYPE (sym->st_info) == STT_SECTION
-             && elf_section_data (sym_sec)->merge_info)
+             && (elf_section_data (sym_sec)->sec_info_type
+                 == ELF_INFO_TYPE_MERGE))
            {
              struct elfNN_ia64_local_hash_entry *loc_h;
       
@@ -3505,7 +3506,7 @@ elfNN_ia64_relocate_section (output_bfd, info, input_bfd, input_section,
                      dynent->addend =
                        _bfd_merged_section_offset (output_bfd, &msec,
                                                    elf_section_data (msec)->
-                                                   merge_info,
+                                                   sec_info,
                                                    sym->st_value
                                                    + dynent->addend,
                                                    (bfd_vma) 0);