diff options
| author |   Alan Modra <amodra@gmail.com> | 2019-09-23 10:06:45 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-09-23 10:27:21 +0930 |
| commit | f37164d78b0d9600862b7038b896922127749b52 (patch) | |
| tree | 8cba4ad4f4736f03cbb53e2c90284443492ebd0f /ld | |
| parent | tic6x bfd.h tidy (diff) | |
| download | binutils-gdb-f37164d78b0d9600862b7038b896922127749b52.tar.gz binutils-gdb-f37164d78b0d9600862b7038b896922127749b52.tar.bz2 binutils-gdb-f37164d78b0d9600862b7038b896922127749b52.zip | |
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.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/emultempl/armelf.em | 1 | ||||
| -rw-r--r-- | ld/emultempl/pe.em | 23 |
3 files changed, 17 insertions, 12 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 378fcea0648..f0fcd202e9d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2019-09-23 Alan Modra <amodra@gmail.com> + * emultempl/armelf.em: Include elf32-arm.h. + * emultempl/pe.em: Move func defines later and include coff-arm.h. + +2019-09-23 Alan Modra <amodra@gmail.com> + * emultempl/aarch64elf.em: Include elfxx-aarch64.h. 2019-09-23 Alan Modra <amodra@gmail.com> diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 0cbfcc70b32..9a1bc9a04b4 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -27,6 +27,7 @@ fragment <<EOF #include "ldctor.h" #include "elf/arm.h" +#include "elf32-arm.h" static struct elf32_arm_params params = { diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 150c98296f1..c1932d79ade 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -37,18 +37,6 @@ fragment <<EOF #define TARGET_IS_${EMULATION_NAME} -/* Do this before including bfd.h, so we prototype the right functions. */ - -#if defined(TARGET_IS_armpe) \ - || defined(TARGET_IS_arm_wince_pe) -#define bfd_arm_allocate_interworking_sections \ - bfd_${EMULATION_NAME}_allocate_interworking_sections -#define bfd_arm_get_bfd_for_interworking \ - bfd_${EMULATION_NAME}_get_bfd_for_interworking -#define bfd_arm_process_before_allocation \ - bfd_${EMULATION_NAME}_process_before_allocation -#endif - #include "sysdep.h" #include "bfd.h" #include "bfdlink.h" @@ -78,6 +66,17 @@ fragment <<EOF #include "../bfd/libcoff.h" #include "../bfd/libpei.h" +#if defined(TARGET_IS_armpe) \ + || defined(TARGET_IS_arm_wince_pe) +#define bfd_arm_allocate_interworking_sections \ + bfd_${EMULATION_NAME}_allocate_interworking_sections +#define bfd_arm_get_bfd_for_interworking \ + bfd_${EMULATION_NAME}_get_bfd_for_interworking +#define bfd_arm_process_before_allocation \ + bfd_${EMULATION_NAME}_process_before_allocation +#include "coff-arm.h" +#endif + #include "deffile.h" #include "pe-dll.h" #include "safe-ctype.h" |