From: Mark Harmstone Date: Wed, 11 Jan 2023 18:32:04 +0000 (+0000) Subject: Use subsystem to distinguish between pei-arm-little and pei-arm-wince-little X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87a5cf5c;p=binutils-gdb.git 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. --- diff --git a/bfd/pei-arm-wince.c b/bfd/pei-arm-wince.c index 6391dd50c91..914ee0bb07f 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 68ec3a37c89..22ffec989f2 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) {