Rename epoc-pe interworking function names to avoid a name space clash

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2a563fea071c51d323ad4ab861639f0ffea8ef22..2c43e0217e9019c864ecf1a785f9a42576404f48 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-04  Nick Clifton  <nickc@cygnus.com>
+
+       * emultempl/pe.em: If compiling for arm_epoc_pe rename
+       interworking functions to avoid a name space clash.
+
 1999-06-02  Jason Merrill  <jason@yorick.cygnus.com>
 
        * scripttempl/v850.sc: Add initp support.

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 0ff11c8ccb0a6be41ac423aace6fd551d0769786..7b213b1e8ad413e143a61683d6d033874372bd72 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -54,6 +54,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define        PE_DEF_SUBSYSTEM                3
 
+#ifdef TARGET_IS_arm_epoc_pe
+#define bfd_arm_pe_allocate_interworking_sections \
+       bfd_arm_epoc_pe_allocate_interworking_sections
+#define bfd_arm_pe_get_bfd_for_interworking \
+       bfd_arm_epoc_pe_get_bfd_for_interworking
+#define bfd_arm_pe_process_before_allocation \
+       bfd_arm_epoc_pe_process_before_allocation
+#endif
+
 static void gld_${EMULATION_NAME}_set_symbols PARAMS ((void));
 static void gld_${EMULATION_NAME}_after_open PARAMS ((void));
 static void gld_${EMULATION_NAME}_before_parse PARAMS ((void));