aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/emultempl/pe.em6
2 files changed, 8 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index b2dc2ba..c73a3df 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-02 Nick Clifton <nickc@cygnus.com>
+
+ * emultempl/pe.em: Rename global arm interworking functions to
+ avoid name collision when all targets BFD is built.
+
1999-05-30 Cort Dougan <cort@attis.cs.nmt.edu>
* Makefile.am (ALL_EMULATIONS): Add eelf32ppclinux.o.
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 91a1eec..0ff11c8 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -639,7 +639,7 @@ gld_${EMULATION_NAME}_after_open ()
/* Find a BFD that can hold the interworking stubs. */
LANG_FOR_EACH_INPUT_STATEMENT (is)
{
- if (bfd_arm_get_bfd_for_interworking (is->the_bfd, & link_info))
+ if (bfd_arm_pe_get_bfd_for_interworking (is->the_bfd, & link_info))
break;
}
}
@@ -740,7 +740,7 @@ gld_${EMULATION_NAME}_before_allocation()
{
LANG_FOR_EACH_INPUT_STATEMENT (is)
{
- if (! bfd_arm_process_before_allocation
+ if (! bfd_arm_pe_process_before_allocation
(is->the_bfd, & link_info, support_old_code))
{
/* xgettext:c-format */
@@ -751,7 +751,7 @@ gld_${EMULATION_NAME}_before_allocation()
}
/* We have seen it all. Allocate it, and carry on */
- bfd_arm_allocate_interworking_sections (& link_info);
+ bfd_arm_pe_allocate_interworking_sections (& link_info);
#endif /* TARGET_IS_armpe */
}