(arm_elf_before_allocation): Replace ASSERT with a test for a NULL

bfd_for_interworking.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5b6621e..fbd7106 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-30  Nick Clifton  <nickc@redhat.com>
+
+       * emultempl/armelf.em (arm_elf_before_allocation): Replace ASSERT
+       with a test for a NULL bfd_for_interworking.
+
 2003-05-29  Jason Thorpe  <thorpej@wasabisystems.com>
 
        * configure.host (*-*-netbsd*): Set HOSTING_CRT0 and HOSTING_LIBS

diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 4a63e69..b125c57 100644 (file)
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -108,11 +108,15 @@ arm_elf_before_allocation ()
        tem->output_has_begun = FALSE;
 
       lang_for_each_statement (arm_elf_set_bfd_for_interworking);
-      ASSERT (bfd_for_interwork != NULL);
       for (tem = link_info.input_bfds; tem != NULL; tem = tem->link_next)
        tem->output_has_begun = FALSE;
 
-      bfd_elf32_arm_get_bfd_for_interworking (bfd_for_interwork, &link_info);
+      /* If bfd_for_interwork is NULL, then there are no loadable sections
+        with real contents to be linked, so we are not going to have to
+        create any interworking stubs, so it is OK not to call
+        bfd_elf32_arm_get_bfd_for_interworking.  */
+      if (bfd_for_interwork != NULL)
+       bfd_elf32_arm_get_bfd_for_interworking (bfd_for_interwork, &link_info);
     }
   /* We should be able to set the size of the interworking stub section.  */