From f37164d78b0d9600862b7038b896922127749b52 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 23 Sep 2019 10:06:45 +0930 Subject: arm bfd.h tidy bfd/ * bfd-in.h: Move arm declaraions.. * cpu-arm.h: ..to here, new file.. * coff-arm.h: ..and here, new file.. * elf32-arm.h: ..and here, new file. * cpu-arm.c: Include cpu-arm.h. * coff-arm.c: Include cpu-arm.h and coff-arm.h. * elf32-arm.c: Include cpu-arm.h and elf32-arm.h. * pe-arm.c: Move function rename defines later. * pe-arm-wince.c: Likewise and include sysdep.h and bfd.h early. * bfd-in2.h: Regenerate. gas/ * config/tc-arm.c: Include cpu-arm.h. ld/ * emultempl/armelf.em: Include elf32-arm.h. * emultempl/pe.em: Move func defines later and include coff-arm.h. --- bfd/pe-arm.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'bfd/pe-arm.c') diff --git a/bfd/pe-arm.c b/bfd/pe-arm.c index 2d1b7ea..4667046 100644 --- a/bfd/pe-arm.c +++ b/bfd/pe-arm.c @@ -18,18 +18,6 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* Do this before including bfd.h, so we prototype the right functions. */ - -#ifndef bfd_arm_allocate_interworking_sections -#define bfd_arm_allocate_interworking_sections \ - bfd_armpe_allocate_interworking_sections -#define bfd_arm_get_bfd_for_interworking \ - bfd_armpe_get_bfd_for_interworking -#define bfd_arm_process_before_allocation \ - bfd_armpe_process_before_allocation -#endif - #include "sysdep.h" #include "bfd.h" @@ -64,4 +52,13 @@ { COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \ COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 } +#ifndef bfd_arm_allocate_interworking_sections +#define bfd_arm_allocate_interworking_sections \ + bfd_armpe_allocate_interworking_sections +#define bfd_arm_get_bfd_for_interworking \ + bfd_armpe_get_bfd_for_interworking +#define bfd_arm_process_before_allocation \ + bfd_armpe_process_before_allocation +#endif + #include "coff-arm.c" -- cgit v1.1