* elfcode.h (write_relocs): For rela relocations, adjust the

[deliverable/binutils-gdb.git] / bfd / elfcode.h

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 5fd42992092377f7b8df20927b16087df260adaa..50878fc17bdc790ac34a40f254e0d1ed874a44b7 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1171,6 +1171,17 @@ write_relocs (abfd, sec, xxx)
            dst_rela.r_offset = ptr->address;
 
          sym = *ptr->sym_ptr_ptr;
+
+         /* If SYM is a section symbol for an input section, which
+            has been combined with other similar input sections (ld -r),
+            then adjust the addend by the output_offset of sym->section.
+
+            Apparently elf_symbol_from_bfd_symbol doesn't provide a 1:1
+            mapping from bfd symbol to elf symbols in this case.  */
+         if ((sym->flags & BSF_SECTION_SYM)
+             && sym->section)
+           ptr->addend += sym->section->output_offset;
+
          if (sym == last_sym)
            n = last_sym_idx;
          else