From 10ab5357b128f5b6278c149e407bf4af710447f1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 4 Jun 1999 07:39:48 +0000 Subject: [PATCH] Rename epoc-pe interworking function names to avoid a name space clash. Add epoc-pe to built targets. --- bfd/Makefile.am | 10 ++++++++++ bfd/Makefile.in | 10 ++++++++++ bfd/epoc-pe-arm.c | 6 ++++++ bfd/epoc-pei-arm.c | 7 +++++++ bfd/pe-arm.c | 4 +++- bfd/pei-arm.c | 4 +++- 6 files changed, 39 insertions(+), 2 deletions(-) diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 99ad5083c71..d1adeee2790 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -172,6 +172,8 @@ BFD32_BACKENDS = \ elf32-v850.lo \ elf32.lo \ elflink.lo \ + epoc-pe-arm.lo \ + epoc-pei-arm.lo \ hp300bsd.lo \ hp300hpux.lo \ som.lo \ @@ -291,6 +293,8 @@ BFD32_BACKENDS_CFILES = \ elf32-v850.c \ elf32.c \ elflink.c \ + epoc-pe-arm.c \ + epoc-pei-arm.c \ hp300bsd.c \ hp300hpux.c \ som.c \ @@ -888,6 +892,12 @@ elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ elfcore.h elflink.h elflink.lo: elflink.c $(INCDIR)/bfdlink.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h +epoc-pe-arm.lo: epoc-ep-arm.c pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h peicode.h +epoc-pei-arm.lo: epoc-pei-arm.c pei-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h peicode.h hp300bsd.lo: hp300bsd.c libaout.h $(INCDIR)/bfdlink.h \ aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 24b3dfea5a1..d40ce2d08ca 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -291,6 +291,8 @@ BFD32_BACKENDS = \ elf32-v850.lo \ elf32.lo \ elflink.lo \ + epoc-pe-arm.lo \ + epoc-pei-arm.lo \ hp300bsd.lo \ hp300hpux.lo \ som.lo \ @@ -411,6 +413,8 @@ BFD32_BACKENDS_CFILES = \ elf32-v850.c \ elf32.c \ elflink.c \ + epoc-pe-arm.c \ + epoc-pei-arm.c \ hp300bsd.c \ hp300hpux.c \ som.c \ @@ -1418,6 +1422,12 @@ elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ elfcore.h elflink.h elflink.lo: elflink.c $(INCDIR)/bfdlink.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h +epoc-pe-arm.lo: epoc-pe-arm.c pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h peicode.h +epoc-pei-arm.lo: epoc-pei-arm.c pei-arm.c coff-arm.c $(INCDIR)/coff/arm.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \ + $(INCDIR)/bfdlink.h coffcode.h peicode.h hp300bsd.lo: hp300bsd.c libaout.h $(INCDIR)/bfdlink.h \ aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h diff --git a/bfd/epoc-pe-arm.c b/bfd/epoc-pe-arm.c index ea89a0b1257..48a277a9dca 100644 --- a/bfd/epoc-pe-arm.c +++ b/bfd/epoc-pe-arm.c @@ -25,6 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define TARGET_BIG_SYM arm_epoc_pe_big_vec #define TARGET_BIG_NAME "epoc-pe-arm-big" +#define bfd_arm_allocate_interworking_sections \ + bfd_arm_epoc_pe_allocate_interworking_sections +#define bfd_arm_get_bfd_for_interworking \ + bfd_arm_epoc_pe_get_bfd_for_interworking +#define bfd_arm_process_before_allocation \ + bfd_arm_epoc_pe_process_before_allocation #include "pe-arm.c" diff --git a/bfd/epoc-pei-arm.c b/bfd/epoc-pei-arm.c index 0f2548d3809..69c4d8b6804 100644 --- a/bfd/epoc-pei-arm.c +++ b/bfd/epoc-pei-arm.c @@ -25,5 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define TARGET_BIG_SYM arm_epoc_pei_big_vec #define TARGET_BIG_NAME "epoc-pei-arm-big" +#define bfd_arm_allocate_interworking_sections \ + bfd_arm_epoc_pe_allocate_interworking_sections +#define bfd_arm_get_bfd_for_interworking \ + bfd_arm_epoc_pe_get_bfd_for_interworking +#define bfd_arm_process_before_allocation \ + bfd_arm_epoc_pe_process_before_allocation + #include "pei-arm.c" diff --git a/bfd/pe-arm.c b/bfd/pe-arm.c index fff47bf0b01..f8a048167a8 100644 --- a/bfd/pe-arm.c +++ b/bfd/pe-arm.c @@ -31,11 +31,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PCRELOFFSET true #define COFF_LONG_SECTION_NAMES +#ifndef bfd_arm_allocate_interworking_sections #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 - +#endif + #include "coff-arm.c" diff --git a/bfd/pei-arm.c b/bfd/pei-arm.c index 02835c953a3..b04214ab110 100644 --- a/bfd/pei-arm.c +++ b/bfd/pei-arm.c @@ -33,11 +33,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PCRELOFFSET true #define COFF_LONG_SECTION_NAMES +#ifndef bfd_arm_allocate_interworking_sections #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 - +#endif + #include "coff-arm.c" -- 2.30.2