diff options
| author | Mark Harmstone <mark@harmstone.com> | 2023-01-11 18:32:04 +0000 |
|---|---|---|
| committer | Mark Harmstone <mark@harmstone.com> | 2023-01-18 03:56:35 +0000 |
| commit | 87a5cf5c0ecc8a0965961154602cbb844cb5ee2b (patch) | |
| tree | 0a5403165d711a4811285ff6b3bbe33dd549c805 | |
| parent | 47f72fdba3f8b5d979802303f6d3c0312c931e7d (diff) | |
| download | fsf-binutils-gdb-87a5cf5c0ecc8a0965961154602cbb844cb5ee2b.zip fsf-binutils-gdb-87a5cf5c0ecc8a0965961154602cbb844cb5ee2b.tar.gz fsf-binutils-gdb-87a5cf5c0ecc8a0965961154602cbb844cb5ee2b.tar.bz2 | |
Use subsystem to distinguish between pei-arm-little and pei-arm-wince-little
Running objdump against a 32-bit ARM PE file currently needs
disambiguation, as it gets picked up by both pei-arm-little and
pei-arm-wince-little.
This adds a check in pe_bfd_object_p so that the subsystem in the PE
header is used to do the disambiguation for us, so that WinCE images get
assigned to pei-arm-wince-little, and everything else to pei-arm-little.
| -rw-r--r-- | bfd/pei-arm-wince.c | 2 | ||||
| -rw-r--r-- | bfd/peicode.h | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/bfd/pei-arm-wince.c b/bfd/pei-arm-wince.c index 6391dd5..914ee0b 100644 --- a/bfd/pei-arm-wince.c +++ b/bfd/pei-arm-wince.c @@ -28,4 +28,6 @@ #define LOCAL_LABEL_PREFIX "." +#define WINCE + #include "pei-arm.c" diff --git a/bfd/peicode.h b/bfd/peicode.h index 68ec3a3..22ffec9 100644 --- a/bfd/peicode.h +++ b/bfd/peicode.h @@ -1528,6 +1528,21 @@ pe_bfd_object_p (bfd * abfd) bfd_coff_swap_aouthdr_in (abfd, opthdr, &internal_a); struct internal_extra_pe_aouthdr *a = &internal_a.pe; + +#ifdef ARM + /* Use Subsystem to distinguish between pei-arm-little and + pei-arm-wince-little. */ +#ifdef WINCE + if (a->Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CE_GUI) +#else + if (a->Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CE_GUI) +#endif + { + bfd_set_error (bfd_error_wrong_format); + return NULL; + } +#endif + if ((a->SectionAlignment & -a->SectionAlignment) != a->SectionAlignment || a->SectionAlignment >= 0x80000000) { |