* elflink.c (elf_link_input_bfd): Don't try to resolve complex

relocs when doing a relocatable link.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8ee5964..f655ab0 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-30  DJ Delorie  <dj@redhat.com>
+
+       * elflink.c (elf_link_input_bfd): Don't try to resolve complex
+       relocs when doing a relocatable link.
+
 2009-03-28  Mark Mitchell  <mark@codesourcery.com>
 
        * coff-arm.c (coff_arm_merge_private_bfd_data): Use "error:", not

diff --git a/bfd/elflink.c b/bfd/elflink.c
index c635cb0..9b6e3ed 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -9329,7 +9329,8 @@ elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
                                               sym, *ps);
                }
 
-             if (s_type == STT_RELC || s_type == STT_SRELC)
+             if ((s_type == STT_RELC || s_type == STT_SRELC)
+                 && !finfo->info->relocatable)
                {
                  bfd_vma val;
                  bfd_vma dot = (rel->r_offset