summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/pe-arm.c7
-rw-r--r--bfd/pei-arm.c7
3 files changed, 20 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 71782484f5..9ee9f46838 100644
--- 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 d315888f1d..fff47bf0b0 100644
--- 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 4ba5b3a5cd..02835c953a 100644
--- 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"