From: nickc <nickc>
Date: Thu, 29 Nov 2007 08:14:22 +0000 (+0000)
Subject: PR ld/5398
X-Git-Tag: EOL_registry_mounts~1497
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bd938a5e55dbfb646d852b2e0e1f5380c572dff9;p=pf3gnuchains%2Fpf3gnuchains4x.git

PR ld/5398
* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Do not complain if
  there is no glue bfd, just return.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e78868e500..df02dfbc24 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-29  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/5398
+	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Do not
+	complain if there is no glue bfd, just return.
+
 2007-11-28  Nick Clifton  <nickc@redhat.com>
 
 	* elf-m10300.c (mn10300_elf_relax_section): Extend previous fix to
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 0e8e4239e7..811d65185d 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -3116,13 +3116,13 @@ bfd_elf32_arm_process_before_allocation (bfd *abfd,
   if (link_info->relocatable)
     return TRUE;
 
-  /* Here we have a bfd that is to be included on the link.  We have a hook
-     to do reloc rummaging, before section sizes are nailed down.  */
+  /* Here we have a bfd that is to be included on the link.  We have a
+     hook to do reloc rummaging, before section sizes are nailed down.  */
   globals = elf32_arm_hash_table (link_info);
-  check_use_blx (globals);
 
   BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  check_use_blx (globals);
 
   if (globals->byteswap_code && !bfd_big_endian (abfd))
     {
@@ -3131,6 +3131,12 @@ bfd_elf32_arm_process_before_allocation (bfd *abfd,
       return FALSE;
     }
 
+  /* PR 5398: If we have not decided to include any loadable sections in
+     the output then we will not have a glue owner bfd.  This is OK, it
+     just means that there is nothing else for us to do here.  */
+  if (globals->bfd_of_glue_owner == NULL)
+    return TRUE;
+
   /* Rummage around all the relocs and map the glue vectors.  */
   sec = abfd->sections;