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.
This commit is contained in:
Mark Harmstone 2023-01-11 18:32:04 +00:00
parent 47f72fdba3
commit 87a5cf5c0e
2 changed files with 17 additions and 0 deletions

View File

@ -28,4 +28,6 @@
#define LOCAL_LABEL_PREFIX "."
#define WINCE
#include "pei-arm.c"

View File

@ -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)
{