2003-03-06 Jakub Jelinek <jakub@redhat.com>

        Andrew Haley  <aph@redhat.com>

        * elflink.h (elf_bfd_discard_info): Don't process eh frames if
        output is relocateable.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 968104ea97e4ffc1e44e82e2f7efdd23b20ee878..341e6294292b3af9f4901e91c99aea5cba1bb970 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-06  Jakub Jelinek <jakub@redhat.com>
+       Andrew Haley  <aph@redhat.com>
+
+       * elflink.h (elf_bfd_discard_info): Don't process eh frames if
+       output is relocateable.
+
 2003-03-06  Steven Konopa <skonopa@kgo.csc.com>
 
        * som.c (som_fixup_formats): Correct formats for R_AUX_UNWIND and

diff --git a/bfd/elflink.h b/bfd/elflink.h
index 7d2d2e24eae78291edbf4fb1220c209ded216ce1..c39120d037bad5d5dc524fde614bbbfadd3f7f7a 100644 (file)
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -8329,9 +8329,10 @@ elf_bfd_discard_info (output_bfd, info)
        continue;
 
       eh = bfd_get_section_by_name (abfd, ".eh_frame");
-      if (eh != NULL
-         && (eh->_raw_size == 0
-             || bfd_is_abs_section (eh->output_section)))
+      if (info->relocateable
+         || (eh != NULL
+             && (eh->_raw_size == 0
+                 || bfd_is_abs_section (eh->output_section))))
        eh = NULL;
 
       stab = bfd_get_section_by_name (abfd, ".stab");
@@ -8432,6 +8433,7 @@ elf_bfd_discard_info (output_bfd, info)
     }
 
   if (info->eh_frame_hdr
+      && !info->relocateable
       && _bfd_elf_discard_section_eh_frame_hdr (output_bfd, info))
     ret = TRUE;