Rename interworking functions to avoid a name space collision

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 71782484f5861c7f277d4e780b78f64ee55e94b5..9ee9f46838d6c23aa9e1433e06fe299086c95f6e 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-02  Nick Clifton  <nickc@cygnus.com>
+
+       * pe-arm.c: Rename global arm interworking functions to avoid name
+       collision when all targets BFD is built.
+       * pei-arm.c: Ditto.
+
 1999-05-31  Mark Mitchell  <mark@codesourcery.com>
 
        * elf-bfd.h (elf_backend_data): Remove use_rela_p.  Add

diff --git a/bfd/pe-arm.c b/bfd/pe-arm.c
index d315888f1da12f009fea6e023ee83f6d647eabd6..fff47bf0b01c1ccd8a5273a445e8cbf0e465b4d8 100644 (file)
--- a/bfd/pe-arm.c
+++ b/bfd/pe-arm.c
@@ -31,4 +31,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PCRELOFFSET          true
 #define COFF_LONG_SECTION_NAMES
 
+#define bfd_arm_allocate_interworking_sections \
+       bfd_arm_pe_allocate_interworking_sections
+#define bfd_arm_get_bfd_for_interworking \
+       bfd_arm_pe_get_bfd_for_interworking
+#define bfd_arm_process_before_allocation \
+       bfd_arm_pe_process_before_allocation
+
 #include "coff-arm.c"

diff --git a/bfd/pei-arm.c b/bfd/pei-arm.c
index 4ba5b3a5cd0e4e084e46c35c5dde4cc2ac69b722..02835c953a3a56ceebc79e5ced3d67d287ea8e96 100644 (file)
--- a/bfd/pei-arm.c
+++ b/bfd/pei-arm.c
@@ -33,4 +33,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PCRELOFFSET        true
 #define COFF_LONG_SECTION_NAMES
 
+#define bfd_arm_allocate_interworking_sections \
+       bfd_arm_pe_allocate_interworking_sections
+#define bfd_arm_get_bfd_for_interworking \
+       bfd_arm_pe_get_bfd_for_interworking
+#define bfd_arm_process_before_allocation \
+       bfd_arm_pe_process_before_allocation
+
 #include "coff-arm.c"