From 2004afbc1d737d2b82c706cf90eee8a980a18d4b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 7 Aug 2002 15:22:41 +0000 Subject: [PATCH] Only search for an interworking bfd if there are input bfds. --- ld/ChangeLog | 5 +++++ ld/emultempl/armelf.em | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index a9acfe87a87..a587652de5b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2002-08-07 Nick Clifton + + * emultempl/armelf.em (arm_elf_before_allocation): Only search for + an interworking bfd if there are input bfds. (107501) + 2002-08-06 Alan Modra * emultempl/aix.em (gld*_before_parse): Set default arch. Reverts diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 6f3cfc39b5f..0e65c04ca64 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -100,18 +100,20 @@ arm_elf_before_allocation () /* Call the standard elf routine. */ gld${EMULATION_NAME}_before_allocation (); - /* The interworking bfd must be the last one in the link. */ - bfd_for_interwork = NULL; - for (tem = link_info.input_bfds; tem != NULL; tem = tem->link_next) - tem->output_has_begun = false; + if (link_info.input_bfds != NULL) + { + /* The interworking bfd must be the last one in the link. */ + bfd_for_interwork = NULL; + for (tem = link_info.input_bfds; tem != NULL; tem = tem->link_next) + 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); + 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); + } /* We should be able to set the size of the interworking stub section. */ /* Here we rummage through the found bfds to collect glue information. */