From patchwork Tue Sep 15 14:18:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dora, Sunil Kumar" X-Patchwork-Id: 98321 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 7CFB4C88E7B for ; Tue, 15 Sep 2026 14:19:05 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.24321.1789481941828137901 for ; Tue, 15 Sep 2026 07:19:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=W6+nv1VX; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=371803a4be=sunilkumar.dora@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68FD0GVj3537089 for ; Tue, 15 Sep 2026 07:19:01 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=LWN43iG0gpZL6tFeC8ZaofSoacOdulL2ksdiHk0aRiI=; b= W6+nv1VXrbMDuA52tWRPMx1L5wfhB9lUE6wdLze1SiTz4/HswCV33Gg8U703hD5g 8R+bs9H41cGpnicPx2LklZO4qxAGaXJbEhifJRIf1dh9Wm/MubURd7JGA1yzDTJY g4aSbfuS4LSpkKwr+16RGHL9v7SqgDlq6O/N5vjZTiTsNBSe0qu5j/ZUj4ASstqT qPFp76iiK1ts8lGk7pxH1KecJUiRfsylALK6MASCjBYNX/aUuxZ+DwQZLdRQBv0d VsPmev/dLLSuyXUtoqpOKYcdyiiTx5ZBKsaMsTS8oHkTOKwavWVPoslIwJWgCsTe fNJRlZAtE66/OAzHNTvbyg== Received: from mw6pr02cu001.outbound.protection.outlook.com (mail-westus2azon11022121.outbound.protection.outlook.com [52.101.48.121]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gn68g5a6b-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Sep 2026 07:19:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Jf+TEONcVdaBG70XlrSHi5AxrrO/XgUDMQy0vLk/Y4PfsRZVrOmCslNY8NmKJvJnNPGc/aD5I4NSNe13gaMA3EKc7E7WvZ96FC8/eFOjJvCFWdPitzjr4aLNzJguXJQGuQ4aYhCNPntS0wNLeL/jljSY0oSCtmIc7A+vKfuaQ726v4/F+lV8Yn/xDIXhmGDporvKiH83rhvRrZdxfx0I+wVN884O7AHKAE4EzwblXd6UkXTZVKN0PWy4Y64zQmmBJz/RVK8rvGmueYFAfkW4PrG4rjw3UYnE2/Vdk10IH1p4mJeRYOrmQr+pcvDOwiM7XyZpFWOscC+c+5EK8WCrjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LWN43iG0gpZL6tFeC8ZaofSoacOdulL2ksdiHk0aRiI=; b=jtP6tZ0P26B5s27hexqQAdRNFYd11e/h69yf306J2Blapdn4rjIx244OP+Wj1Ql/0qcJZTwiCpBafVxEdn7eykBJHYpCq/SNMh4+L+OxTxaBeIotQ7ZVbrA9xzKlmNNlk2O3yO4Jpt48fE9OXqMgK9iqkRERolCToImjt7+5iohGVcDUrRx3yPx0SNnXwjXDwHJcK3oE2+C8/lm5jm56wTA3q07hD7Yr+RlAULGATK6vP7nROHZWUWYla+NN3yHd+W0L/yh8pOVXCfGQhWtGxsOg57txTzM5zsIxLJ7dphZipuKOkzvbkquDiHdZvaDBlWudpt5ttL2v4QmxKQADFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) by DS4PPFDB7809488.namprd11.prod.outlook.com (2603:10b6:f:fc02::56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.9; Tue, 15 Sep 2026 14:18:59 +0000 Received: from DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f]) by DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f%3]) with mapi id 15.21.0406.007; Tue, 15 Sep 2026 14:18:59 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, sunilkumar.dora@windriver.com, Randy.Macleod@windriver.com, alejandro@enedino.org Subject: [PATCH 1/5] rust: drop the cc object-name reproducibility patch Date: Tue, 15 Sep 2026 19:48:30 +0530 Message-ID: <20260915141834.1212812-2-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> References: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5PR01CA0162.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:1cf::17) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|DS4PPFDB7809488:EE_ X-MS-Office365-Filtering-Correlation-Id: 108484ba-c90c-4847-396b-08df13344899 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|23010399003|29003799003|6133799003|12006099003|25016099003|18002099003|22082099003|3023799007|13003099007|10067099003|11063799006|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: B/LgH6GSdMcHUupJQnVgBNes724P0obbk5p47DV6SJK/5e1v+IfRqMsTql338gcWq3v/celAOP+rZJs5kBREmuv8Vq73a2R33ix9JjmPGJU4HuFhYAMDF3MdYV1tcrDW90wG3RpMXlVqr0s50ThojviV5+4DOlysXgJgDj2HfbfDTc0WO3gKT2LF9z+N9nERATzkXIbrwN8kZYN7JYqsIV4z2Tkis2z6UHEAMyeL63cyx/71E9PwMZhXCpOEtZL1bBohMsUf4Qh5I3peVA0+9iVMMaLmHu5Z9pWmix/U2ek66UKo6GiwjKhAX2P2WsjbRd6SNPzZTc5hc8ChkuSaMvBL8+KP/9IOIBSmB1yQ9OYSFnLrdPGaEl/s42zyjcYOHVkOVP8YAuyQXd4T1ULrXhASkJd6eTzAPL0JRDSCEKbKCQiULDcaIkwZQ9KdTyrYyGXjtwqfCn9Y9KcmMygo5JNYX3lZQTz1TFr+b8+nG319aWV2BSIVsyX1Ve3coHgKvcsUeU0HtTLMb/4DsQ3e8yFr/uoLSsgnKphv1+ehqXyhiB5NrBpy29U0qG41ZDAGsInF2t2V20OsBT7xo0keCbNs+kQXrB6tSg6a6HiT5+2MC01dfupDQu1+enboK8ZL7yf36DwnO5NDhjAh/JbUy8aA0wzVuAl4tUXsxFCL98M= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7901.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(23010399003)(29003799003)(6133799003)(12006099003)(25016099003)(18002099003)(22082099003)(3023799007)(13003099007)(10067099003)(11063799006)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /7LPOLE11Bs83SLOZoMx4yiP5Ma+8AyNuocsyWhqKUznPggpg5R5F5Dd/+yBTWJoPlpM44x/i034jgaPeLew+2ahEgcUavoTF6L+pU/ITcKDu4znfImxzXLi7Ex5ATFcRRAX8I3/cZJfczdg8WJTBrbezrgkNpfmxdAOj+GoG2Glfdw/yFbd9jkuGRIZbMiuKrJMpE6J41nfwxk3KHrb4nLzMBPSAvCAy8FcGH4RvZqzUW07jpTMSfijZ7RII9u7fzeQzKY3e8vvJjFPJJn4eOF4VMKlUFprvtebJOrtIXADwhM9rbztsTkvBWPVsAcDiTJnbUleJVgzMhxRgTHSgI0yi+ziUqC1M5PFsN0k9CcaM2FCFwQTFPCj8oW6hH0dUDFXRCY7G32D4CHwzhTvsssTVafULYolQDOxrRdO/8JNmj5H058YAlflocdGz6b73docB5xzXCtmDHbmRBTGHzkmunOhA8m72c3+6SWYMSxmeOGOuIu4xFYhGaQeg+vKMrbRdZK7Cu3ApMcjxWNozrlSjNhACSGxbxcFDUsNlc3KHlkf3cZSquRRdpL5aA5BRalrTNYWGOMinWyaLEriEmsjaBvYqbSV5XBk+ToG0zx5X72QlrLnR34Q/IVWdzOQjRkdr1m0KQbbyHKDxj3nJBSGLcuTnq/qPBbG37+fbtxPG5eT6W1lYN65os61T138+Oa/X1po9THCmie0pZXYTtutFXSEeFsBXpStKimClP7xXB52QotN9p/prv+dC4n/sPyEcQXaceQt94rFTQTdChemNFz/C2u2vZc60JEiQlCqMpUiDqympUsmiUeiP7GXGBJgK6o+hEWhhQuaGwahoMSP7YVxN4S2vL2+vOzSLyDKDe5JQHoZhC8hle/VtZbN93gSvXB/uUliaBblyqd2L83In29KK/QnyIorRNc9jWsV7q4/YL8j1cfeu0iuTkUp4eQaa5TyARbtuKz3FIbEToehEkcZ5wcKRHubu7IW5GTH4j7HRBXaeNUexBg7zIlITcHEHBNIHmqbiDArsF5rsZBcwq2EtEX762URHwMYNf2Zk5tD+haN7iB4cxJyT9Zke8oTwhao0Dp35XyPSTSHqf/KXc/AR2vOfebV+KFiMohFmxjX13ZZKSC0GnsIlYj3nXdjCwIheHKw5/tmwqbPDYY1wOhauelF3FKl0CPCDn6RK75NQJQaZD2QPF7ulI7qH/ajmTfLoMIhJ6uHMZnyorMgwc1la5kgkBA9qOy+IzoKc3x4oqlO0Zmaoa4YYBBY96xmUycJD5NaxA3MJHRB4Kx1QPZbLhSF5DAlQd8/ATQBSOMWIfnyuaaH/aM4MIiPPW/VaaVpPQBP3D4rPxw5mgXQPcKJr4eOhEnoYYyF1twqIKb/xFP8RSkUtyLOipb8a4RyyU4cshHwHvSanJPPue06834TCsZFW0lpFVSw28ztS1Sq3+UY6Ya5ggy4WhzQGpXKNgHDBS9Q4CCZ9BUvrFUnbZayuC0thLIv0zFOMS4xeHIaJAzZuLrWvlsT2zlq/gQLL/zT1uK0PDJVpLOzlNAZyKOD2y2c02DIfhEkg5uSueuklyJ5jBpoMzDVjc7WgqyS7aLfRIaQorOrgzV0ky2tiRwtU6oF8wt8Tlvyp8iW3BgTFQXBAxhs2XAPIKng3Xl/daQzyQPEr8VGPW9hCPRwm743fUh8fpCbb0EQBv6yM3jM0P3dK3PyH4NaMdB6wnnjKxNOCC5PABcvxn6gu9a4wg/D8gBiCsCrUsrWzO4= X-Exchange-RoutingPolicyChecked: pFMIMRw6hTGQTdUDf/QrT4lvankjUsUCfBWrz1gvKsTi8T1M1uPXyhOaShGNwr20rkJJIQ9pK/xOvnHrjSI3Icpxjrgbn2ozGspZKBRx/xde3VkniUFrD0Cjn+obO/Wo6h+XHJDm1GnrtogvefAzK/ajJlegwUUtIxuZm+bxX0ESnOutJmzkT+UEcxVs7/V5u5K1Wutm7Iq3ZDyXf9VkTnRDecvd2iIhil1+/WZI438obOVgEgNPHtqETH8gcyjkGHJp/Iu8SPV0IU6q+QA1rIwdm0b/13wJJWApmOVlBBfrUlCaQPyEXyS9EuPZfs32BpqSqIW183DQuxudtvgbUg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 108484ba-c90c-4847-396b-08df13344899 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2026 14:18:59.0807 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jG5KyRphlbzZmH/ns7O4wUTUXZuKlX+Km+CcmvYw1WfdVlDwHYYUv93xeyIuHPpXC8ShbseVVnVzmg/8LOOUrYAKx+TW3sXeb8XSW1KCdeI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PPFDB7809488 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: siGJyzWc5NagNuS2pcWAdI7sjrkWstvq X-Authority-Analysis: v=2.4 cv=cswOAF4i c=1 sm=1 tr=0 ts=6aa953d5 cx=c_pps a=jtibSCz00SxEcFhpBRTXcg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=NEAV23lmAAAA:8 a=ei4SEBeUAAAA:8 a=t7CeM3EgAAAA:8 a=xZ-Vo6NjDGti9U_2Ia8A:9 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 a=Oq4Vy3458gLamwXu4UIl:22 X-Proofpoint-GUID: xdrGStfyLJMEfE-No13N14sxBHeQRHhA X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfXzmX5yFKq3PWb of1OCOwYNZMUcgvUuVb+5Y+8IsPcPuYfOJV/NG23ujsRRBeACoJzaL9Ed0ITPsK4MNXMWEDDy6Y ECadvs3XxrhrakX5cAuFLkIoH7m1E1++fGKOhJr84dHuUQEjuGBB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfX+UgNz8v1O6z8 YhV9+m8ltVVBOS0R3e4Dlpe3zuseLNhYa+ylmZ1fWVhmTE0w24OmIddVuUGOpGPf5MLWZTBu/TD 5nBqmQa0GXBu6DaVl7tS58ro+E3lb26nUAfKhT7wcqrR3jldM+zVEatTqRGOfbYWkmT3xLxsXEq HDqoczVwa0Yw87HEqYlfaudo0uXVknwMm1jpBgGqPR9OpXlbf1fO2RHqjyoo16DviV+RSQPL3Zk 3tEExQ3kxDuaEyhItN9RmZPz9tyn7uwQVezxLAA+VGX+35ojK8s1jJ8PpApYOMw8sp+y3AzMz7d Th3VfEoRk5GntMTyAH2eBXcr+8C0bswYB/YY0ifhg1DDy/YR1EjnDZkxg12YA+DdYuCueTBxVeT P21YhJhna4pVkejTQEkOY3CR/e0enbAR9sXYmV247I8ZSXsVpCX/VlrLvHZqijkzNPD7aDu6122 RWEtMQm5nu58WdCoDIA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-15_04,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 clxscore=1015 spamscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150208 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Sep 2026 14:19:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245842 From: Sunil Dora This patch trims the source directory at the string "rustc" before cc hashes it into the object file names. After the shared source rework the build no longer runs under rustc-*-src, so the sources that compiler-builtins generates into OUT_DIR are not trimmed and the build path ends up in their names. Replaced by cc-hash-object-names-relative-to-source-roots.patch. [YOCTO #16376] Signed-off-by: Sunil Dora --- ...epro-issue-fix-with-cc-crate-hashmap.patch | 67 ------------------- meta/recipes-devtools/rust/rust-source.inc | 1 - 2 files changed, 68 deletions(-) delete mode 100644 meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch diff --git a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch b/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch deleted file mode 100644 index efb379acb9..0000000000 --- a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch +++ /dev/null @@ -1,67 +0,0 @@ -rust: reproducibility issue fix with v1.84 - -A few crates are using the updated version of the 'cc' crate and this is causing the generated object file names containing a unique hashmap id. -By the following changes same hash values will be genarted even for diffrent build paths. - -Below are the links for detailed bug description & discusssion with upstream rust. -https://github.com/rust-lang/cc-rs/pull/1277 - -Upstream-Status: Submitted [https://github.com/rust-lang/cc-rs/pull/1277] -Signed-off-by: Harish Sadineni -Signed-off-by: Deepesh Varatharajan -diff --git a/vendor/cc-1.2.0/src/command_helpers.rs b/vendor/cc-1.2.0/src/command_helpers.rs -index fe919a5239..2b1f442019 100644 ---- a/vendor/cc-1.2.0/src/command_helpers.rs -+++ b/vendor/cc-1.2.0/src/command_helpers.rs -@@ -289,6 +289,7 @@ - /// and store them in the output Object. - pub(crate) fn objects_from_files(files: &[Arc], dst: &Path) -> Result, Error> { - let mut objects = Vec::with_capacity(files.len()); -+ let target_substring = ["rustc"]; - for file in files { - let basename = file - .file_name() -@@ -309,6 +310,26 @@ - })? - .to_string_lossy(); - -+ // Function to find the position of the first occurrence of the target substring -+ fn find_target_position(s: &str, targets: &[&str]) -> Option { -+ let mut pos = None; -+ for target in targets { -+ if let Some(index) = s.rfind(target) { -+ //If a target is found and pos is None, set it -+ if pos.is_none() || index < pos.unwrap() { -+ pos = Some(index); -+ } -+ } -+ } -+ pos -+ } -+ -+ let filtered_dirname = if let Some(pos) = find_target_position(&dirname, &target_substring) { -+ dirname[pos..].to_string() //Keep everything from the target substring onwards -+ } else { -+ dirname.to_string() //If target substring is not found, keep the original dirname -+ }; -+ - // Hash the dirname. This should prevent conflicts if we have multiple - // object files with the same filename in different subfolders. - let mut hasher = hash_map::DefaultHasher::new(); -@@ -326,7 +347,7 @@ - dirname - }; - -- hasher.write(dirname.as_bytes()); -+ hasher.write(filtered_dirname.as_bytes()); - let obj = dst - .join(format!("{:016x}-{}", hasher.finish(), basename)) - .with_extension("o"); -diff --git a/vendor/cc-1.2.0/.cargo-checksum.json b/vendor/cc-1.2.0/.cargo-checksum.json -index b070eeb322..ba768ff86f 100644 ---- a/vendor/cc-1.2.0/.cargo-checksum.json -+++ b/vendor/cc-1.2.0/.cargo-checksum.json -@@ -1 +1 @@ --{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"d6e26674a9d7de87dab83262a14f2377988a1e087e4b514f3983f8dd141ea813","CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","Cargo.toml.orig":"0aff9dc74ddbe3bfe89ad9698212a6a18d6124b9593780aad25e277d28e9a71f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"b766a70e39b8ea7bb57afd288bcac205a23f6a26ac5619cb1d5b10f70c5dfdea","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} -\ No newline at end of file -+{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"d6e26674a9d7de87dab83262a14f2377988a1e087e4b514f3983f8dd141ea813","CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","Cargo.toml.orig":"0aff9dc74ddbe3bfe89ad9698212a6a18d6124b9593780aad25e277d28e9a71f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"174101852b2633a2478cef20d063fb9c2f1b092eac47913a6e708c85663b8404","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 019e2585e2..28c6d0b1dc 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -3,7 +3,6 @@ RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}" SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \ file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${RUSTSRC} \ file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \ - file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \ file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \ file://0002-Fix-rust-build-failure-with-unstable-options.patch;patchdir=${RUSTSRC} \ file://0003-bootstrap-skip-StdarchVerify-when-remote-testing.patch;patchdir=${RUSTSRC} \ From patchwork Tue Sep 15 14:18:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dora, Sunil Kumar" X-Patchwork-Id: 98322 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 8D492C88E53 for ; Tue, 15 Sep 2026 14:19:05 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.24190.1789481944466021183 for ; Tue, 15 Sep 2026 07:19:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=byEALlyC; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=371803a4be=sunilkumar.dora@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68FD1wme3120897 for ; Tue, 15 Sep 2026 07:19:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=jZ3iPyDLf9OnqucqpGZFeVkEHHDUz9uUHJNjKR3Gmvo=; b= byEALlyCIKLCre9FWf+BQIlPr95oBZTMLOqyX8HyIXiOZrLqgKaMnwDuXGIswyWi B7KfoJDvM358j5ylK4tUWxtwlL5d9U6nlF5JWLDyHTNAq0UEOJ2ZTv1qfEhLx93N vg4NFhJdG0/kYhjkBd2AqMOmcZd/EawRoyFtKAuyUb+xf7TW1VANxYtsb8RqFonl /O8n9CFRRJ9Rk3Vy7eusf0i5fUBKqFv6FX+r/bCMlvrWNmdPbbyCoqcfsLrZUT/V +DQ3OPTpcYHAT0wctnixAs2cHz1eWOpJVZOPgimDs86j7pJUuBBGTlk2nVdpjqnu FFJbwQZlvqyzFi56DcZJBw== Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020124.outbound.protection.outlook.com [52.101.85.124]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gn210p3sg-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Sep 2026 07:19:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PBvJ5z3oHiU+wtMECPX5TBpUfluOQKO5ybhQxufxbWg/VQ1nOfZbQLFmNvOKUUxo9t/2yz/EbIat8eIVbRdooKbN45cKOiR64HZc7p9E2lRTNpXPQesTsj1PKrJrIoizvhUCUdfuiwY54vLLE/olWLIvExYKzGLx1+oLQC3eCOnoYh0fLnOf8gGORp01BJVhjKIFryjipzgqSIEqj08tvKGlvoV47E8MVLxOcQ5fAjkLJ8j7iPsR82dcFqwin/MxLo5fA2GnhGqKvo0T3f+mrjG/5Her0eHiw7eCaIdwhKq/9o9UBCC+qbRGdCGrjhFvS8ZeaqRESesUsKdE8D05qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jZ3iPyDLf9OnqucqpGZFeVkEHHDUz9uUHJNjKR3Gmvo=; b=n02q8QUnT8iJFZZegCL0ZP8mmQRvm19VrrGZitc3uUsSLOqxihj/1zHh5rc0WVT6Cex+snIBAUFJPjC7RepBKEk7Iw4mlWflU/yqNQ4a5U5Xcw/UiiCmSK70sDfJleJlOji9OXg83kuh9R8fbe2hiZVLjgcrfSlcn1OR59p5PprlXzq66oTJFhycaMf/nMYigC4VU8jDyxYdBedo3vjNcicKGZlbkOwf2hUXNj/xo+qcG5aWTZCPSOeJFY4x0X8fnAtIZ8jg9U3Dblz0aX5IwUDe3Pey39K+sCwdI2AswXK4TwWUZwY+R1EWoJrk59vL7Guh4E8Xk5rEEwIcOdHqXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) by DS4PPFDB7809488.namprd11.prod.outlook.com (2603:10b6:f:fc02::56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.9; Tue, 15 Sep 2026 14:19:01 +0000 Received: from DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f]) by DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f%3]) with mapi id 15.21.0406.007; Tue, 15 Sep 2026 14:19:01 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, sunilkumar.dora@windriver.com, Randy.Macleod@windriver.com, alejandro@enedino.org Subject: [PATCH 2/5] rust: hash cc object names relative to their source roots Date: Tue, 15 Sep 2026 19:48:31 +0530 Message-ID: <20260915141834.1212812-3-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> References: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5PR01CA0162.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:1cf::17) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|DS4PPFDB7809488:EE_ X-MS-Office365-Filtering-Correlation-Id: 4269074c-de85-4862-10b6-08df13344a25 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|23010399003|29003799003|6133799003|12006099003|25016099003|18002099003|22082099003|3023799007|10067099003|11063799006|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: nOi3ASFlJL695chTAiuK/q1O4lkML8tWU8sPy8jK6Jn1y4Ta6dFgjl+TglhyeD/QeYONOocrlh5Bj8NE00NWxKknfpditctod+Dzo+7yKR0vH+Np2nuorpnBtx50Nyn8rQZyBIYWF1HXJI3ou8Iw6O+Zoa7hnQ3OgRmMEAej6nvS0IPXujjPW7sC0BaKHX2uuEM5t4jj4mj8mFcnQIFxau3VY9zihL53dMxYyCwrkQAHd/zo1UUuNuh+K1EA6z8ahk2unjM7hl85yeG63s4XVtse9Ic5vQe5LI49RbY+Ie7Lh7wzSrJdbTTONkDMkrqTbxDX+ctizmQ+TCIa3rPUEiwbrMAFGqTX96a+4Yiywr6i6FR1uFpit0J+uA1OIJnrNxbd3ZLx9zQrFfVAl0ZVbu1eeVTUwTPNmXA6l+vmfO8nUMhErZ0lIQOEFOlfXvVcfrPcoah34bMQoJ9KEvkfAQaff4PQGiMtcSzlOfmHTaAR2bh5XdSQxJTGTibSYrcbRqZ0255032NDb6wyO7Kz/0+eY7Ca0L1Yw+llgd7djsK1d/pZcaJtayxy6m6ok5pmdMHzXv5bJx7gZxVVOB9gQz+K/Po+JtF3LAvP6oMWQeb40rtpwJYPRSb3F2TKIGBYkUKuFmryYWLNIyKR+yWqg9fWRKH3sEf05GwYECGNxog= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7901.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(23010399003)(29003799003)(6133799003)(12006099003)(25016099003)(18002099003)(22082099003)(3023799007)(10067099003)(11063799006)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BUU6ekoGTz5NTOSBxNtX9flc6N45p12e8yOSs2mq/5U9Yt4TpQzYCmsIoh9o+mTIZ57OLu9TbXVLFN+WcTbk5NySKB83vPaoDQXLiGnlq3T2p8VUC+ERRLsfxiKI0C/x/Z/3Ne4GmsFJ3hw7n+stYa/FGWp4Gm8iPWnAssg8lcYQ01bNp0HQtZS61rD8geUdKqbqgMGIhWpA/QXVjU5gS5TJAqWNlAKRn1gYLjdfdQ3ukEwOmtJ10OQ8KRLkMF9k4kic0JPce6DApHAdY8MyNM1Ieb4JwqvsWhvZ/YnQYfazyWnqEAPJAp5LbbRD9vhfbU5qih56dsYGxqrd7q/icaeTXMiXhSG6z2Wy2+DtOGS3HoghLUrDdVZGVdVBgP0apUAvF9mkiI5g7/Q6921iJxBtShzEkeiLB2lBZNXDEFJTp0ft6evIR6eEP9pGXC9o6CCeAinT4IPs/PIkHwHY5xY97bcKF/re6ZS7Z6cslEoWU02KKTdqUZknHHZJV4B5cDv6+jfMXUEUD7aAWfFaQFcKuShAdKXbGvqoKkEF/F+I1XYmnN1vuceF2u7fnXKr9zepbJZWuDIDCV7GZTV+DmZMePy636zoJKer8GARLhKbxY2cIkh9wGVDbt/uea5Jjl2Tf71lVHQnywv3NZ4ItQa9maX8hSNuGkH1SKwAFFzKEqTeX2Uws3NqC2Iu/pVqU5xB+asU3tkygPKJlFn5L2J/hsbMpHMKDyVnVCrOKfqSy0BlxtUdQTxnVa7siNqS0765AxfIWYOdissE5gO72/oErx3fCioTUMoj+yPqvXnDvOH2gpyhYOtrArlotXxLaSXioo7codHhWthvve+U8kyTAssOEQnnGbEtpPF2tFeku54gujPL0jgsjccnDMMyskW8kVEvjEI+gjEoIcL7BCYT98PVc2crnvmE1xPeNCvxvQwaGyEAkOs3vw8jGBkpOJlfZ03Jvv/QjLSz3FCmf3tvIPbFXqYxuwYnlphOAiJQtPpm5sM/58kne+/3O4rLtHPYWRm1YozYNp16Ws9bZ6lv1EQEIoW2v6+du0KVxPMBO+C1GPCe6dIJIK8Ym4anov7gI0z49GY+vlFVD1mZ8snx1KYDDCdsYSe1gR2jTTBCkyF+WKduaYYB/+XPAhf4HZVdocj1OjYPqdpG2E6/pBp1DQUp90ZwMJKtHY1xpM8Pdevhw0MCQYTKS57MaidXl/+RXtLDHiEILIIQAnGQaCzaJKqfGMgWna23xcioeTEJto7S6Bp/algMa8zyRfmHyFwhzfe4oHCOGGSk8D1YQixXG+sdc4p1zcZJ+MTpPMzyE/ex3nBf0k+kZCn35YSS40RzKZVhyitYjoTuoAHi5f3OhG1BlZjUSQqHehNHFUh/XogfkN+6SlbbMxyMt6mK/VbObmd4On7/54Sq38daNz3ZDflf0objQvDqgRkEb7B9JVnKBpOzzyc2xb6YcrnOYMfrxweJ5dZlQCT2CcpbIV8TpOOB9x+V4gZt7qbRzxhQ5OfLS8ITFR/yisdPtvmx5ADs7oGalRIEYzhKCGdE7jvNss5aa+8S5M2A2UADxYPLFqu/ucABejv+1v9rzDKWSOy+5GnS7nKsrGiKD2RHskG4+wTE9NzeSS1n18jKk9Q29iMS82fRcre+OmVnbzNRRGFvtN+fC3eN/oabCDNXj7SVfXIBsdHNTRmAwZr0tZ3+lWPGKLbx75zTEc/UOL+t+ovnjQL7kxD/9e6/VowuVlGcDYvZZSuYad2U84W5tzk= X-Exchange-RoutingPolicyChecked: SNnO6Tw6oLdNtr+WJxnPS2W6tBMlTH7h0nUZ8BRXNOE2CJbG0a4dt1E4LyT/oRxabOxkdPPQcXXNqj0DKV1axSpaKgLbDfL668YDSf2OgbQTJfZDFMeCGmSG+HSeCmHx6Uwj4OEZ/y7dloLJmIuuP1Hl+56u3hqasZvG5P40qwKSS93VRbbBNH+tXprqK13BkSgf31zNwCFzRoZjEDXf9xIlmxk6R/CFcMsXSw/HhNjj1CJAJ21hPi+/Upmt4KnhI3r/pgN8XQcbCslFNVzL9nDf5NAl5P2ZD1Im8FoT9BSbH0ICzt+oOdL4ShwuRz1sIj9PMPl4J+UHDfAdw4wIaw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4269074c-de85-4862-10b6-08df13344a25 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2026 14:19:01.4234 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: y2AovkpG+9hp+WLQooOSpqkFvypeR/328wF4eF20TjfyJb7KeEdj4+P1d823/MlQzf1mTrBT0++QECZO966Dxf+oI5gsfrWKf1eX+Z186xU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PPFDB7809488 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: x2Ilj3vYC-HKO8bYlo0RDxKlx77ncKKE X-Proofpoint-ORIG-GUID: zTDefwCfAOmI53tCo8flRAuGc3UXZIGF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfX84hKjk2OG2Lm cxVZh1nVF929tni4rYpfaGljYIxCGMNt8TmcmiW+SPNtmgYYR7ePtZ7hMGv23MAEkZll29JonBg cFUaZPapeu9OXJZd2y66IOURXUMz8cF4bGOnxC9cwfHViSpwSj85lYxT4yGsVTTdsMSslyInJIc lgSddzDm34MUoUYOXNENHxCOWCH/b7dsyeYMXTgDmCFNUDiLbpCKl7/AS4cneRBtSTCa4o608xI kVuHqRXMx5kkRboArLaOo8aHHQ3tBM455iE7v9SCH3/A7G7XTTMR47k1SdqbGAedA2PLEAMyP/S Y78LR2ALS9H5EnDfZbddF9mBcOlUUrMWqLVLWRXd+ZB0uuXVZidjUyKXF3d277VaNNusP7iN7ok 8e+QitV+RsloQiKA2Go9n8VRirKCYq8tk42E7cgzfqX7TuHXIH322hv0ziuVsISTuVjDzHqRUTY htTc6b+VYjNBTXCMTGg== X-Authority-Analysis: v=2.4 cv=J5Y/fwnS c=1 sm=1 tr=0 ts=6aa953d7 cx=c_pps a=EXmEQszPLboQ/+r5oOSQfg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=HK-ge7EqtdluswH-FwHe:22 a=NEAV23lmAAAA:8 a=ei4SEBeUAAAA:8 a=t7CeM3EgAAAA:8 a=km4ZSH52QcTA4ai30IYA:9 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 a=Oq4Vy3458gLamwXu4UIl:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfX7tHin742rdRR P6r1Y6CVVcLqNlNsvnFrThE7KyMt5R93JrV6SmFtERaCr1C5ipbBOz8sDluQW7i8Hgcpa0xPP/n jneuio3iQpSBXI0s5hNOo0zTL0elckLGUho4mQPRm/h3B1Fo8lXz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-15_04,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 phishscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150208 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Sep 2026 14:19:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245844 From: Sunil Dora compiler-builtins compiles two sets of sources with cc: the outline-atomics files it generates into OUT_DIR and the compiler-rt intrinsics it reads from RUST_COMPILER_RT_ROOT. cc hashes the absolute source directory into each object file name, so the names change with the build location. The added patch strips OUT_DIR or RUST_COMPILER_RT_ROOT before hashing, falling back to CARGO_MANIFEST_DIR. It replaces repro-issue-fix-with-cc-crate-hashmap.patch and covers both sets of sources. [YOCTO #16376] Signed-off-by: Sunil Dora --- ...bject-names-relative-to-source-roots.patch | 71 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 72 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/cc-hash-object-names-relative-to-source-roots.patch diff --git a/meta/recipes-devtools/rust/files/cc-hash-object-names-relative-to-source-roots.patch b/meta/recipes-devtools/rust/files/cc-hash-object-names-relative-to-source-roots.patch new file mode 100644 index 0000000000..bd32c8cda0 --- /dev/null +++ b/meta/recipes-devtools/rust/files/cc-hash-object-names-relative-to-source-roots.patch @@ -0,0 +1,71 @@ +From afb2b50f588cc02042f50aadbd1c28f19bbcd586 Mon Sep 17 00:00:00 2001 +From: Sunil Dora +Date: Tue, 15 Sep 2026 17:05:37 +0530 +Subject: [PATCH] cc: hash object names relative to the root the source came + from + +compiler-builtins builds two sets of objects with the cc crate: the +outline-atomics sources (lse_*.S) it generates into OUT_DIR, and the +compiler-rt C intrinsics it reads from RUST_COMPILER_RT_ROOT. cc hashes the +absolute source directory into each object file name, so the names change +with the build location and the shipped rlib is not reproducible. + +Strip OUT_DIR or RUST_COMPILER_RT_ROOT before hashing, falling back to +CARGO_MANIFEST_DIR as upstream already did. + +The OUT_DIR part is generic and is proposed upstream as +rust-lang/cc-rs#1902. RUST_COMPILER_RT_ROOT is set by rust's own build +system, so that part is not in the upstream submission. + +Upstream-Status: Submitted [https://github.com/rust-lang/cc-rs/pull/1902] + +Signed-off-by: Sunil Dora +--- + vendor/cc-1.2.0/.cargo-checksum.json | 2 +- + vendor/cc-1.2.0/src/command_helpers.rs | 18 +++++++++++++++--- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/vendor/cc-1.2.0/.cargo-checksum.json b/vendor/cc-1.2.0/.cargo-checksum.json +index 470ecbb..2ff8a08 100644 +--- a/vendor/cc-1.2.0/.cargo-checksum.json ++++ b/vendor/cc-1.2.0/.cargo-checksum.json +@@ -1 +1 @@ +-{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"d6e26674a9d7de87dab83262a14f2377988a1e087e4b514f3983f8dd141ea813","CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","Cargo.toml.orig":"0aff9dc74ddbe3bfe89ad9698212a6a18d6124b9593780aad25e277d28e9a71f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"b766a70e39b8ea7bb57afd288bcac205a23f6a26ac5619cb1d5b10f70c5dfdea","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} +\ No newline at end of file ++{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"d6e26674a9d7de87dab83262a14f2377988a1e087e4b514f3983f8dd141ea813","CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","Cargo.toml.orig":"0aff9dc74ddbe3bfe89ad9698212a6a18d6124b9593780aad25e277d28e9a71f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"010873ba1ab0ea4b7e3b5eac72aed5f50e535d42cb94da943d2aa3d74904aa0f","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} +\ No newline at end of file +diff --git a/vendor/cc-1.2.0/src/command_helpers.rs b/vendor/cc-1.2.0/src/command_helpers.rs +index adedab2..c911306 100644 +--- a/vendor/cc-1.2.0/src/command_helpers.rs ++++ b/vendor/cc-1.2.0/src/command_helpers.rs +@@ -315,13 +315,25 @@ pub(crate) fn objects_from_files(files: &[Arc], dst: &Path) -> Result X-Patchwork-Id: 98324 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 906F6C88E53 for ; Tue, 15 Sep 2026 14:19:15 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.24193.1789481946357436043 for ; Tue, 15 Sep 2026 07:19:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=gEyz4063; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=371803a4be=sunilkumar.dora@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68FD0rlt3118785 for ; Tue, 15 Sep 2026 07:19:06 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=nQvOK68S/Dbmdg0ix2F7GV2cKD91kF4FUPWM/REVOMQ=; b= gEyz4063YqOLiiKQeQP3isZHdzjwhwEpYUXFaAE/BGPQei+gIkcLv2jO2bBuH4pZ oU1ilI2iw6fSBB4kFVeEDKn5+fS8YjC5UhCFX4HkbKFpVHpxvpCSO44Cn7WkPWar TixE+h7poouoiD/Md9/nNzGUpDJ2TGLPbfsC197Ai8+z9AfguyBYj9CCWu52IdaP gO0mbMuWcnyjex7FdtcsWdCZMHnkYGE50DMX6m534Ibs2fRfKKhohoJvXxKt/oZB kMuIOBLt5QCALs11QvuFvaoOl7WxkRzEDum1aqGn7RmJ06o5YVKyKxH3q1sbKgOH EGwx0ApqZ9sAYxFFrT3qPA== Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020093.outbound.protection.outlook.com [52.101.85.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gn210p3sr-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Sep 2026 07:19:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Phvpln3pooLknApf/M3HVFjN7m9KJY6OE8s5uFy+7ihXs5Qa3onvxHBUC3ScbkOaYNO2qwAPJazK1RFe9t1pbWlHkkSBsATR55ac3smCXixdjeTbpKHtNdtDCeTzhL5au7XQDAM8zzeU1NB22bHvBqe3+rt0Mw9dCUh2UZOBK3ZH2LtwOGSrfMKHEde5z2mLl+EuhDfzpTkazgRgn2wSTdEt1snS2zjfNS4Z9+X0i52dKMAvLZt9cMoDyVfUGaP128lodr+AC9Yzm6Th+8Jv+zDvgcl+I/T24GngoiJOSJNx0FY2T9tdtXNizyblSQsDi+FUKPzNBduAn/ZiO4O5bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nQvOK68S/Dbmdg0ix2F7GV2cKD91kF4FUPWM/REVOMQ=; b=mTb5OXJRl9o673EfycIc3uTYofsX/Nw7haUhKBuXplbXYNyEJ3nCbM3kT1AYZ2JBRCFW4hTWR7yVPXHb3VWHi+yhYJYh0zmMRyiZCFk3k2P8neWPOn1/ld4wpejYUfHcYqGP95PaUhO73G58VoqAlwhmWGdzcYn5X+ZwArSbK33HPNNkRsQ0rBDxUvq5k2RsBUI8plQ/MD58UrQs+8qJSGnTiHW35KUj4Sgq4MaQMvF7ADXVoENiNvmCNZ+IVthv/bgVnk6q+3KDXeQGGpdgliZXYT9RiNc+oXTWLrI7eZmNsmIikCi06u0dE+LuvGZSe0K7CVve8oMLdj/XIVofoQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) by DS4PPFDB7809488.namprd11.prod.outlook.com (2603:10b6:f:fc02::56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.9; Tue, 15 Sep 2026 14:19:03 +0000 Received: from DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f]) by DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f%3]) with mapi id 15.21.0406.007; Tue, 15 Sep 2026 14:19:03 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, sunilkumar.dora@windriver.com, Randy.Macleod@windriver.com, alejandro@enedino.org Subject: [PATCH 3/5] rust: keep the build host triple out of cargo unit metadata Date: Tue, 15 Sep 2026 19:48:32 +0530 Message-ID: <20260915141834.1212812-4-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> References: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5PR01CA0162.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:1cf::17) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|DS4PPFDB7809488:EE_ X-MS-Office365-Filtering-Correlation-Id: b3accfca-d35e-402f-8634-08df13344b8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|23010399003|29003799003|6133799003|12006099003|25016099003|18002099003|22082099003|3023799007|13003099007|10067099003|11063799006|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: 1fwnbc5Cv9Vl8V0kLQ1bv/lsRi+3Ci5rqKga0H84jtipyzJP+llAZlpB++OjYLVpn3tFUzmUgwsCF5pG8CMm3CFPrjwHMmv51M35tZ9u52nQ118DfmyPdLjgjA+PIiXKGmpInN8ed8l9IN01gsIbuQw5kBH8R5tpA8SowgrHFhADkqW7o2fNxV6GDgIWwmR0MRsapuvJ/xneoXmwMwIzLaaX4epvS8jipMPFAF7aZ7u2cvSa2/v9wLudpALh/fDABN8+i+6p6OA5iOK5Z/f6btUetsGW1YMW3knxagPHfHyhIatJ+FwbTVfMZ9m0264/bofMfLqH84uIekbmSniKMnvoNCQMxMCK2DyY62a8tRCKklk7Jxo/zB1uk/p2YQCZEBqc9B2u1dMo09zGuEoozIPuA8p2ES5WzBcVcgRQZHUdQFQDaQN8Ek4s/L+n9uChV6THy/WePxztID1ayKPDi0JZkoqyTV4XPJMTIBUrUsW+ff7lrjmW29MOq5Hmqvm4imR3SW9hW6P88tMZhBxqYiON7i5kTwjY8IDATpKehSXAp4n3a1oRq7FInpySS+AIArbHUV12O0B79wxNGkyqZfpLaC73Hst4QjDKqRSA293dx2rPloeBfQjnM6qCthclDbHuplyxuz14wmqcDNGaKEwrFAGoW7DO9wFNiGgmeEs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7901.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(23010399003)(29003799003)(6133799003)(12006099003)(25016099003)(18002099003)(22082099003)(3023799007)(13003099007)(10067099003)(11063799006)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lUpuefszXPpfsHuXNQdvadjLz2V+Lcey92gfwltc5IyDCjec2Lc7cr538o1ElpKT1SX55qi7TL7vJkYjn0Q2vUnep3O8B+yyThR+4XlccZ7LupmG/lUKFKjUYNAwISoNgi2vMFu1ohPheirRAR7HVhGOKNfWBc2SXAi1qkcKyoTZupovrPlg0P34pHC56NwbEITdm/IFxKn0pkCPZS1RgplGqVdp1uyssum/0cQQtzf3KXC4lrQma0Jc8gB2bPQrjSxzb4yB4yla1aCMt2UuuSOjdsq7RM2bPBZQqTDHTsVOlZWjqd6H2Ov3Z36AslheSb5jIJ1loHH5BlaqhGwF64wpCGWn0Li4sYEUizs6ZoSzi3Ff6jpHyFUQg3+JypJKev4b1T+PM1NipbzMIeCb5eQAwBC60VGy27DgdPA+Yc0d5mc9eVwXrQX38MUPes2CQR35STmRQMtHEFS7FOuXWNoaqCOFZbi9agV3plj8OKg5CNazo4+Mi5JGaKHVbPRUV42SQYSAg26G28pE9MzdDpQFovjAns9+kiR0Efm9H95Xw3cBCgGutkDvRrHR4DrofjxEzNFVZs3mw1CT2/9VflXPiFgMmnS/x+AFyiN2nmKCXHHVbF9iDDAx7ZzlIFRDKZCqQThiTSNVUbjnaUV/dCdpIgAeFJu9ZKFS3kHmqGgo2KsD6ozNsmULvnJHf1rch4oiBAaQTxA81rfm9nmXfs7feP8qsTOhu1x6i49NQr6nH57zDDdiaYufO2LeMVrvx4mFteAoNvw5ZwITIWLel0/DvMQSlxZYQJdTPuVAmSQd7H4TAgvMR38cqgUHEQ1loJiK93K1kWW9gml8hdmASLFWCWfuWbBkt+kYUHdf8kJqlZNK5RkBcC6gZvLkWb1IhI7Q/fHka5Ww4bq4+RBOCEvAqoinrZib3j+paSOUOLk2+Zg4Xf4qt6CIeQhLV6xCVbKiOTS9KwSzauL06ySHMh4C1oK39T2l/jFHa/EQf5mbanpV9srsrETp3VfpD7WCVKrQIbF8v0j/vQ5yZtOA+Xdzq5sSz1HJZpNUFol2U6Epc5VgwaR4StHeecTNqAACP9NXzCzJwBY3vYD51NbEwm0/NQtYkFpA84IRcGIX8yP/Q4Fs0MLcXaedLSiwfHoP6Us7QYIT25PDNFfCbj2EvHAUiOipu9Bw3CzrFCBj9yvtddTLCdc/IFlhKFYvQgaDDLdJwM/HkrYML/otYgnzOSCFaH+jf/vDjZU0yNvza4tgPlWD/t9DHfuFRQCbpLZ2Hgyj8ixpSUKKmKBS1RsKQuEKLQ0Ge9LgOe3efPgdM9EyoB6QKROaZy2c/IqMNk5zziWyf66UYv3xed8I9ZMhzk01ZsPXjVPPY1W4LeMqVOgrUVCAXvsXHwIfyYYrho+GQQGTNfEPoIIVq8V3jDm9ej/fcEgFt0xCmYc+aSqNixTGzPTsw6JKOFaYDCikD3qNfeFzK3TbzAafeHdz2EwtAtLBn2AtFRDwU0Ou77JyOT/ASOR5t0KPJ5vMDttV3zRcsGSrhS/dN7R+KgFMeeoMJCaPkpI4x2cxy/WVo06340nNV1dW8vKAdyNfWRvkrnlhli9S6G2jhWuqCaqd13tF9ryy6+9569gS6i1l1ZQI2XnAopmjkcKGyb+RQGMNF+5l6fjdSb61IyZAc6u2g5TQlVj7UgFug2ohArZvPQBdRBOeiDN/F7J5o4Fl90MnhbIfandxQ7DIDJKVGNoHO/0iciz+mOI6NQxGREcecd6mItU= X-Exchange-RoutingPolicyChecked: qOyunaXDmfUM2lGBBiMow0bUHvXIwx+iBW6K7FqchrQQBde0PPXOnXw80yo3YIegWBxZ7flD4vg9Y2muHy7Y00+2D7KORE0hSSZAp0TCBx7QtsuglyDtYyhAmIkAfCLG+iGxIxIgiZZ9orFyqi/FdnWI4sQ66qsr4xH4IbjRic8WulSY9gdSA8+5PxOlilt5AOBWAriY5YeK7eCsZo/cveCahlp0CasjeMQjx/wrl/7CE5KkXrNwuJKtZbpMoIh+lAPNk77kX84e19cxs52N9ocYuGG8UbfMUeKp4W+QSs/xg1U1gp31nj6q9kH9vTojJIhlOa2dCotlN4GF0I4H+Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3accfca-d35e-402f-8634-08df13344b8d X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2026 14:19:03.7828 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: E3NJ0hpem6oLOqo1CyruBgdJuoia9+nClKFUPwkMUlB7xiSVKUyG1EEmNcZv2cpopAh06y3INkDpRG6+A+cAILjQdrb3WYhege/MCszfwBM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PPFDB7809488 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: HuZ7BYdhrwC8YAIHK6TiNFNh67onC04B X-Proofpoint-ORIG-GUID: GEidMH5D7LhlZkaiuPsOw56kaOjyV3sj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfX7RRRAGf7lIMI CIfP+Lr2HVGa5PLsMcTuUwlIfwD0oh/5QUb0SWt8mjcXdgOB/sh0a8xXw/CZKLZ8LEtTvCD2f2+ Bux7rvfwOblv1ykKS9O1QSQPuIg30iJv5S/KwF9ZVIjp/enGZcwpTWGckxdPO0tEOfpUJTvsX36 28UyDx2OrWRrkbZ9NmiK5Rw9yV2pHCawfkCA7Nc+8shNQJPUNstelnsag7uFBMOcyRz1pcwIQds 2SncwcZr/DabVSMx1H6YLi2u0jxnws8h9gjqZKkxvSlEqSk8nDxGlBfmcxOc9xMqG1DlNng1D24 82deXxiR0M0B04Wq4han0baKqjgodP4Qbb3ByrEXa+LDwziyBRBQD7eKeEK9fyh37wToOSwPDOt X3cfdRQT718cpisHhAoVWZnOnvukNbgESNmo7Cbc5QeTX+PpTftVSSln+38b4q8HZbnplzH9/iB TTQRt1hzLQYymhH9QUA== X-Authority-Analysis: v=2.4 cv=J5Y/fwnS c=1 sm=1 tr=0 ts=6aa953d9 cx=c_pps a=GdPAKRNZCFWq8uDyhvyBig==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=HK-ge7EqtdluswH-FwHe:22 a=Q4-j1AaZAAAA:8 a=NEAV23lmAAAA:8 a=ei4SEBeUAAAA:8 a=t7CeM3EgAAAA:8 a=zjtiufAZAAAA:8 a=TrGZlGhXKWsQoEPy0aEA:9 a=9H3Qd4_ONW2Ztcrla5EB:22 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 a=2tRhtM0yMehlNRDZlsEQ:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfX7kXdHHfs0h7e XKLxUzZvRghzz5B9i+ipJeS5qDAuRbXXFynJLCg3uPujRFxfc90g4coJXB1iY9Vt69OzSu8J7Ke swLrwUpG9yOrdNi2dxaxvy/UdELnRmSIJAYEJrfTLd9CNxCXmSBU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-15_04,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 phishscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150208 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Sep 2026 14:19:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245845 From: Sunil Dora cargo hashes the "host:" line of "rustc -vV" into the metadata of build scripts and proc-macros. Every target crate that depends on one picks it up, so the same crate gets a different -C metadata and StableCrateId on an x86_64 and an aarch64 build host. The added patch drops the host line from that hash. Patch from Alejandro Enedino Hernandez Samaniego's strict-version-hash series: https://lists.openembedded.org/g/openembedded-core/topic/120939810 [YOCTO #16376] Signed-off-by: Sunil Dora --- ...-host-triple-from-unit-metadata-hash.patch | 62 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/0007-cargo-omit-host-triple-from-unit-metadata-hash.patch diff --git a/meta/recipes-devtools/rust/files/0007-cargo-omit-host-triple-from-unit-metadata-hash.patch b/meta/recipes-devtools/rust/files/0007-cargo-omit-host-triple-from-unit-metadata-hash.patch new file mode 100644 index 0000000000..d4cb48a7a3 --- /dev/null +++ b/meta/recipes-devtools/rust/files/0007-cargo-omit-host-triple-from-unit-metadata-hash.patch @@ -0,0 +1,62 @@ +From 5c4fd7d8b85f4de5be387777a782fc3ddd1227d8 Mon Sep 17 00:00:00 2001 +From: Alejandro Enedino Hernandez Samaniego +Date: Tue, 15 Sep 2026 17:05:36 +0530 +Subject: [PATCH] rust: keep the build host triple out of cargo unit metadata + +cargo hashes the "host:" line of "rustc -vV" into the metadata of host +units, that is build scripts and proc-macros. Every target crate that +depends on one picks that up through its own metadata, so the same crate +gets a different -C metadata and StableCrateId on an x86_64 and an aarch64 +build host. Drop the host from the hash. The same class of problem is +reported upstream, framed as OS differences, in +https://github.com/rust-lang/cargo/issues/8140. + +Patch by Alejandro Enedino Hernandez Samaniego, from his strict-version-hash +v5 series for openembedded-core: +https://lists.openembedded.org/g/openembedded-core/topic/120939810 + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Alejandro Enedino Hernandez Samaniego +Signed-off-by: Sunil Dora +--- + .../core/compiler/build_runner/compilation_files.rs | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs b/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs +index 88cab85..9dbd203 100644 +--- a/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs ++++ b/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs +@@ -877,7 +877,7 @@ fn has_remap_path_prefix(args: &[String]) -> bool { + } + + /// Hash the version of rustc being used during the build process. +-fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher, unit: &Unit) { ++fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher, _unit: &Unit) { + let vers = &bcx.rustc().version; + if vers.pre.is_empty() || bcx.gctx.cli_unstable().separate_nightlies { + // For stable, keep the artifacts separate. This helps if someone is +@@ -886,7 +886,7 @@ fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher, uni + // omitted since rustc should produce the same output for each target + // regardless of the host. + for line in bcx.rustc().verbose_version.lines() { +- if unit.kind.is_host() || !line.starts_with("host: ") { ++ if !line.starts_with("host: ") { + line.hash(hasher); + } + } +@@ -899,12 +899,6 @@ fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher, uni + // This assumes that the first segment is the important bit ("nightly", + // "beta", "dev", etc.). Skip other parts like the `.3` in `-beta.3`. + vers.pre.split('.').next().hash(hasher); +- // Keep "host" since some people switch hosts to implicitly change +- // targets, (like gnu vs musl or gnu vs msvc). In the future, we may want +- // to consider hashing `unit.kind.short_name()` instead. +- if unit.kind.is_host() { +- bcx.rustc().host.hash(hasher); +- } + // None of the other lines are important. Currently they are: + // binary: rustc <-- or "rustdoc" + // commit-hash: 38114ff16e7856f98b2b4be7ab4cd29b38bed59a +-- +2.43.0 diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 54502ccc9e..a294201c6e 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -9,6 +9,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0003-bootstrap-skip-StdarchVerify-when-remote-testing.patch;patchdir=${RUSTSRC} \ file://0004-Backport-commits-from-rust-Fix-selftest-llvm23.patch;patchdir=${RUSTSRC} \ file://0005-rustc_codegen_llvm-Do-not-pass-amx-tf32-to-LLVM-23.patch;patchdir=${RUSTSRC} \ + file://0007-cargo-omit-host-triple-from-unit-metadata-hash.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "be1816e7f6c40abb90245ad6e024bed2a7e88d7dda4561e4d5470207df616b9f" From patchwork Tue Sep 15 14:18:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dora, Sunil Kumar" X-Patchwork-Id: 98323 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 9CCF5C88E7B for ; Tue, 15 Sep 2026 14:19:15 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.24196.1789481951057028132 for ; Tue, 15 Sep 2026 07:19:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=hNA9HgHK; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=371803a4be=sunilkumar.dora@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68FD0aII3613522 for ; Tue, 15 Sep 2026 14:19:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=qLKYMIB9jbd/ta7oM+bKLvAm1pTtsaGazFiuj7NVk5s=; b= hNA9HgHKzeyGeJsIYhB4WsWotKGql8Y0EKzaCmUL5mJZ+9rWbx+CqTf7UCfv3HCh 9Zou4sWOKHFi4SHaEI96TrnjJc7lY1cM7z45TOCx58o6kHhhJpR8ZGA39tBXwRdZ bEdOou5PwXJcVQTzTXW74iocc5nQ6DoKpjilFGQvXTrFMJOpPxJeW8Xx0xcMLfmI J5/F8e4qSeT7HPGqru9NoKitqSd1xyosuIrgdq6XcXtPJHKBm1gb8ZNHGjMKHfH+ aX9DzD8P6VXR43nzU4tNaMK+R62M3TZhsXJrALsVwT0BwjwONhI+viE4BQPAErJN 0pngmXWgUgUpqrVoKV3o+Q== Received: from mw6pr02cu001.outbound.protection.outlook.com (mail-westus2azon11022092.outbound.protection.outlook.com [52.101.48.92]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gmxxnp702-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Sep 2026 14:19:09 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bD+Cxfzl09XBoHBq8fK6gR+tIR4qIyHchzbBkwFUV1/ovKvhRyQ0A4jmFstp238KXYuAyESqebJwIF8FOkiePURRc+RWiVhnGlwrvORadnBs8VhFfbTtZ4elA3Zqm5qhkBLHtNrxFOBAFgPLsEGRTYRM6MA0PQpUiD+N4kg3tqRt6cj4xLbCRut6Xi0xWlTKnP3H93DQ/OWzGyiIqWm8OMNXvHWqSWj981UvFiLiyTxobq5m06mTdugudXrUL4tUFmQn+PJNMz6/NGrjp8VWk2vVHyL3ok7PeegP3Wl1FBWcVvHen/RPHnutbdcEu6432ChUswIxUf3jtBJ9QaV1uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qLKYMIB9jbd/ta7oM+bKLvAm1pTtsaGazFiuj7NVk5s=; b=RGA3UgBZ9FVFywZEGUosW0kz7RxMwja7dyfvHlWVKtlwuLJctXCLuE2RfY8CE8Vghzxkw6sx7kgfoJNLeUIP/ZbRVkbam87pI34mhUNvFxoAkEce5QfH1nYY7ZmtQcPRCR3KisyQCen0owX9rlUQBRZIkDc1Yvv6ryLbhSMuVCG/mGgKe5vubyw9OpSEdGXm7fIGYRs5kZEKqKikpKbPwnmFBZKviQaVcCjkTEaG84oSGc9szt+DOjkBBRfGzKC8zcFSiQbwpi9EmwI2DNi9/4NzhPJiYMFdc0g7BVB2ch6aJ3wq4hsdFDvAMMj2gU1j4QphQ6vCgeQx+tCevmvHsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) by DS4PPFDB7809488.namprd11.prod.outlook.com (2603:10b6:f:fc02::56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.9; Tue, 15 Sep 2026 14:19:06 +0000 Received: from DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f]) by DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f%3]) with mapi id 15.21.0406.007; Tue, 15 Sep 2026 14:19:06 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, sunilkumar.dora@windriver.com, Randy.Macleod@windriver.com, alejandro@enedino.org Subject: [PATCH 4/5] rust: backport deterministic DocLinkResMap serialisation Date: Tue, 15 Sep 2026 19:48:33 +0530 Message-ID: <20260915141834.1212812-5-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> References: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5PR01CA0162.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:1cf::17) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|DS4PPFDB7809488:EE_ X-MS-Office365-Filtering-Correlation-Id: 7591819a-004b-49f1-efe7-08df13344cee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|23010399003|29003799003|6133799003|12006099003|25016099003|18002099003|22082099003|3023799007|10067099003|11063799006|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: u4W70zgqoLnIVPj8jwMSrLnXReu/GydqSHvmZzEuq+eXU/8rs5Y52O1WRkqSz13S7eKfmWBmscxAgpEgND4FNACLUL7WYssZn2ghGk5mGK4+Zhxuo/eRWDdFca6T6NTEpPOALhWW8FVaBAkU7qJVOk0QgZ1wVrQ7omIX/CPfipekXF4oHT/d36540QUfdo0A0ydT7KJ39jb7xxDF1m+/W395zzr0HuJg7sNBcddcru16oGStdLMjAAX+6XiJwev+i/Olm0kic6xwGEC5RFq1LURM168bYy+p7i6C4x82rKs3MLBt4ffXcPEdpQsml0MqzdbLg+oJHRXRgUNBUtDs1GQImqq1r9dICtPUlK742EvVykeWdFNAI7Vjvp9jzoEhtWY0556VLpaQajPoipTq4IkLh+KGYIJh9Eldk7iw82e81xSe2WR93NQgkf+E56E60rdsC7qG1ZqejLdkxmjIQpbIcTRfxMZU7Wx+qLVAqYTLJbvPnjNJWF8SHeYYy0E/khyhk3pkx4LdnAAXB8ZiDyHWg01eC1gHJhAzmepvN6K775shMA5qpkEhnba/4iP6uAgyPolmZp0HOVTBocq4m2WFUExZKvxSHQUaOXYFZX8oodJsayohrBU7Ik5jDwt8xJS317VUOAxocdzCwX5TDUiUC0y8XkFZkblcYrDs970= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7901.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(23010399003)(29003799003)(6133799003)(12006099003)(25016099003)(18002099003)(22082099003)(3023799007)(10067099003)(11063799006)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2BAaft7VsmtR1hw0cxYnvJNuz+vEdBQEWcifs5vIcREhRIrF2ZlcAmfZsovV5+g67L1DMo4MMfpQRyUrjogn3AhMd8JDIY7Pc5F8TsjpM79EAHWnGoT7bnuVaC/hGZ7/Rj8rffhhBbzo28BNJA/Q73dZzwkuVf8Nos56gbt0KJ9PSTpbJCDloNrqy8OfFeX/geFQ5ObEyi2iJ6MHtl3ueiOyPF/BS9g4sWVaSVRlfDtEnym6xD7uyIvuH/yPBijNNBV8ssnTsC4Qgd7KPj7G8i7ecHkjVPWdl9OyezLxyE2AiB3D+0ZPsmiRfjptVqoa3oQEnGmjSduRYpk1a3EJPZetgrUfmwQg+PJIU0bdwF5QYkCDsfH4JsuWjkBEO4TaNI4gXBZKooMtDVpgG0jDG1c8Z6aot9VSYQvim0So1R0DfKX1Kj0AAkcyhVj9Dejkd8jDyxnaEEb8+E9nKHa1NDYEWxjNbOENn7viW09cHRQxxi1CMGsIWysep0CN80ztJSCjHJC3CIVBgrkSGeI36vxNSCOtBQk/ZDptEERjz2OU1KoevdCFBxGMhozvDZRgde7csQwmZptEXgamhoTwa8Yvz/NTAa4vWv6DYJ9Ag8K4dlKBhoHhj9BTbN0FETutioFuhX75ITp0n23HXdn2xLpoWuqxaVlavDjjf0znRFh7tnV74lhW52B/UFFgk3Uc16pqYYsWQvyBggnNRWpb33OkmlX9mNeHyLJyZYd824S1MugvKMiCOHaojHlvcle6+5lmIKuJI9eyLkmLL7uDwhhkkv3VIb3bTusP678+/FUX4C/ARfAgUws0VwoI7R1YdZjq9T5MR320NjymwLEtQizehpnvGRIRew+dj1uin8BkMPa+N2lfpMcbFyKGNt1Ag99e4TpJpur9jnyeTkVLSpxukK2PbNm5dbjOTWrmNYCGVIHjLPiCyGlU4WkuoBXx0/26lWcdUO0ePe8Rq7gFLPiCBVdYC9B7Fq7qt4/2Uru5WAquOEu6Cm+sS8IZUvuDxhPYKLiOgcWaTCeIOaeXlknVxCEIXO985UCOq/TBjagZYUjoQt79S5GfBZ5HptsIjxw4cvj2vx/GWwn8508PoYryQ2MydtKFEgNhzshIhp7ki8NpEWtALv2RjUUYVT9/7b0PF/Xljey+7h4zAKGkDGJYXOCJsAn+8gLoc2TuAag2wLgeuATwnp6IQo9BQnGF1OUDFanQwsA3ndSpaNBsN1svqkh1tPWlPwMOloKuNhMm0bJI8t7DTKHOZC5TjqjAby2w8Ht+fhtxUUvPTjCx3NZnZkjKSrElqa9AoZX+45V2Yfz0pENCIn2FAzqmLq6FGjbVLRk0PWSMdotVNXZ7LGVr3Fwy6zpWDbco/FcmHiZsY0Nzg7IfaCNdw/Lmpa8iRuqlMtlGk5IN2WGHHzPCWAeetIlObZNndltNjYvnLYBVI8d/kF75bG/FztKPIk1YKJqegWkId7BFYmk8LLjg7ODO6yu70Wl8LgYEvAtuNWtHsxrTYFQGSSpDc2isaKwmf7IZ6j3CF8h/nQXoVl8AuL6BVAmzG5YYyZcrzdsPqS3jxjPkI1oXYwt0va2f2gjghmstNw88m4QHHd6ZT726jSQ9tmMYnCkL/ZodaTW81xQgDpRJhx3qNEk7Fq8j+XjJpChCTKdrA662cIJqK2M9l2DD1Aol9SdKUDcaxgqjoQm88xjYNbTzb+8wuBX02HpqZVb4WIaiNSUtEEylSAxI0UyWEK1azj8PRJDvtXYEdBc= X-Exchange-RoutingPolicyChecked: DIgBLDqpMZlqSwh1m+dhCAU4U7JS3eTwyH4IgV76YObT7VSScd3MmuWkOuFz55Y2WUoXOonuYenrMzZYuXZX0LsjeqEqCu3TCjvkIsdwRsQ/DmvUOojRBuMKoJXGj6sp6YwMJUNJQDZAZG/6gkhNle8JBIMULXQq54gcQrYLpBeG3U4H2YslMWfumUixSCGUC1oj+TIKVFuMH239A1o71omnbVrZOYhUToD4U8vJKkhT/FK6g/jHdKmV793z30ulf6hdtM8bY+MXtRfX9ZCcvpFL/Jvnio7dvUB7uCN4Qny+0KfBZA0k5mwVIWzQodeMcXtxlVSvKqlTXjbWtd5q+A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7591819a-004b-49f1-efe7-08df13344cee X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2026 14:19:06.1026 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CvvCCbd66lTtBAQWiSHEWV6I8B80rTmJ8DC7GOkdKvQUUU3mL2I3uavFVK1lPDMHwf9xANbK0ich1bOGMFk0P+aHyfeKt4HUd7NBiPp4VIg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PPFDB7809488 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfXz/GQczP4YAZ9 fdLTb+ToxfcPwDMeXAlgDc9kZyZRoeGWaMytgzQ/K2N0hDOrAmdd416IeDZRVnsCV58kMP1JyTn EwtDfIo+FqjS+gLm/RLxpMbnz2yOLriwkNT3ygm+JYQphO1uArHk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfX4cM2iUrKxW9v KAAliO9ogS2TDppENnNKnHLUflEdDpAPOYTXKz2bGZ7CITZaHkukfqU9WbgkJtArMSMuYevFTL3 /bhk/f/NazRhMaLvmajZHGaXd7+fRmoow/OmVgJT3ywGi8+jhHV3ngycaHFZl14VDpWNNpzbSo7 uizC+W0Bl/nPnxuWAPQJgnBuaQwh3M01W8N5BSW3m02hBsyvuipD5yzocBXQxjoxJEdtL1Wspju Qf55QIXA6OES+hOYYdBiDJpkGZuHfKITpGpTjhhq43wcgmsWbNJPfa4FQerNtxJjMyawNz+ohrb 2ocgndqn6BTCpW/b0WCK0sCTgm/Tsvs/9cxhG20NR9i3ku207xOd69JsifBnFuSeVPR7ctNTNSV 9Ic+6faQ7ea8gn3UpW2uV7PiFGcMA7f3Flj8bQbFlAzeUS5548RfrmntWxWNvZtIBvmClxwIbLh O/gCtHyhsrdRvLcgpbQ== X-Proofpoint-GUID: E7NAmm3tiGqtW6Bs8mpL45Usn2dXnq76 X-Proofpoint-ORIG-GUID: wcZF1kDiN3FfJVLbrYUF-KRlfq2Zm1zt X-Authority-Analysis: v=2.4 cv=R4mWitRX c=1 sm=1 tr=0 ts=6aa953dd cx=c_pps a=kSJWFpm684f10duVF/7JAQ==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=klDOsUkWDRETUCZYPvoE:22 a=NEAV23lmAAAA:8 a=ei4SEBeUAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=kx9bFl9ssQdwfPT5i8IA:9 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-15_04,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 spamscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150208 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Sep 2026 14:19:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245846 From: Sunil Dora Backport of rust-lang/rust commit f9d9939 by jprochazk and mejrs. DocLinkResMap was an UnordMap, so its iteration order varied with the build host and that order reached the encoded rmeta. An FxIndexMap keeps it stable. The commit is in rust 1.99, so this only carries it until the next rust upgrade. [YOCTO #16376] Signed-off-by: Sunil Dora --- ...oc-link-metadata-order-deterministic.patch | 40 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch diff --git a/meta/recipes-devtools/rust/files/0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch b/meta/recipes-devtools/rust/files/0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch new file mode 100644 index 0000000000..8cd64f21bb --- /dev/null +++ b/meta/recipes-devtools/rust/files/0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch @@ -0,0 +1,40 @@ +From 6630363e7bc9bc0926300e242aa538b8d92cdb95 Mon Sep 17 00:00:00 2001 +From: jprochazk +Date: Tue, 15 Sep 2026 17:05:36 +0530 +Subject: [PATCH] make DocLinkResMap an FxIndexMap + +DocLinkResMap was an UnordMap, so its iteration order varied with the build +host and that order ended up in the encoded rmeta. An FxIndexMap keeps the +serialisation stable. Only the code change is carried here, not the +upstream run-make test. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/f9d9939467a5185a72f0ee8da778a0b71fc966ae] + +Signed-off-by: Sunil Dora +--- + compiler/rustc_hir/src/def.rs | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/compiler/rustc_hir/src/def.rs b/compiler/rustc_hir/src/def.rs +index d0300d6..e903c0c 100644 +--- a/compiler/rustc_hir/src/def.rs ++++ b/compiler/rustc_hir/src/def.rs +@@ -4,7 +4,7 @@ use std::fmt::Debug; + + use rustc_ast as ast; + use rustc_ast::NodeId; +-use rustc_data_structures::unord::UnordMap; ++use rustc_data_structures::fx::FxIndexMap; + use rustc_error_messages::{DiagArgValue, IntoDiagArg}; + use rustc_macros::{Decodable, Encodable, StableHash}; + use rustc_span::Symbol; +@@ -969,4 +969,6 @@ pub enum LifetimeRes { + ElidedAnchor { start: NodeId, end: NodeId }, + } + +-pub type DocLinkResMap = UnordMap<(Symbol, Namespace), Option>>; ++// FxIndexMap is necessary because its data ends up in .rmeta files, so its ++// iteration order must be consistent. See #159677 for context. ++pub type DocLinkResMap = FxIndexMap<(Symbol, Namespace), Option>>; +-- +2.43.0 diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index a294201c6e..a50a3fd001 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -10,6 +10,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0004-Backport-commits-from-rust-Fix-selftest-llvm23.patch;patchdir=${RUSTSRC} \ file://0005-rustc_codegen_llvm-Do-not-pass-amx-tf32-to-LLVM-23.patch;patchdir=${RUSTSRC} \ file://0007-cargo-omit-host-triple-from-unit-metadata-hash.patch;patchdir=${RUSTSRC} \ + file://0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "be1816e7f6c40abb90245ad6e024bed2a7e88d7dda4561e4d5470207df616b9f" From patchwork Tue Sep 15 14:18:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dora, Sunil Kumar" X-Patchwork-Id: 98325 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 AD9FFC88E75 for ; Tue, 15 Sep 2026 14:19:15 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.24329.1789481953067230899 for ; Tue, 15 Sep 2026 07:19:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=EoPYn6ZV; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=371803a4be=sunilkumar.dora@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68FD0KYs3537205 for ; Tue, 15 Sep 2026 07:19:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=Q7TCjJ4bvtHnXCavAKhxz74erPb4m80R5bOAzQn7uhA=; b= EoPYn6ZVk3krqpS8Bf4zYW59f4i4VtfrRL3JUe676oiJMxIL4yqjKUjed3/zDLbr 3ZK3UR8PpZAhQFCUbmSWW4VmxJcJXJHmh0wwvwJZ8XuE9GAvAbaVVYlwVmD/tsYx fpQpCGXrSCTeev9pqp6lr0p43GxbFpJGkfVfSQCUVUKbkh6bQeuGelMIv/2YYkkn KW9LY+hg9P44Zm/fga1idN9TRgju41k95IW8sj1rvv56uI/ZDWjBSxlaTUStAjhI xBWgZv+KhVzVSpx6TSP+oCfUUIFTlM5SNw2lYwLS94kRYcdWKzrtlTyJM42UqgXA kIjrnF2kh90qxvRi2LiwIQ== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11022123.outbound.protection.outlook.com [40.107.209.123]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gn68g5a77-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Sep 2026 07:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YbF/SLiK71CWbpYdCxVLnM9LIAxAyG7LDdcfi9H1It47nquPsJuD/pRv5LhO1hXZqi4R7C765C9QOMUc0102Pt1ElGViYfzppXULyE+aICh9ijJb+vJX/wacFNcMAgefbdqSI4UxX6YfPkAv0VsUKYI5Ja98MTi6fJmJ+JhiMjgNgtlKkgoxEqFoMdu4XlnxH6HMyCljv7V92K+61c2Bfv4hYJiAA/B/ylAMSTm/TSHVhaAHATWqsM7vy4Vm32VwP8j3rBKbSys8JoDohReEDTVt/h4L4Oxtado8u4Bgq9EebkUUcek7m/JI6usyr+Hi0/CtP6CS+l2R0k9FUQg/5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q7TCjJ4bvtHnXCavAKhxz74erPb4m80R5bOAzQn7uhA=; b=rDEHzrD3I0ID5aMDxGBclKsoA3bmpVox+pyyb0R+E9QpaNmUgvohN+6Ps6bQ8dRIMuL2liMNxWr4SVsvliy14Z7EHHX91aKh86FGdqjNsTVGK+0PcQANjCnMcZQnYaTlf2phCuG2iS7W7ZeL/bNiyJzmokK7/ahUEu7H8DA9Tvs8PXcD3noa9AL3p1dFBj7ZFTxUYgccNcon1PCk13cTxLrQg3vUmEC8nYs76hw44vBaBabadgZXXTmGvVyvN6tuQvH4/ZoHN0axRoUEFEIl7nQ3DsCQqfPHC66O0lkyt0/q2ZRXe1OzUvwhbEB0IXXejAIxIr0ncR8stkIjvuqdnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) by SJ0PR11MB5197.namprd11.prod.outlook.com (2603:10b6:a03:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.12; Tue, 15 Sep 2026 14:19:08 +0000 Received: from DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f]) by DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::4293:7c4b:a0b5:eb5f%3]) with mapi id 15.21.0406.007; Tue, 15 Sep 2026 14:19:08 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, sunilkumar.dora@windriver.com, Randy.Macleod@windriver.com, alejandro@enedino.org Subject: [PATCH 5/5] rust: sort hygiene data before it is encoded Date: Tue, 15 Sep 2026 19:48:34 +0530 Message-ID: <20260915141834.1212812-6-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> References: <20260915141834.1212812-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5PR01CA0162.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:1cf::17) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|SJ0PR11MB5197:EE_ X-MS-Office365-Filtering-Correlation-Id: bc36a340-ac35-4530-96a9-08df13344e5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|23010399003|1800799024|366016|38350700014|11063799006|56012099006|10067099003|22082099003|18002099003|29003799003|6133799003|12006099003|25016099003|3023799007|13003099007; X-Microsoft-Antispam-Message-Info: xMNlETbCq6Z94fbiITYgIx54Sdt2cK4dtcrrLzivNKNbwG0TbOJUuziNJcutcN53mRYsoEVAz7zNOFhi8+F4GWV4a2Wo1sQLkcLFZfyDuMZoGHlUY0rt0Tiy6fNyJZGq9IAuMhjc26k3uI1kZsHfDgd2obI0ruvNQ/zY0p2ACdTNpoL92nTZ3XTmKlsyUtNdk7q3PBpON6GhUPuhgZF9z3XD/2qMoqQHsVX62Df3frpk/hdp2knrk+Ugmp9LgTChoghn1RGkxaKc02D3SFHQffTCIMm3bvV0354IcG34tWzKp6BFGirQDNLHYxCDPpcdxo2/YTTIcymiYGhhZbm1EMBNlfDWR2gseVE3I/pJA763iopyFBvHWxlGmUq0z/kI2dw/+J5uAAw4Sc4K0l57te81NS/9PtwYcf556IPMjsV0M+nNRk7k+EsPzi+nfYw3hdo1pw7mGMwQa/rDPBgUIarWxhjhsWSPDmJAv/ltqWPSLyztFPVLuD7jSNUNhw2gRo7KDlUPb+4UEDvTZWdrhV3lj/YW6htAKvVNAdXDZcLOfoSzq+1agJYD5rAoesDXaz45edjsXtgV2VL1QhAAXI2t1cCsdz06K7qf3ehcqjJreKb9/4ZoKIpB0ZC9w8tFQ2UIYyQ95suaYDWgSniBVy3y1b4ZX03zU3ObntkSFh8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7901.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(23010399003)(1800799024)(366016)(38350700014)(11063799006)(56012099006)(10067099003)(22082099003)(18002099003)(29003799003)(6133799003)(12006099003)(25016099003)(3023799007)(13003099007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hKnGoliKjRlsCVmepcyb1AFYZb8NnC9GGutn5Pno9zXcKOY3YYRmki/iD1sQOqmxAInvlgsZugAV+EN6xLBlkMqBW6mIdTpF/8AeOYCBL7rMasootW40Yjb3m8Z/PuIDZOWi2pyg6Hf3mi6QhmXHcNYXh6hQyCdSrjZUC4LF1Cha7IKOwPPcLrhorP7RJytNIKwTF4EWso2nkNCXxNqsN0Ymx1i/WBgzmUGXA9gLBalVMmy6d+2UPFmBhaWmTIEBnVrXTB1FVO9Ctthm0sizsAHIgLPLaF3BqiI64aoyXYaK4QMv45gIMjvYZnDRY3+A1gEeq5a17AwiQyGFyN6PzjpPNCnEvcKfZHPuv3zQQpAwFPREMJNQ989xKOgPHyU+d5CVt7bC/sOgD4qLwug7jqUhSK5sifgXCx5mpmWgAocHS4S47Bn345ju4xzdCEuNTkpiEEV1kA0Rj5jL/pabh+lNkkWtDVWFJyux+InQW5Tqs4v/2Rhbp85HElRXXZc3+oAqcbPmOOCylSQeXp6CGX2V4x+x9BZqIevT+uy8dnytNJUFdrh/k086mi8UFPuRLyPOQf79fUlEPedEk8FQNK8EIxCEZu4PKSL2rnnyLPCpF0My4enZSeuTch8jm9wDDJj/8AwVOBB9XbWCyiDJskv31cZYUKHWk7gyLTCymeOzLyUoxsivu1j9dEzuJbLbEZ99KJJU4na8lIz8NNlpyXyOSkcQxu1m87EaFslLKaBeFUixpdW4N31SglKMy/2xay2bhsQp6JDTrVJIZekmuMG5wiygrxmIUPFrvdns7+fkyqS/pcCkBvvRMIivBYGt+wRz14bv5PYUzQJNcReY6+Pc7OUlCQ0AEYDhSJRNSFqhHbCPLkfQ14pDfhoMH3Bb9NgZolx/bSFQRbHJTMqiA7dTBTgHcF3j4uFeovjgfpGngtWqdQdh+bzUfEPrJWa0v26vM4lMq9TUdDSD/oY7PR+55fFa4mlarxJ4s4IL0pTkwcT9dqsQcuDom0vnkEnZj6qd3LJaF5m2UR82+ZXFI9LgIU/F67TXfhogkxXlFP8N/A7so8mv3NvxzpqZZzP+FLfedEYMrYQ5o1Vs0mNwum05t/ZtONKDBnJm7NDXZ3RUq7UR43RuAV/xjmrJW35QEC2at6rIx/hrmAKOxihs2DPg3STtXTpqpnU3ua8gQnNQGfoMOsyZos6na25iexDWkvR7kJNJp/xBRuwqyqun9fqn4R5A28zFniTJ9WuWReJVC2Xw3CO/AAg20MTaR1uGSIaWYXqCwJ7N6JwFOG9lxOnZsZPd0Yeeyl9cipD0mbe/taI0oikS3gOAQ63s3YF7t0sHXbHSLxTXptKwTY9ubt6mJdWkKzTfAXXft42FyxSuE42Q27lq+oEs1ciZMh94cKZ175wkgf/vmGgkPwx1n2m21iTqI8surYvNHyowAPGfv8JkaHdNpi3SYeQJkh/zc+vB7GR4FDrF6XkPP2yLBJVgPkxIKC6jariqRcnDm7PQ4ixeGL1TYMltZa0XZYBMITYeL+26aB4oWRbZXhrXXrpk7QfA2lZcI6sIVxN3LHe+mDKyUWQqSZ9LG1vOk4Gb4AIlRdzmO1UH+d9qQPPqp2ozc8i7y+WaPk5+6dDa1fRO39T8nqcHYKAkGIaOGyzCnfSHw+n6HoyiMeTXiGRwlZzSqY32Wh8oZewwi5Fh7TxHi1YbG/yFIJiOR5Io4XpuayDZwpY9Vgvy1Q/fvxEk7u3f3OhzjYM92irgwSSg0fs= X-Exchange-RoutingPolicyChecked: i7mOFdL8UWiHihY00yvno83D76nKHczyYBC+dFbWot7H5KJ7uFy0bSfUrT75uPlw3Uy4l4mm3B2C9qgQ81hCP5S/MER87RGlXst5wiT3H+HKEnnPod4aUfSwyFCIcJ2kCjKFke6GVYa2VNOaIY8PvOIignBHTws/BGkkSbC7royIxaIRH0HVuedBSs07ouaNEoXGGZZcgvS/KhD7tgf7Yx+4E0OJyyBZA/cPdmBK7nWJUDiBz4yTKxrfr2f8JqgpsoiYNvRM6eyTDU9eOWHjgu/yz8AlsgtPxdURMMbV45Fzu50x6t51BtK7nMT3mSKua3ozm4NuoKno92nHi7ZOrg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc36a340-ac35-4530-96a9-08df13344e5a X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2026 14:19:08.4862 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xMohTaDG7HZ5vd8MAT3BQ5kipZIyh6mxjpqzs5SGNOYMe+LQmLK9WfQKAOW93QDVYFWg9xEfPRydj7EKGXwK+9jiWwOUX2xFobj2N3wsIyY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: ojZMDP1tFKimvtkf8I2LA0O3N6Oj10sL X-Authority-Analysis: v=2.4 cv=cswOAF4i c=1 sm=1 tr=0 ts=6aa953e0 cx=c_pps a=EEuUCq1UVZeKBjwkVe0TyA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=Q4-j1AaZAAAA:8 a=NEAV23lmAAAA:8 a=ei4SEBeUAAAA:8 a=t7CeM3EgAAAA:8 a=zjtiufAZAAAA:8 a=m9gQ31FgLECOTNHg3yQA:9 a=9H3Qd4_ONW2Ztcrla5EB:22 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 a=2tRhtM0yMehlNRDZlsEQ:22 X-Proofpoint-GUID: ZaCGJX6_d_ULV8i80zzNw-DYC9WekVLs X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfXy0fxvqO/Y8zL 6xU/Oa8hKhu/TasZBiLYZg5rWngKDD0G71wU5khPeNoED8Xt6WIsIfmF1kVY+6hHDsEW/H3hpbQ 956fbDfANAPvJrTZ03uXnYVqR6L7eo1vtMhapeV8fnCpyv4OLR1G X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDIwOCBTYWx0ZWRfX9DVHepH9zduF s1xFc8S0vgyjrJOZ7f7UX0JxLQ6pQDorI7op5nKavcdJHNaSxqPRSP1TfM5TEmpf12Op6DIy83U ZBN3DqHQq+fTTz420NIApIQDjxAiqUukI0OPNlu/8Csl2Wq8Ck+994YOPwkZTedxqu1hpby4zZr iYwmqAsUT87zZ2pPsHTpqHxNTtOMNidQzOPSxOm3/CCKeiOhSv0TwVt82yjEvDlNveZU79moegC +AopbLhP73d5Fs4Bwt2qIS9iARB4qUZVkzeO2omTNlW6sgY1yEYSjzru54NSOLoDNCaIma3PRMu HnJWhM2tnRnzpi8xkPNUDkGz3nsTaIOiPqPiOSFWv1tShcjpft4NVfrsbZqEnAxaR+WK0uGJlzV +9p68MfPeA1HmjmIhOqYGDwmSqy1A7hoylfQRN54XQBm6xhb+dPdhsa3AFTq1t6Wvp/SnnbRzxs xDBqdR71ch3GmF2IN7A== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-15_04,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 clxscore=1015 spamscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150208 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Sep 2026 14:19:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245847 From: Sunil Dora HygieneEncodeContext::encode walks a hash set while it writes the syntax context and expansion records into the rmeta, so the byte order of the records follows the iteration order of the set and differs between builds on the arm workers. The added patch sorts both sets before they are written. Upstream tracks this as rust-lang/rust issue 129094 and is fixing it differently in pull request 161450, which is still open, so carry the sort until that lands. Patch from Alejandro Enedino Hernandez Samaniego's strict-version-hash series: https://lists.openembedded.org/g/openembedded-core/topic/120939810 [YOCTO #16376] Signed-off-by: Sunil Dora --- ...hygiene-encoding-order-deterministic.patch | 58 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 59 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/0009-rustc-span-make-hygiene-encoding-order-deterministic.patch diff --git a/meta/recipes-devtools/rust/files/0009-rustc-span-make-hygiene-encoding-order-deterministic.patch b/meta/recipes-devtools/rust/files/0009-rustc-span-make-hygiene-encoding-order-deterministic.patch new file mode 100644 index 0000000000..dddb1c99ba --- /dev/null +++ b/meta/recipes-devtools/rust/files/0009-rustc-span-make-hygiene-encoding-order-deterministic.patch @@ -0,0 +1,58 @@ +From 9c190d14f93bf27c7f1c94d400cda6f48f285a34 Mon Sep 17 00:00:00 2001 +From: Alejandro Enedino Hernandez Samaniego +Date: Tue, 15 Sep 2026 17:05:36 +0530 +Subject: [PATCH] rust: sort syntax contexts and expansions before encoding + +HygieneEncodeContext encodes the pending syntax contexts and expansions in +hash-map order, so the encoded rmeta depends on the build host. Sort both +before encoding. Upstream is fixing the same problem with a different +approach in https://github.com/rust-lang/rust/pull/161450, which is still +open, so this is a local fix rather than a backport of it. + +Patch by Alejandro Enedino Hernandez Samaniego, from his strict-version-hash +v5 series for openembedded-core: +https://lists.openembedded.org/g/openembedded-core/topic/120939810 + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Alejandro Enedino Hernandez Samaniego +Signed-off-by: Sunil Dora +--- + compiler/rustc_span/src/hygiene.rs | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/compiler/rustc_span/src/hygiene.rs b/compiler/rustc_span/src/hygiene.rs +index 1c74205..a464eca 100644 +--- a/compiler/rustc_span/src/hygiene.rs ++++ b/compiler/rustc_span/src/hygiene.rs +@@ -1313,12 +1313,12 @@ impl HygieneEncodeContext { + + // Consume the current round of syntax contexts. + // Drop the lock() temporary early. +- // It's fine to iterate over a HashMap, because the serialization of the table +- // that we insert data into doesn't depend on insertion order. + #[allow(rustc::potential_query_instability)] +- let latest_ctxts = { mem::take(&mut *self.latest_ctxts.lock()) }.into_iter(); ++ let mut latest_ctxts: Vec<_> = { mem::take(&mut *self.latest_ctxts.lock()) }.into_iter().collect(); ++ latest_ctxts.sort_by_key(|ctxt| ctxt.0); + let all_ctxt_data: Vec<_> = HygieneData::with(|data| { + latest_ctxts ++ .into_iter() + .map(|ctxt| (ctxt, data.syntax_context_data[ctxt.0 as usize].key())) + .collect() + }); +@@ -1330,9 +1330,11 @@ impl HygieneEncodeContext { + + // Same as above, but for expansions instead of syntax contexts. + #[allow(rustc::potential_query_instability)] +- let latest_expns = { mem::take(&mut *self.latest_expns.lock()) }.into_iter(); ++ let mut latest_expns: Vec<_> = { mem::take(&mut *self.latest_expns.lock()) }.into_iter().collect(); ++ latest_expns.sort_by_key(|expn| (expn.krate, expn.local_id)); + let all_expn_data: Vec<_> = HygieneData::with(|data| { + latest_expns ++ .into_iter() + .map(|expn| (expn, data.expn_data(expn).clone(), data.expn_hash(expn))) + .collect() + }); +-- +2.43.0 diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index a50a3fd001..562f4afb65 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -11,6 +11,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0005-rustc_codegen_llvm-Do-not-pass-amx-tf32-to-LLVM-23.patch;patchdir=${RUSTSRC} \ file://0007-cargo-omit-host-triple-from-unit-metadata-hash.patch;patchdir=${RUSTSRC} \ file://0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch;patchdir=${RUSTSRC} \ + file://0009-rustc-span-make-hygiene-encoding-order-deterministic.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "be1816e7f6c40abb90245ad6e024bed2a7e88d7dda4561e4d5470207df616b9f"