* elfcode.h (write_relocs): Undo patch of Apr 10; breaks Solaris.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4fc190c830efc0ef6fb872b3150ccf07cd13ee32..18ed3ff78f93e02bf9f276cee516bb491c7b05b3 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,7 @@
 Mon Apr 25 15:31:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
+       * elfcode.h (write_relocs): Undo patch of Apr 10; breaks Solaris.
+
        * elfcode.h (bfd_section_from_shdr): Use bfd_make_section_anyway
        to create sections.  Check return value of recursive calls.
        (bfd_section_from_phdr): Check return value of bfd_make_section.

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index ae36a181c3a7a5c9e7ee98a7073014d6ed123667..114eb8dd04ca3dfe9fe2686e809660c8dd49ac37 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1201,17 +1201,6 @@ 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