From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 3BE7E3858C83 for ; Wed, 11 Jan 2023 18:32:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BE7E3858C83 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=harmstone.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-x32b.google.com with SMTP id m3so11738862wmq.0 for ; Wed, 11 Jan 2023 10:32:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=cnx11QB4H1PVxcPnpT1R7r54MOLy8bwucpXwEDVHhFg=; b=HlCduxavniwt5oeEgd0uShBYL1DY/MqaflPUmcdKN6DwYdzr2Kb1Xmxqc3THz+TlM7 0uJXRVBbn08IGLQL50XfNRGag9MnyhTDBbjeqJ/geRKKHYDOGZHqZKq+NjN64qqhZLPW 2G7030OHvtuZZEQBnhtRmPZm7gDfGsXwp76QHGEnnuDhwn5BYSRxbE9WuCv8de0u4VXd rilq/HCHaoxyOd8L/yCB2YBVGumZea7OUrU9CFRTKMT7ntQSDQ1Xfu9juD+8VFUT6Yu/ Wzasv5zDz2A19aZI6VCuX4UHptpVd+CoGeu354KyESjAqVdXUF/FsvWVFxth8FYEpBVb 51pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cnx11QB4H1PVxcPnpT1R7r54MOLy8bwucpXwEDVHhFg=; b=4x6cCA0zv9+XadwAP4PWrPWtSNmBvohs9aDCtfqWH2ZM8z4Gy5lvBOkKdGlQmJArR7 OwbH5boqQCA75tmRcIewNAgnrgYsi65f1HZ+9OP+qPfvkIMoLUH93PMi9eh4v4P1idnb 05jYgWjavl49gLpTeOmLf7rT0RPEAmkHtFS21o33QorI4Z5I2P4PYhkzmhUwVzYvqlQG GH7rtB7I8v+a6Ppadn2IlyNpKMC2M473nZowsFlsQ8+hI/ZxHdvlMKOdgjhRi3j5+Syg DZt8eLoI/6uEjwBPqMz7A2fh31qCSSgySqC1g+8YiESkrSnE4XpofdgKTkjO3WhjyUTM FNOw== X-Gm-Message-State: AFqh2krrKhup2SuZxcjkNFJZtkCmLZ/mgaDLvwBkbpE92PmCB7QfrZil qEKE7CQJ/JrrhYtiQ18wCJmIKX8tn7P/7A== X-Google-Smtp-Source: AMrXdXvTx6Loxdap+Gox8JeZr1KLW8PzmYAkxPIFVc6mpktecFFhTnhAmhNlB3AMuVh7I3XTfOVa+A== X-Received: by 2002:a05:600c:556f:b0:3d2:2a74:3a90 with SMTP id ja15-20020a05600c556f00b003d22a743a90mr55601678wmb.22.1673461932598; Wed, 11 Jan 2023 10:32:12 -0800 (PST) Received: from beren.harmstone.com ([2a02:8010:64ea:0:8eb8:7eff:fe53:9d5f]) by smtp.gmail.com with ESMTPSA id p15-20020a1c544f000000b003b4fe03c881sm23287074wmi.48.2023.01.11.10.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 10:32:11 -0800 (PST) Sender: Mark Harmstone From: Mark Harmstone To: binutils@sourceware.org Cc: Mark Harmstone Subject: [PATCH] Use subsystem to distinguish between pei-arm-little and pei-arm-wince-little Date: Wed, 11 Jan 2023 18:32:04 +0000 Message-Id: <20230111183204.11600-1-mark@harmstone.com> X-Mailer: git-send-email 2.38.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. --- bfd/pei-arm-wince.c | 2 ++ bfd/peicode.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+) 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) { -- 2.38.2