* elfcode.h (elf_object_p): Don't set DYNAMIC just because there

	is an SHT_DYNAMIC section.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 49c073018fbf58b135c6b3993ae99d464cd30671..4e6d1617af9f8b7e91b9e9e547a1d467d7d4fd00 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+Thu Jun 23 15:31:28 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+       * elfcode.h (elf_object_p): Don't set DYNAMIC just because there
+       is an SHT_DYNAMIC section.
+
+       * cf-i386lynx.c (i386coff_vec): Don't include DYNAMIC in
+       object_flags.
+       * coff-sparc.c (sparccoff_vec): Likewise.
+       * hppabsd-core.c (hppabsd_core_vec): Likewise.
+
+       * aoutx.h (NAME(aout,some_aout_object_p)): Don't set SEC_RELOC
+       just because DYNAMIC is set.
+
 Thu Jun 23 12:53:41 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
 
        * configure.in: Change --with-targets to --enable-targets and

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 68c24798b1b19ef06cd651539cd8432c202a3268..85d5fd93f1a65c9bbf2eb1db9cb0d6e6bc11a873 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -962,11 +962,6 @@ elf_object_p (abfd)
        goto got_no_match;
       elf_swap_shdr_in (abfd, &x_shdr, i_shdrp + shindex);
       elf_elfsections (abfd)[shindex] = i_shdrp + shindex;
-
-      /* If this is a .dynamic section, mark the object file as being
-        dynamically linked.  */
-      if (i_shdrp[shindex].sh_type == SHT_DYNAMIC)
-       abfd->flags |= DYNAMIC;
     }
   if (i_ehdrp->e_shstrndx)
     {
@@ -2888,24 +2883,12 @@ elf_get_dynamic_symtab_upper_bound (abfd)
   return symtab_size;
 }
 
-/*
-       This function return the number of bytes required to store the
-       relocation information associated with section <<sect>>
-       attached to bfd <<abfd>>
-
-*/
 long
 elf_get_reloc_upper_bound (abfd, asect)
      bfd *abfd;
      sec_ptr asect;
 {
-  if (asect->flags & SEC_RELOC)
-    {
-      /* either rel or rela */
-      return elf_section_data (asect)->rel_hdr.sh_size;
-    }
-  else
-    return 0;
+  return (asect->reloc_count + 1) * sizeof (arelent *);
 }
 
 static boolean