From patchwork Mon Jun 12 14:56:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 25445 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B921DC88CB6 for ; Mon, 12 Jun 2023 14:57:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.61507.1686581822190494179 for ; Mon, 12 Jun 2023 07:57:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 66CEE1FB; Mon, 12 Jun 2023 07:57:46 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D87573F5A1; Mon, 12 Jun 2023 07:57:00 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 1/4] arm/trusted-firmware-m: remove -fcanon-prefix-map from DEBUG_PREFIX_MAP Date: Mon, 12 Jun 2023 15:56:56 +0100 Message-Id: <20230612145659.934478-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 12 Jun 2023 14:57:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4759 From: Ross Burton This recipe uses the binary Arm compiler, which is based on GCC 12. Remove this GCC 13-specific option until the next release. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc index d0744423..02acfb8b 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc @@ -80,6 +80,9 @@ AS[unexport] = "1" CC[unexport] = "1" LD[unexport] = "1" +# remove once arm-none-eabi-gcc updates to 13 or newer like poky +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" + # python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the # right path until this is relocated automatically. export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" From patchwork Mon Jun 12 14:56:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 25443 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8031C88CB7 for ; Mon, 12 Jun 2023 14:57:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.61509.1686581822548704967 for ; Mon, 12 Jun 2023 07:57:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1E0C52F4; Mon, 12 Jun 2023 07:57:47 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 906163F5A1; Mon, 12 Jun 2023 07:57:01 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 2/4] arm-bsp/external-system: remove -fcanon-prefix-map from DEBUG_PREFIX_MAP Date: Mon, 12 Jun 2023 15:56:57 +0100 Message-Id: <20230612145659.934478-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230612145659.934478-1-ross.burton@arm.com> References: <20230612145659.934478-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 12 Jun 2023 14:57:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4758 From: Ross Burton This recipe uses the binary Arm compiler, which is based on GCC 12. Remove this GCC 13-specific option until the next release. Signed-off-by: Ross Burton --- .../recipes-bsp/external-system/external-system_0.1.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-arm-bsp/recipes-bsp/external-system/external-system_0.1.0.bb b/meta-arm-bsp/recipes-bsp/external-system/external-system_0.1.0.bb index dce29a93..8b09ab0d 100644 --- a/meta-arm-bsp/recipes-bsp/external-system/external-system_0.1.0.bb +++ b/meta-arm-bsp/recipes-bsp/external-system/external-system_0.1.0.bb @@ -21,6 +21,9 @@ PRODUCT = "corstone-1000" S = "${WORKDIR}/git" B = "${WORKDIR}/build" +# remove once arm-none-eabi-gcc updates to 13 or newer like poky +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" + LDFLAGS[unexport] = "1" do_compile() { From patchwork Mon Jun 12 14:56:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 25444 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6F07C88CB4 for ; Mon, 12 Jun 2023 14:57:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.61510.1686581823152499441 for ; Mon, 12 Jun 2023 07:57:03 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CAE0D13D5; Mon, 12 Jun 2023 07:57:47 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 48CE53F5A1; Mon, 12 Jun 2023 07:57:02 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 3/4] arm-toolchain/external-arm: remove -fcanon-prefix-map from DEBUG_PREFIX_MAP Date: Mon, 12 Jun 2023 15:56:58 +0100 Message-Id: <20230612145659.934478-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230612145659.934478-1-ross.burton@arm.com> References: <20230612145659.934478-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 12 Jun 2023 14:57:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4760 From: Ross Burton The binaryh Arm compiler is based on GCC 12. Remove this GCC 13-specific option until the next release. Signed-off-by: Ross Burton --- meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc index 71fac597..61a9c0a7 100644 --- a/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc +++ b/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc @@ -4,6 +4,9 @@ EXTERNAL_TOOLCHAIN ?= "/usr/local/arm-binary-toolchain/${TARGET_ARCH}" +# oe-core passes this by default because it assumes GCC 13. This can be removed when Arm GCC is 13.1+. +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" + TOOLCHAIN_PATH_ADD = "${EXTERNAL_TOOLCHAIN}/bin:" PATH =. "${TOOLCHAIN_PATH_ADD}" From patchwork Mon Jun 12 14:56:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 25446 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 906F7C7EE2F for ; Mon, 12 Jun 2023 14:57:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.61511.1686581823890315550 for ; Mon, 12 Jun 2023 07:57:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8276C1FB; Mon, 12 Jun 2023 07:57:48 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 019553F5A1; Mon, 12 Jun 2023 07:57:02 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 4/4] arm/scp-firmware: use concerete toolchain Date: Mon, 12 Jun 2023 15:56:59 +0100 Message-Id: <20230612145659.934478-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230612145659.934478-1-ross.burton@arm.com> References: <20230612145659.934478-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 12 Jun 2023 14:57:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4761 From: Ross Burton There are not any alternatives for the virtual/arm-non-eabi-gcc provider, so just use the real recipe name. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb index 0bbd88c0..700120cf 100644 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb @@ -21,7 +21,7 @@ SCP_LOG_LEVEL ?= "WARN" SCP_PLATFORM_FEATURE_SET ?= "0" INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/arm-none-eabi-gcc-native \ +DEPENDS = "gcc-arm-none-eabi-native \ cmake-native \ ninja-native \ "