From 434d1125a3e95b8fcbdfc563423faca2cc06bea6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 4 Jun 1999 07:40:35 +0000 Subject: [PATCH] Rename epoc-pe interworking function names to avoid a name space clash --- ld/ChangeLog | 5 +++++ ld/emultempl/pe.em | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index 2a563fea071..2c43e0217e9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +1999-06-04 Nick Clifton + + * emultempl/pe.em: If compiling for arm_epoc_pe rename + interworking functions to avoid a name space clash. + 1999-06-02 Jason Merrill * scripttempl/v850.sc: Add initp support. diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 0ff11c8ccb0..7b213b1e8ad 100644 --- 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)); -- 2.30.2