From patchwork Wed Sep 16 15:23:22 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: 98434 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 3F8D4C982C4 for ; Wed, 16 Sep 2026 15:24:00 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.17561.1789572234977239122 for ; Wed, 16 Sep 2026 08:23:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=YdxQV01A; 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=3719b62dd9=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 68GFD9up2197626 for ; Wed, 16 Sep 2026 15:23:53 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=LWN43iG0gpZL6tFeC8ZaofSoacOdulL2ksdiHk0aRiI=; b= YdxQV01AbSqiW6KnC+xM59SoHzT5NQfEvZdxbycQeJven9sTJdbIa6eh67HUtwfG VeoE/h0BbEe71ik/4WL0nmzVcBgdHAyghpHezJ+oUVjupQ/5uvxBtlkOVWTVtwwU l8zzXNY4YBU1y+pYFTqdy77Kgv1m25bAmOcQTt8Syix8H3oCb6v6y1/2AI0HwQkp kQxFhbcM/6Wb6+kUJ+i3y01TLQ7IahABc6dRrm8mUGDA8/h2LJOjCVm1IME1TrXD tJXsWJOJvD8MzyOmcexg3qxBFtUgXKXRXRAUbOYfsiiTOWOGYIZ844kDyQpOp40b V7Bpl0XB7mJUByOdlPp3SQ== Received: from ph0pr06cu001.outbound.protection.outlook.com (mail-westus3azon11021115.outbound.protection.outlook.com [40.107.208.115]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gqc1nhmmb-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 16 Sep 2026 15:23:53 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=W9V1UpLpeIQT2uOzoImEPARJJ29656zLchaQHB20jyn86CxKQx1ug6b197smLePNOX0rnskDWo5zhxNGxj+BEeWhyLvB0bRfMYTnAQ2qYJVlJVOQePbcEOmg7WZi3y3zEpPNNAWLzZF/7EXTAUkHhhTeaCmDdNLE4O6WaUwoD4tmV2eaoY1sSKA7JBS1aEnxhJ+UNyv//TYEsimCmUtLTxzo2oZv1OskALhzuouXMR+365Yxh13+HNe0iztcozDEybI5g4suvqmG0ESTuvlMs55bSEB0R6dCwrNcwwgw7xSZO80cjUzZyygJOPwyY6Nx7bBHzhWvePp5OHzdzb3LcA== 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=rPzS7Gg5bA6gX9y0i7QaBZ6NmpIr6+PkXeArzkdv9O5cHiNASyHh6Hvpj3KqXH+J0OaM1QSofHDwIOxVFA9AvYLBq5/W3GMw6SiclNtUjm7J88YfWmlVDXNhB0R16MV2FZsWEeKTXB6LB+doRgQjSqT3LtyP03c7J4BT0beBcqT6nhvZrJijN9rKzhe/EPsekIdjZFxJ9y5hHoi0ZZS5ZviWYITWRolJCYeot321m1b1RMIe71uKKoURJtcysNaKtBNVUUVE9/vIZCqvlvfrggWq/46q156Znxl6ezDChjhcvRqVQFhGwNYz0d40qMUzpPPpoqgyfRr8DHmVxh1rWw== 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 IA3PR11MB9184.namprd11.prod.outlook.com (2603:10b6:208:570::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.11; Wed, 16 Sep 2026 15:23:51 +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; Wed, 16 Sep 2026 15:23:51 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, Randy.MacLeod@windriver.com, alejandro@enedino.org, antonin.godard@bootlin.com, sunilkumar.dora@windriver.com Subject: [PATCH v2 1/5] rust: drop the cc object-name reproducibility patch Date: Wed, 16 Sep 2026 20:53:22 +0530 Message-ID: <20260916152327.1765623-2-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> References: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|IA3PR11MB9184:EE_ X-MS-Office365-Filtering-Correlation-Id: aeeb9d09-db87-4389-61f5-08df14068346 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|23010399003|1800799024|13003099007|38350700014|6133799003|3023799007|10067099003|56012099006|11063799006|12006099003|22082099003|18002099003|29003799003|25016099003; X-Microsoft-Antispam-Message-Info: lTF6V2T0izUV+NjzjbuI0NOf8o9TptGzuet5j6MnfaMB3k3SjHfEBcx9zPmiwlRMPNJ5OuHWNzyTW848K85kAVeh98l83kRkAVGcAucOh+/MRsDJ7q2tBs40/kwdItXO+EAB1CB9GAc0jFwNQ+3jJHknva6P3xjx2H98V64P69CjQZS5tkVFk4KX2hyBCmcVqwZSyTYh/nKDq24yGLzv3SlREhuOzlybuqr9/n5xMtaFddxUKF6XuVBSh5PVGtggmPiejv4cYfDB56H1YGDKsFbpZ/yGnK7zx1Sit/gLsd4LKS0UncV+lfOn+swgjHYPV5V2dJwE6rZ8HaQ9S9Ua/IJr76m5OW8kcO7mF9TLgESaZ4fnFhjTJowAdZxIQcjskWsyZHseDXo+yDM7r61OnVAJAIs3QnSu3JcKfvHhK0+O3zyOkPHzJ7vKAjMuBV83SOP3RkA6yW04t+eZkToUogGRgowjlEpYjh3GMDB3BZo4MpSOCF90AE6ylyKxxjTd6GaazSYi2W0mkg0p36/4LqPGrBhjShwIoUQI/BIgP2p8wsSyC5WE08CgfCRLtMd8M6i3cwI1bGGpS7rOH9hGrwrJr2UoR9z9CAvXRTzvqIZkc0xEyQHud5hNEePvEWnk/awGrYc9LevlNR4QL6IJu8sLTNgJ+wHB6ly3wCPWsCE= 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)(52116014)(376014)(366016)(23010399003)(1800799024)(13003099007)(38350700014)(6133799003)(3023799007)(10067099003)(56012099006)(11063799006)(12006099003)(22082099003)(18002099003)(29003799003)(25016099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: roi83VYpjl+u3BGldZ6voXzlQvw28nPKWsgK5fUzAQeD0ONxAecfZ1k1vHkhphh9BTnQBHju/RPd3f95PeCOmKjZpyV3z+rURumGEqqB6NQH0gEazRqxAtzBhvzDU5xMdXnYO3jJNXkxcc/M59176H15GduVxG6BkXFjXk/OTOJt1fxrevVirr2ORViJwO983dfo8ABajSFtv1wtvb798oJSKZ/f9T0cePP3/ROl6m0mXxAN5yQohPM6z41bhe/zVhtEj4tR/RgtLR2btZR1ZAkpuTtJw33DDlUykjkWS7oDW4ioK/jrhuyXCvyDKgguP5WHuTaDVYda39v/2XzqmkMMmFewU7/AJlqtyOCpxBWbJ90D4uMOH6DbF+HnFi14RYDF+xLG/VxLctn0Y+EeAyj2pDyoBQ1rDsQBqRx2RLe8ve7z+QBS6sENhSQ3byETl9CJ340ogVF7AN5GfZRifptWVt3qzaooF19LFDeAMAyUoCviNq6UJeuBzg6T9D0f8mZBuOEvoDz8L+15u4noQHqKXYtemtMxOTIy7az64A8CAOMrJR/5cop7p48bKu5oR0NmQG0gB3m5o7CsZlvwSYVwRwUkmz9CO+GbdReduvUk9+DmpB62e10LSdo72gNbQWdtYVLI8DZ5FYe3dsGmgtbblO6AEH7KKYBa+bf6JtR0TDCAiD9DsjLA0G03DvD414it2fn2hHZMtwnRo2FSzbN+pbN0AvbwHmWYi5TmDyvgwnbT0ARlRyL8OpJBJsG5z/R2HaEh9+8ydQxTqUuGFPUbJZHrwEyJQLmTj3wM96KHicPGXB/pcJ5qeRNUycu58Suvd31k/QsZoCq9rP67qg9YyWblzZ5EIsmHlS2ETQBpGvhZIXbMDUMtzysL9BE6YZANcBYRsq5E06Dd9zRhaOIqeu0x3JxEYNUQ+HulqW4Cy37444bSVA+G4nuX0GDKUM0FRQk3iXVBQT7tD1zp1MeMWj9bs5CgPFKabEwRGBKsxG/CxR4qi2iW6mc68f5I+oWw2FcZBJh9nItHmryPdUJlqbYZns9lsNYL1h1w2WZNEvE8Pnu47du6CxVbzfjucH4c2O2EumQr69xs99ceg8mWswXwAbXW0oM9OdD+9b2uaGQlJ5cK0nNaB5t+Lt9ISlw3diHaviCb1tHT8uG8R3+kq98PM1sjTzzac4/9BEqJ4FwoSHYqskmIa1OSuu3+dhXjjMSCEyaf+zjqS1x2k6UESEY2fxGxVXFl6/2nhfzl4HeG3dzbmePCCUFiEojz0X8Cuj+mFfhTGSfqAz3UrLlkyo6FDq+UfWg3ZQ9/88ugrNwKj+F4gV63mlFY48plHmhMRm+UjyBRaBgaqzE5LBn9VyrXdPWa0ogV2wB0g/uxrYs2vUEdeVHNj6JeiVs8xTHsGrZwIwKXRFeFMpJK+Lm9aeSO+lzeCrTkOivFfwcClfyprXIImMvSkLtGBrfYFvqA4qprOFGXUli6z1KcQpCbuEgFG9YBrN5nPgp0YD16WihkTNj5avGI2TnxUupNuDKU6c+/apNtdmwbFT9kRskXyEK33V8zNT2SuD4u8zppRzQtRYhs5eFpzvY2MEuWzC47FM4EAfsepvPpb38I0oSvGMDgU7MmNBTwMSRutU65V59nqoJVOeskWuN+Acj7uIavX6BV0NGkshXLfoVRjDsefyfBm0Qzyn5Na7Ynvee8Pkl6hy3/+j0tM42eu/Jrz91CoBFNdCPld/rL3BPpLCN9dbiPR3pYrIuyAet6s8E= X-Exchange-RoutingPolicyChecked: ZV3TJQu56w3QvzQ6rq5GE0nMusUSe8/NyelAmioOF9jbYpPGDj02VpZchb/70mcGnSVjdoT3OLbHz/GiMvrOaaZ4e42+qEr5RRj7kEV2GXK0xLUSJjTMoHaeINJe0IcaRmG7oQ0UFofaAdmE6lSVjc7YTQHYAtOCM1NulTQX1WHg+pQoOlN4W2mTcCMtUXeBmS1LR7y+aQFldQ6jvh1QncWfNmr6DRsQc+DOAA0nyzaTx98by7WWOftMrjRdn8hgY+F5RC5LgeHfYSn97XSxo/NEKfljpjATlpnjZkXMOxLLdheUR7iUZVvESWpSytzq4CnTzHL1PwJpqfRxEL4c+w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeeb9d09-db87-4389-61f5-08df14068346 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2026 15:23:51.6242 (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: MEvFpncbjMH6oLBX3R4Wn9lG9ycvvit2hVCtaO8F9Dk6XILR9L/Wosw7OajOoybYcoz5VEvhspiJntpyJ/DlqI4joYn/JtOnxik5bT/Icr8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9184 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: PgcHNL28UpoenwvCMB5qk0LEwQ6EAeb7 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX3GGa6rcPHnHA Eb0noNctH61Ne4CcNxk3Sj0EOk+fscM+p44wQVsasb+AtvQbjb2ifPcUnlmuDn8/LXnxnlP+i22 ZBdlxVSVkDrT2t/4WmGlBfp5xz6yxmEVgmVGzSz50v0D7lih+DRu X-Authority-Analysis: v=2.4 cv=L+GI0OT8 c=1 sm=1 tr=0 ts=6aaab489 cx=c_pps a=gSwIq21hjLySy5HhNOa0Yw==: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=xZ-Vo6NjDGti9U_2Ia8A:9 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 a=Oq4Vy3458gLamwXu4UIl:22 X-Proofpoint-GUID: El3dSBjdsyT83AJdn-Lf0UGATs1A2NCD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX7sTI505EAbD2 wriwc8oJ69DUFZE284/AfZ1ijxCohdiTs980gM6bn6lfTLK5mQ+KVwg77An9wY4ihn8jL4p6uFW E4uWiPbfvFVHzQ6yxO1XylcauD5+K1mR7tUqWArLwJBBAV77wBqz2MXFcVn4m2zoTbTelDTvJH1 ow2iqK1FFSCBP/JWUxAddQi+6R2PJOPgc5+5dj39Q4s8PepIY45V/a6dwvfYYySZgPgSODXqggR WNmwSXVeLnRGiuUIjZiaMeiAMYcbEK6Ofo/R0zeDayv2Gv90grqQ5nfAU2zASRcRJgtGaJH3LT5 IyE8hA9t7dwDSYl/UERZTBGJ3Z/v+KX7XyOjUTEfi2lBK3D0xaxFcShz8El6pnXqQcExTYuM9EM baXCO0MhmjkT09NVrMxaifMopZgNfibgiskdV5TBH1snunWei5HXSZ9sTI2B+8LElzS8y8yzvlT cIEtLN+v+Us3GOL4EDg== 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-16_02,2026-09-16_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 spamscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609160209 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 ; Wed, 16 Sep 2026 15:24:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245982 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 Wed Sep 16 15:23:23 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: 98435 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 41F67C982CA for ; Wed, 16 Sep 2026 15:24:00 +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.17633.1789572238181344838 for ; Wed, 16 Sep 2026 08:23:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=j2Wps5sa; 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=3719b62dd9=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 68GFDfx82198443 for ; Wed, 16 Sep 2026 15:23:57 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=9iWAwkmP3WwijvPT5083mFgzFXfEeOP2KTUO0cYy7RY=; b= j2Wps5sa7d6oig0VRO4Luj8tD8/rFb8/jMGTsk+zHqNWE8zpZ5mGrSg0f7M7u8Wj 71UOS4bIs2E7bZ9kNTOJ99/egcCh9lrtn9+eP85CeWkq0OVK87FvO+0GA6TZWMQc MsvFV2lnf1UigqnAoplj/irfsE0m7BwzLglUcmBYu0MBDMsyJCk7Og8dKlldVw/j lbz7h+KasBFjr/VSi4ioD4vUEtlNtgX5n/V+zZrnnZD0DtEqNSo11LQoXiMGUwsH xpzeYLr7H4QxP5leE+Yb10sCJMSrvWtwt2BJa35pH4484lSZCmds15MksuqSsKvo cqwkGlxjFjJbKvEMRpz/zQ== Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020140.outbound.protection.outlook.com [52.101.85.140]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gqc1nhmmf-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 16 Sep 2026 15:23:56 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CVPfM8GagArOq/bvZ/of+8L7hgmApEw+9wPWRPu98KfcOljBZihNGXJdsq0P67g6fay80FeDxqqmmpTHKjgvjlC8aTDchPDXJaFHFETZEbvxpHAh38eEm9s9FZJHU4MEcmn+JVDuRdKxQSPVP58GHCtqT2vuN1upHFxB+c+FQwsOyVtDiIqpmKjcLt9psWpdTGlM11P7JrnuxGw3/S57Fp8slU8suNOvr86Od2KN7RwYTMEx+iPDFu4JVPDoByOeQBUBi7qSnjGw7jWPrpawuenp4xiGgclstHVJ7A9Wmpc4rPMpDH+VvD/2Vkg4Xvmiz0J+U45zCo8dM0NGRwQpfg== 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=9iWAwkmP3WwijvPT5083mFgzFXfEeOP2KTUO0cYy7RY=; b=NNS1O7cgBO8zLNuDrtp6wiO2ITh4S56u7y6QWQn36NcbPWuQJ6KOL2UgBfV66B5PgH/AIkkh6lVdjlqaieXPVHX49QvVLFKGStqML4wYXdHKJdIIj9CxAJ+I+2CeItFdnOh9mcycA9DUL7SADsw2IJpTXx1h86lfVFXCF5XsO0k1BpVHiXRYOFnzdj0mv8/3yYRqLNKUDCv/8Tkwa9v1zCV57iJnyzjGnp4WTM4AmwiphPRmTK+rVBTsQecQ3ew6P7eeS1YKjl/gARvRs1Oexe3/fpCFM7EiksG5ZG/tXnlZNgi+p9/Jr60JuNRQCnsYfEn3kAlhptmtR31XqePBLA== 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 IA3PR11MB9184.namprd11.prod.outlook.com (2603:10b6:208:570::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.11; Wed, 16 Sep 2026 15:23:54 +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; Wed, 16 Sep 2026 15:23:54 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, Randy.MacLeod@windriver.com, alejandro@enedino.org, antonin.godard@bootlin.com, sunilkumar.dora@windriver.com Subject: [PATCH v2 2/5] rust: hash cc object names relative to their source roots Date: Wed, 16 Sep 2026 20:53:23 +0530 Message-ID: <20260916152327.1765623-3-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> References: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|IA3PR11MB9184:EE_ X-MS-Office365-Filtering-Correlation-Id: cef0bebe-80c1-45fc-a789-08df140684e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|23010399003|1800799024|38350700014|6133799003|3023799007|10067099003|56012099006|11063799006|12006099003|22082099003|18002099003|29003799003|25016099003; X-Microsoft-Antispam-Message-Info: lZ7Zs0ONDp93ajz/8dXzCslyj3W0bfQwwpwBLjAtpglN6Hb3Zb7gElCkeIr4HC0XbET4uOVjmnF2icfJikB8eZVEQpYbemF2wYwrDT5wEzyuK1yI1lD54HtOmphYn4xdiVrhLNrnRP/LTDYOmWz6mdvmVR8algxi2YAWuakzKVvkWvPhWcaC9pNsZj3rdF8pvoOY5FXB8IArj6XGqj3Gu4bmpYg8W9whU4RcfOS7uBd4KoDWxyH8vuprK6EU+VYsWbN11IpfecaIZpTO7oAaJ7Pm5drg1OGWvdJKJO5zb7mvkcbqSzEcc2Y9h5ACXke0qzDIQ/lbYiD/3henU8W7+4sCIEXruq8AMgEKZZxBgzwRu/MhHd40GyuMRC3huiEAwF9Bf7dWOgdKXPaBUAgyqViANf0cgGFisKDAl6lnWw0NTzpjg/Zi1B1P5MQ6/Z2i5nstYGRdL749N3OaaTvcjHNc7newtpKL+ayt7gzdF1kgnb6BV3vjFEkK5aylv0bqwnd3prhnOt2Ch0E+8b/IeqMrY9lR0apupNuzlj4fafeBJodrX1Uc07WwDWRVOa6ASimNyZFhZCJr9YmX/vV7E4dYJ+JNU+EplnYrif6IgWAnFcABsR5Uuvm2f1ylOQnkERF2tuvC1RgRZ2/ajNyJ0QzKrOXbitSV+fP+B8Sfg7k= 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)(52116014)(376014)(366016)(23010399003)(1800799024)(38350700014)(6133799003)(3023799007)(10067099003)(56012099006)(11063799006)(12006099003)(22082099003)(18002099003)(29003799003)(25016099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6Fjo+aUIrBGbdUNdHkDrnQS8Bwv1I+ZvC8QOPrbB/kbjuQ6ujIdveG0G54m8i30IJkha9OJ6RjypnF1qDN5nmH9ie5hbhbzl1F7sMy2C0f4q/x2a3uEl13wdijrhVZlZMvthDXFON/2sRYLU3aE3N9rX56VqcniXYVkFDRAOKLfB3jNUkPC58LaM+7Ywu8lZGjNeRdLtCFU6BNMBe1yUdCynOybyF5gL+bFdZ2Z7Rvt3m09sJbJC7v7rnkwdPwB2HAE3AGhJIv/2u1PW3jshs/Ytzx5G7YuCyP7FnmdsFFsEWhu0GhyIzSn7JpL5JFDgCglCfx/AXrA3y3pe6kBdfgoW62spcYM4IwNL6HUsgJf9nwTOYqff3m4+5WA7dPQeiGlRrsBGK0QczG3rCtJExP7i2RUptLDG+vGn5hM+FDlfTd0K7wj58l5nnAcFnML3iQMQ4Z/6lfOnFfxHGi/8QehgKXJ7ERYBP4bGgF7LDqxzhd6bOndeuiJ68KFPKwZlRkCJwXMLvicuzxN0GvCjwVuBmI70pUnl3WoC8E8CcghMd0kiO5l6BSFGSVeqwOs0qKl27TSVod8jzkmedLtF9ObhxAYX9t/3lgbrIrHiKmiXeERmFj2wDPJo2TYz+ik8K5WGdf1bNp5f2j2Myka22dYUcW+00SE/ui2MQhx4YGOOsygn0SF+OT2GZzElxa1ldcBa0Y/zhJ/UeuVytno+nZXD82tkMpgwmBZytAGAjL4psaoU3QpfZWfiX7eHP+qFnd+60/Thw9ckqiQ89eApW3VpoCH5/jHYkjLtrmRqOpW4bbq5YtIL3kRmaGCQa3DsLnIQHwrHUQNPJXVEfAFvfi5et3aPKrurSsl6CK3KYdWjDFveg6flYRWRR0gE3P1dg+arAy0Z/Z4eMbSlDdth/rVJfNZc2BlduTkIQ/jU1Br7cc4skaERJm7dD2zomzzBgQ3wkqV+3b+KNWYV5q5mvqmhQkvTYr83+KWia4k2S5b7zy9m1gim8jQCgO1iG9+QcMyugUWLmnIRp+s7crCCfXEfOxZCYZLl2aelopTmBhkoO4xyhdcO/FYFOdT8tqfkrXTrhnhZ7iKM1g06ZxxiJEyNj38CY0WhzDbfIkbPKsKPmwiBr48KqCrKyo18VHCSNIu68kc+vLh2Zg019IGLTnSCrTwnlLA8N/5crW1j6IpVaRWcoCMvPnv4xbUTKROEmvsZqO5Xx+1bz6N7biV2IGCQU50jbp6C73nWV4Tg/Irz9Hy1ZZlBWVLBYcIetsz8eN1QHEVKgGAzWHF+n+Feyd2vxlpB8FZ4RfmRUGJmFQ3GH4iPiu9baA8xNQjXifOE0zl/irV1XkALOi5KLpaU0YT6TfbkrJolgk10asZxfg73poAcBIKPffJcW+zlWU87rkV4yS52Q81JEzxfJOSafsv8/8TZhmm/qRRUdrsaRgdePM6MklJdP2xMRJLPLLgG7kUzdkTnXS57O8qqdvYcsKAltkMvDuOU18N6eXj48u82V/yBieoPbf6zo+1BKwG4+gdDwnVGLfCn7XaqpFSuIRlj/6VhBQurG9ezko9R6aehS8q8JSCfU7CxK8IODz97DNe62+Ha40skMkpsqrvXe8YpHd8udLgc6DcnWVHCn+kw1j8NN6RoFpabiVyD+xUfDcc6A+uOiWKxGnIBzHsLDgrd4qLSYV2fym3FPXrSrF7qsaKrm/QKzlw4Xxm27pQK1K9hn9/z2hYkaByW8Iu/ngrLlcjyfwVWscoqJliq2lQ= X-Exchange-RoutingPolicyChecked: nnVIzADRbX3gD2eQm8C+/Q3k/AnQmMyFSEOuOHEX7s55IWwyiYOx3E2NbH/ai90YAF1sABSwc7sKUnsSPft+kOJLwVVXFOgWFtljLp51aGXTKUD+uBU2HXsAc6SSNoGTOCvxoktdySu+mZCe6Jay9fdUy+c05m1DLbhODrP9HFdcc3312afXIvaxmfarSG4K5Ai1/M2Pbe2NJGAWCCDRuh2q6di+sPHW3Ve3pdGUCRAGpPYZvqFNKM4r1u0y+tWgrIVQe8LsXGYJSRUjgsmLpk7cr+6SIWcCpdygIHzn1a448sZ/3TtNxrqtpR80Av05/i6gnCi1gPV56KWGWuDrJQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: cef0bebe-80c1-45fc-a789-08df140684e3 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2026 15:23:54.5325 (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: DTfsr+MD0KZMi2jMLJNRmuujLJs7/ggU62JW6qOJCHVSpHkoKGuZGOs0cTGNAXJOQ8SXaOKxGd0OFAqP2ud5+MXgpUQZu2SsWOrc3/0EppU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9184 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: DYUTS9e37p5vQ1iISq1jmOEK62YBCexi X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX5ksPa/QMA5Y1 4QB0oVhaETJgkMvaT4EhiI4jggYozRlx0RewHmUC8QGWe+XBbwrWGoYmoH95uyg6alVmJnbeKo+ 3YRP8HkcPS8XcBdTbXDrckTup/kY88sJMuBmlIyvz1hwJlmMUjRv X-Authority-Analysis: v=2.4 cv=L+GI0OT8 c=1 sm=1 tr=0 ts=6aaab48c cx=c_pps a=qT2ADiACooojDGKohgXUBA==: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=vKHuM2cOITC_-77vfx8A:9 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 a=Oq4Vy3458gLamwXu4UIl:22 X-Proofpoint-GUID: r0bBSoJf0I-wXLUKdtc01EzEzH7IIseC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX75GGHz8wdwow IyAbVLbXv9E1HtDd71lDlSDYMv1SknjDCDYgqSOv+EixnbfH1Ge5iCNTO/1UlhstRA0msW8WGDW 6fWNDnv7Y11gsjeeK+FkdYAcseD8teRTQfMhvLiXywaUIAbFllw8+2GwXvCoAP0DfSrjVsEb9sP DNu9Cy2Dodc70Ns/O7NFVMuVBuxEZJFYD+haBU6jO9R0f8KfZQzCmSOV3HScRsYHxV1zazyVBoC FcaKSQmoWH2yzXW//0BQV/HBPiPDmFI4QhCmClU/fQFYXmTQw4NueFE0xRg1/Z3MTEA2H7Ax0uO Hk2sAuJjLewtNNsZQmVDhJx4ZcqXrPmzrBwGB01j2f74JkRaSNP00djQDcOy/9qOjsUgetJh3+9 zD6FTnKpOGQtPOefs/sk9x7xFffsC0ql9P8xCd4TH78K6yd7zWmkzARL5uNU4rrTw6BOI/KQvuh +sfX88Xg0p4EMo8kGrg== 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-16_02,2026-09-16_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 spamscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609160209 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 ; Wed, 16 Sep 2026 15:24:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245983 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 --- v2: Upstream-Status of the added patch is now Backport (cc-rs merged the OUT_DIR half); its header wording updated to match. No code change to the rust sources. ...bject-names-relative-to-source-roots.patch | 73 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 74 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..c128bd7144 --- /dev/null +++ b/meta/recipes-devtools/rust/files/cc-hash-object-names-relative-to-source-roots.patch @@ -0,0 +1,73 @@ +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 merged upstream as rust-lang/cc-rs +commit fe27e7b6262, in a slightly different shape: the upstream tree +moved on from the cc 1.2.0 that rust vendors, so the change here keeps +the form that fits these sources. RUST_COMPILER_RT_ROOT is set by +rust's own build system, so that part stays local to this patch. + +Upstream-Status: Backport [https://github.com/rust-lang/cc-rs/commit/fe27e7b62629daddccf1bdc9e9a447a37de2cd06] + +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: 98437 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 449DFC982C5 for ; Wed, 16 Sep 2026 15:24:10 +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.17565.1789572240455375158 for ; Wed, 16 Sep 2026 08:24:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=oXVOBsZc; 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=3719b62dd9=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 68GFC4vl2078327 for ; Wed, 16 Sep 2026 08:23:59 -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=y+fnov+j8S8K2G+aOA++GXPRkxXWDWUeuV/Dgmy/a04=; b= oXVOBsZcBxi2xqXId0UrVCULfxCz0vEg7a52v6/2rTVX87Sd2TLLXlvujJtDJEEu ensD2uKgbct8l2W3okui4AdVTP9vfZp1YvltvzFtwRR/PfGkoCSFH+1NDqLnQbe4 6nC6ivKiSjKPqn6MXZZmqjTU08znHB+d49Hgh75J+iAqUhakfVhDKWeKJWLuRIlN Wz4Zip4JgsUvxF6fMvR9dNDBCczqD07WSed4poJP2J8D3IhGBK3ZAyLs8Su3Tyro 0xgcMBeXwpMjDlZ1WDm1zc2YR5tvWo1SrKtSestec7PaboG9dcmcnvPcakk/Uzzj GlTzi81bkeHEZRRJ0gSGCQ== Received: from bn8pr05cu002.outbound.protection.outlook.com (mail-eastus2azon11021118.outbound.protection.outlook.com [52.101.57.118]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gn68g7gr2-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 16 Sep 2026 08:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jaPpmjuJpSP31AJusmTc41KK0bjQULFFvDft2mrsIRpxtn23bbEU3u7gXX4o42GUNMJA3AoDPeCo16MCd3299Pl5CKqCHi5t+kbvt4aMjyMYQPMGZiblwG0GNXLARXAPwFewjkLY5VllTq25+S6m3Y1v+h5+1fwsoArTNrHKJKBbrZHPoc1FWBXVUoNYXtSBsW/xBCvq7pmdrpnJ14LJDQHQZKGxdNQaHCIgJOTEUcVeeajG06C8Gek1/K2/jdnVBlkf9nsliORNgUBYvjEwsqkul0HqzA7sUH52O4FUM0OH6Fd5b/CV4aUUntO+Tc3erZW49VcWWgjMGTU6JpwZog== 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=y+fnov+j8S8K2G+aOA++GXPRkxXWDWUeuV/Dgmy/a04=; b=lcytb4VzZaxXFrGsdkpU5dFbEso0mXh4j+JGMYPs0N1nTpuoQD05cHol+w/3ONLPM66xf+kt5CgYSJoVq3Fy9O9X7N9f4Kd+HW1wdM8R1OoS+uMuLlrfd4tmMGoiOZ6LSft3gc+lv97d0zwz4LVTDbTIrAkcikzQk88+hVFg5bL9NLz35GMq5BHIea0nItGJa6sAhmAn90U6bVoTiaHsL/mOdbqk3o3j4mMg4dUXkKZkCNBpR7dDVjk6JtEzqPllNBFdW9vsRE1DVm/zKOAyuVwlrcojwMwvhVjHXKX8owA4an460JSETWy3fsX1MTgMhKSFkcs6MkmcqIc0DCVhYQ== 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 IA3PR11MB9184.namprd11.prod.outlook.com (2603:10b6:208:570::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.11; Wed, 16 Sep 2026 15:23:57 +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; Wed, 16 Sep 2026 15:23:57 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, Randy.MacLeod@windriver.com, alejandro@enedino.org, antonin.godard@bootlin.com, sunilkumar.dora@windriver.com Subject: [PATCH v2 3/5] rust: keep the build host triple out of cargo unit metadata Date: Wed, 16 Sep 2026 20:53:24 +0530 Message-ID: <20260916152327.1765623-4-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> References: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|IA3PR11MB9184:EE_ X-MS-Office365-Filtering-Correlation-Id: 960e5525-9b94-49f7-89b2-08df14068695 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|23010399003|1800799024|38350700014|6133799003|3023799007|10067099003|56012099006|11063799006|12006099003|22082099003|18002099003|29003799003|25016099003; X-Microsoft-Antispam-Message-Info: Vfk1CqeBL3g54w9UITGeNvupyveGZ+alsPvPbiFKVjVWiwudS6EHJmLZyIKoqMQIBuLpmcuCZwITeQ/X+2FKhS6QsYo2LSBMw7vvcSNYnV53HPX8fWUch2sA6pob/tWvEQ6LcxGe/GhLEElHM8PBUKBuagECJ+pEI1cu+jLoWtXI2nvf8dKuCu9Yg33P0cUYlpX6z3eMfYskTRgiRAITmqdFReOqRv6KcULk44hnx5sfeljcDIb8/2Der85JlwZItgOVwd9wrHClqxbxx/7PGKBJoA6puRW9bmPPd3+RQwkUqQgqx/a8o3KisLtIEndeRhWQqZ6iNTKMjZQNCNCtsOyKcC47n8Oee9tqnQp6Wxn5gObk15JPlN3Uz6FQgmDSKekkPLqXXEvuH423yjH+3P0PCVWR5nxNFjucZqWCQt0PC34ujI2Bct/iaDBQOMWyMSOeePCfd5yp7Bn+7e1CWntEk0a+nbMMWQXpVTl8ZaZxg2emb32MJc9OCd54VzwJOVffF+JECy2mhrL8zKGxh3wygissEq/pGhwUcPrjiVYC2SF+ShqrJfpei20+uVuEZypXQBO3bYAT1Iwpv2/fpVm8UjyzbRSpnJGH+MyxWSthUX+svkleJ2jWKRNHz7HQlS4+JPHyPfUQksOUDVO7X8iCuRJEaabIHzCaRhzZFDk= 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)(52116014)(376014)(366016)(23010399003)(1800799024)(38350700014)(6133799003)(3023799007)(10067099003)(56012099006)(11063799006)(12006099003)(22082099003)(18002099003)(29003799003)(25016099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cIy1Q20Sn9zzqBZp2oTSYnazC0DIVRhsq2txNS2CAXHDd3F7X2fwholPSOjJQRws/XV/H1d4Kpm4hZO+AWlK1T9eWwfB5QGilfsj6D3Q1lI8/koV54T8JCKSjSSVqrViiqBRWkSNPqZs2m1iuXGLiYyPj48c0trrx3eJe7LujJI+Yw3TbRsseFBHC1q4/Y8JdelxKMEAxr2zczMxCfEJFR3aYgYwxDFe+Hm4TGjoncMKYvwFMR4dZCtW5xN9c4Fxa4namodTb/G985lREcvMqlBVC+QrcCYywQ12lCvC/GE5YuJjxK0G+Ao/4OgPVzbXiEpBhpHfRQZidkVw0KSlwWn5A48S5OKOMkkXFUBNSwMY5dJV70c0uzEc5LDNAMglF/ENVWR0n4Wljyh0Aq+2g1I8ZBHkSPuiv7qU4Fx0BYArVVSeB6XMtfuxzp7hVQwrYV930HG23Cs3UindiXNCfshgtQZPFI6x8h05O+DDmmS1P7aWCx+tWTemfURy7ByARWZNpwS8GhYtm89RHkn4rlR859I8N7Yg9/vAW8W5041Rl+vTJIu6NS0u+Zqmj+0JZ3I0i21yhdKolJx4SYl7GPWhGjbs7PuMrk7gK8qUTgXE3zfs/1awMJilx7G2mPzBXjBNXDq9ffOou3BGWNvFgXBwPh7qUirFoeH9KNWVsLiiOm+SqmiE1iJI/p6822y+99EZZ/+ULi7Nm78I7yBs0e7ASxsO3YjjIWuFo//unzlbplIJriWeuQ9lEdbVN/TvNTFGO2mT0avBffUgGBC8tx4qNurp8UUWyzBu2YTgkg+ELCtgWRqtNJjpSt2gU2jxCMis2earn09/AxywZMQfHxJBFxtvguEfVhR5I2iFxRsKcrZ7Am82JMZqSMrd+h3kn3QIY+S2s4H6oKy5lvMCGtNYfJ+l6/3LIDno8g9B873ts2k2v3zS8jO8aP8R8W00Fzy5cEI6V0hvzDTt9zoeBZwjGyy2ddT3kRRs8EdyejlZeK9UhzLB5sSQ6Y6Hyyx/uF79BUWF+fWUkpK+sVYz1EFGlb9TJVEzPAh+cbWIgTEn44wxA00RM8cbb/vQ9mbWp1ZYJSKvA3D1y2IUUfksVd7wHzt3vSV2OT3wDgfBQrFhbCx2lEmR+A/gfA+uNJ5jUcy6BOkOArGPQ3Qg7a1CL2griRvkqMUstAfgBBsd+ls2TV60z1drFO1AkFMGoai/zVE9l4CRtv10My2ihPTpZNtPVLhxQJiGVNzeCbpJCUYfE7TmJ2gXJFrkkWCz3Wd+j8Dmomrcni5ZB24DTiJ3x/bWxjialyVnBYVslk7/WZnj9OvysRiDPItT+BovZi3CA2G1duZRhpofsnzk7YMxI+MrZxP3fZ9jhHqCKtcDgNh339qJGLGaqwYh24gKdT7MoSXd9WjzIWwB5vmAiSt2WM8KXRMIatyPaekPDOZDP3XI9ch+m5ZMAO/NvdbX4aCwyEv1uczJw/2BVpW7IM5w0vyoG+diVEsF8DMo2i098y5dlIayMJUGZRLonc+5lWabol95IgUpTeJOJtJVEqoNvp04bt5+xgrd/wSbX5ECwrXv5eDHUR18C+i+z4R8i5rS0UalCrhFOXPO8w9p8VO7eZmUr33ukQCAstfoveG1yXCS+FQz3GO+oINqbvdIBtKWweyu2yxoA+ePdhwDerp5wAf/mI20ZoWPSJPRiYoBbqNJeUhs7qLZ4gcMEw/sr+qStoPrhXQTgFtj3KXhCHkZ2PmZ4ppIQ5bY+St7qa8J3ao= X-Exchange-RoutingPolicyChecked: 5ITV7LKazwbj28tgcfKLNvqRXxS7pKqoQdikduDWj5N+JWHH+RcYjit7YLmFT1O2ktlCM6LJNriRgMcxRL3tr/QAUku6Wg8k9YREkAD+QPXLudQ2Lk4eFDanU0BJ/7PLxduRaX9Sa4ioUsTZyxG3vLkdBCIFeY4aIdp0ZbGdiAZnwiRMGXjld0hBKWv6Ws/JKMMpsjDyVBFaiv4+TrQrKipsCt9eHHof9mfcVIg15sDtyT+8DmeVWp08IdQIYR/qRYHklduHwQRRII7aAyEzyVDrWoMzJGRReQJNyEfQjRj5sGsUBQcJIMclbAwJit8WW1OzF1aQ2pFVSnmb940CxA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 960e5525-9b94-49f7-89b2-08df14068695 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2026 15:23:57.1957 (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: Am6s54beuxDs/w7CMtw6T0KTPtMJc5txLgi2iMZH5KAsI0hTY91XJo/gjYmUQIA+NpA6x3ew44rgsgmhg8sJiGDitfUFq45VRpo0hsQltbw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9184 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: tFdZGLjgAjGfZ58J7xlOIUq9VSCqdeLX X-Authority-Analysis: v=2.4 cv=cswOAF4i c=1 sm=1 tr=0 ts=6aaab48f cx=c_pps a=Fp6ZGEvu10dMZ3IStNZSqA==: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=Q4-j1AaZAAAA: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-GUID: da3MhDzPKOutcXt1epyft6fMbv1V4cIx X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfXznxyZted/yfr gWCnJNtVj39ViV+u/LAykdLaS1LfIFqDp8cNNqkW8o5SnkYsNtCNabdKLia1yo7CUwj73AQMEBS HuJyKVoUQ293MtZAzJvZalVGrNrHqcIzRTqdh1wv33dyEfMO02tH X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX11uCi7fRIzVR m7wBjom7WkeOUqLJjLteKl1cuSdSZ9nWm1ibt2eT+h81tMx3snTaYeHDbl+TB6pvpTBjg78/yS+ svJWkIylEiptbown6nFh7sDOtM1N2Hrb2J2nqhNUlzYEMQn/lXJ2JJBtuq2YqKNmHHM0HpAJWRc TgiLtzBOvVAMVjfJDdLymIDVKMO3RsgqH/57ZPTA1cU+8DOfXXguqJGDyhQhdGy04Cw+HJ3Qlj1 JXzyVWHNcW6ieWCdL7rGLRuJGPirLXCREtN5bbWrYqA7d4SxCkWSPU9Vb13b46AdTB2RJ9NP4M3 QTFf4+T5NJe7KjV67VOld4hAVZZU+35Z6WNhtxlubkpSpb9iIyCgR8MMw7PFHOZuv7uylWAfRl1 0eYm8+Ip26qmwDHPPKDKU82caPhLvemzrEwAjX3CcmEt+ua16rqFUoLjDWNrLjmzzpJ+ip1Z5UW GfYkeWFrFhn2LdnEoxQ== 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-16_02,2026-09-16_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-2609160209 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 ; Wed, 16 Sep 2026 15:24:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245984 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. [YOCTO #16376] Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Sunil Dora --- v2: added Alejandro's Signed-off-by, dropped the link paragraph from the commit message. No code change. ...-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 Wed Sep 16 15:23:25 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: 98436 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 3FACEC982C4 for ; Wed, 16 Sep 2026 15:24:10 +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.17635.1789572242513980584 for ; Wed, 16 Sep 2026 08:24:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=dnnM35T7; 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=3719b62dd9=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 68GFCtcI1650312 for ; Wed, 16 Sep 2026 08:24:02 -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=gmqdymSsCGta3tV8Xowh/s/4ID5Ij99R0Z3gcLYC4bs=; b= dnnM35T7zXObK7//9CF4zXnUj/BfZFi5LxcWEMnNk3aCUxNhfDy4YuOintUuGVPT qnfB3O2mKq9kOwyqy2rtVzBg7F6b/0unZ1guXgTN7Bq/3HFLdKqdz2vNJoTOL0BZ +kB0+lsW+44GO7uCMUjE0ZFZmF8m0BOxuz6LxH9E7eUFHrecVO4QzyEd36KyC0wG a9iAJp3+BdQYEk5l3902GMu2D0bolTJxCoOTDDxae/D/SJ/e08B/NuF1kY09nf34 cuWBqQ7UNE/CIsyrcgKnpkb5yO0yZgc5+tENgZJ8bTobMCneFhJku8U+zMZlq5g+ 9sptl3U86/4OmF4VUmqhFw== Received: from bn8pr05cu002.outbound.protection.outlook.com (mail-eastus2azon11021111.outbound.protection.outlook.com [52.101.57.111]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gn210r8qe-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 16 Sep 2026 08:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VuEahFVbvCLOo48Pfv21cDXv2gKK6hEunSmRWoi/9DcSsA66dDyFkak213fRYfGs8ZtASSYiY7EXJUP7oUuyJBpD/xDGyr8xKFuW+7va0ViK719pXHdP/E6wWUV8Z8L6c/OtEN7xH1G+0cJwzbYmoS/fPuxwjPnBlZOiN7zgxEGRgYgJtK4G5g+cLqkPND3elMJhWdptSYqL7mM5IzJIWaxHSWR2r8mBEXG4f3ke3Q3FBW9R30fiEXr8AfS58FytKmSNxrmh3f92TkdGABvRq+J5VYEfnfYaUu0dvqGhXraxWKGBFl1em//0czEXBl6o3GdgUpWksFeTouAukBj7HQ== 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=gmqdymSsCGta3tV8Xowh/s/4ID5Ij99R0Z3gcLYC4bs=; b=BGJx8s7rDuJkvsZVTm/4Z8DjQuDOlPdQkpCSfpw88zMdxFihWQ8RAW4n35eTWvACy2tC31DM+Ad9Fu+CcQn8aq7RSrT4/vKK/h2F5ognAi0clAcTQJFV/QiTbq0Pgd1lj5811Uz4dS5/SWhZ445SZHEhMnUXHfNFodDC1p3wVS3UxaJbfOUSTVSZ4077B30JUvUE8reQ9coK/yGAfKgdJ0RsTi3J0ytwfzIDUJO0QlSpCxwQm92WUWh8MlqAoDWM33hZQPTyxuydPChj1OkMBGPUHOJ/6VVpp46R7kKh4tK87GlzNXplN1HH2y7V8CnxDTNo1JnNPnyOcAr0PfmSgg== 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 IA3PR11MB9184.namprd11.prod.outlook.com (2603:10b6:208:570::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.11; Wed, 16 Sep 2026 15:24:00 +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; Wed, 16 Sep 2026 15:23:59 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, Randy.MacLeod@windriver.com, alejandro@enedino.org, antonin.godard@bootlin.com, sunilkumar.dora@windriver.com Subject: [PATCH v2 4/5] rust: backport deterministic DocLinkResMap serialisation Date: Wed, 16 Sep 2026 20:53:25 +0530 Message-ID: <20260916152327.1765623-5-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> References: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|IA3PR11MB9184:EE_ X-MS-Office365-Filtering-Correlation-Id: c3c53e3e-1e2b-48e4-9ebb-08df1406882c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|23010399003|1800799024|13003099007|38350700014|6133799003|3023799007|10067099003|56012099006|11063799006|12006099003|22082099003|18002099003|29003799003|25016099003; X-Microsoft-Antispam-Message-Info: ++LzR0Xr3G8d9vhF5j7bwc6AiNcDUZeb1BfyUOsIuisDF4bH9eBuWyT1TsLhyghav+0iSyBCebQps9AaNbAANKf13lng82FzPO8/dQseH+VaD4SoStkx029bx31bpMUYfeMlrUQi49jbYW0dDPPT4MwxUebkc8G9NkeJLZQj8p0Du2oOV8CW4Qw5PQhfzHiPUv/Q3GeQrygKoBFScLrdJQ3wcb+IyEZTtMJQAGOEkKejjaYNs+d880c2Z4Cjf+I+hkCHQo1wjrIsf4wmUqnuoyVSymLUGwJUvfya+xI4FRZU9XdbpRFn8Temi9qJRTGaJwNiHDdOkTnK9H+F+qSxFLQoLHsLllaI+7qyfRj8vopIgKSUj69igMbugvzfgbWqQuQ25YuQaJoEJPUWgBGYR5soag8UJ2Qcm9DZPKFq37oMrNa3h2+q3lgf4Oe3bvzc33MIkp38u1F9vZdSwsJVl56Omjq1limImpLlqDEzM1WBpLmpO2AdlMPQptYr47LecJ40RbpgY3NZgdlL+tAyyXmMNM+aRv7b7dyrtd8bDfpDV6lfCtWF8mcvQKai4pAdM8vYAPn7OyOkBf23mB3a/kq9vMguK0mCe2jvBAneOA7DgFhDYlxcyYYVC1NQs1Bjd9If9iyvNgbfdrVGE5sqfiRmywYNZXzE9aheV+u60A0= 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)(52116014)(376014)(366016)(23010399003)(1800799024)(13003099007)(38350700014)(6133799003)(3023799007)(10067099003)(56012099006)(11063799006)(12006099003)(22082099003)(18002099003)(29003799003)(25016099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dxz6iQkDxlXLCCbsmqwLHV1AS4bkxWetp0Y5MP5e8FUTTifr8tVTVNIc91YzOyx/TBTh/Dv3EOyGg9YwYD3TmiXzn5rw62ATeYzx71mNTUeO2pa1SEdZDEZSCYjBpPKk2/e+Q6+1crU3zMXpqLujUk4AuKTyNDzVA2B5Oc2xHXoRJuukRiODArDr5picDRXuOCXQ1LolzXrD8IlesfnqQI83fbkQtWfNbhOItToFxjfwsBMJquG3rcMrL61FOo//JAa3D5wX+1Pd87nZWz2Nq9/anNlfpExifx52tuB4JuJBb3kQySBWYtB2Vaiv1e5L4NSZD1k2rDneVWKpjAC3mYTLuGedk28qgvdTvzZCzrLV12PheOH7WYpKPsB1v5B+0AltTWSfHZTzJ602gLoRvtOkMyinFyCx9VzHSYOt5+VM7RuNyS50RA7mShpGL4qE+lyKdZHMpNFBE6iSVJ2Gvro6Xy1lZKm0HE7BTd00sWulRx+wFPMYSnEgf6zsRXxMIBY1ufxJpzZSL4NZU0eStOBjwq/hLVIc7qtf1WcZ7g4b+d2kcaXfOGRbohRc5QHW7kMm16bjBXblsC5bRFe9mXlZZY2rOMtdWlakn8U3qVT5LBzV98wVTsJp9QpfYoCCM0fEqnLRK/ZEkOFyDB5xTL1nIQ9HxIKYrcpKEnos3sBIl5/ygjROKDW58I0f4Ym2bGU5na4tZmeiR320VyW64YpBMGchs81n2w1uRh9B216a7SGlkGV+RWzNfk/e8U/0ab/z5aVrJtvjIxHNgiTLOf6ulAaNptxiC2uEknNvhBToLihOs4d57u0QGY0PpWFIO/Fa94hh5G53wNGf1JSOqdhr6KgGVi1rqguxld4UK6xWBfPJBX+Tyotp8fo9byFb4VadYlqCJ9fxL7OndQlHihxmZVfUckrw/RIMq5DGfzqQlMe3CfuMgpWlnpMhm0d2tCBws8UGYvvEzPi0cpoAhankgloYpvKv131xY+bGApnQiazlTjM7pU4SUNmc21a2q0mcWnEfKwTmbxeLuV8ZLGVBqL3h9ps+U06pvo+sn/q3OeJfjVrU9aLd9P0glJDmPL2fdFrouC5Ufsqajrw9qh6Z5W9LVoMiur1yJkprxLgPzFgOMmUJkaz+x0M9vktGzQy41UrwaSNZAPqlNeinSilYgad7YIHM1EmhhgOP9TSeCuxAjQOfclqj+6xMiKRUgn2gccmfiGUM2kGo3bi0RsB1jn05sEhni4uL7rbICIEJY8bKrMxpFP8pvPFInypdA7A/4H92BaFnhQqrxcWafFUmNhjFhpnTV42FbNU4iVtfLwWaPkZcAzyPkoboAKWTOk432ziwmEfB2xGqD6jTZnyMs7mqCLUJNvSbMBcDJdQlLLxb8gwv3MIfFJgNFN56IBeX9saLDURRCxJCgdx3oxrHhErQv77xTZoTEZYkpkpLWsbl40paRcYjSpKNMsi2Khu6TLhBOYjv1TzXjd0qwRRct8WH0BG7HXHBG5n6zIWAPt695Bdl+yfnzFeE02GuzVABquu6mKLJkpal7zfSH/4ZFExV+ndzf6iVJ98PqqY3s9AcYqElT+T5mSjHjd+A+RhZRVyaxIRxc2bfBU3/wxo7vHR4nN00KecYIAUvTyBB6FeH7+7uiGtdhDhWzA7AM8i/8AyxRYUq7cyQus9sn9hHd3DzDRF+dUq+a3frZwNk3NHs9wAcc120tmBT2luwDtV/zjotAg2Ff7T+Ml+0UOfK2Uk6zX2dE31s8G9szRo= X-Exchange-RoutingPolicyChecked: LBFeqN8DCyYmxrTF0Jqm3pUNn2w4IqqL8WuT+G0WJIp7xmzC3UsVR/g3dHUGJE1ak0kDAm/eLuP3eWXv0qg47I2fxXI2x5j+LsxqT8r5q9ST43oWiaoovXH9ZgnsQ0NeZmX8BHie1GxOoJeMWCpaPBXv43PSGtGx1YU+Oezk8pfDxaPnhjSSKKeI2OFiqTnve9+fI6v3+tj4Ole4QH6A6ZVj85jiezC2B7uWrvmceDzLQWUO8UhXplUbhyvea+hSMkuaC2afp+WxYZFt1EG1exkQqv0BQBaVqs9hLVVBJh5uHyQhv49Tu+qSPZ9j44w5pPacPb8QY17v73p3RW/how== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3c53e3e-1e2b-48e4-9ebb-08df1406882c X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2026 15:23:59.7967 (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: HOo+euWoIOmuZB2ETQglIIjuUjEAwB/orbZYq0RcFD8eaujInp/C843btWcZIYy4V45TvU462HV9YCuqMCQE9O2C5UhhVYwFMC5VRmnZw3Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9184 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: WyoR2uVSE6YwlR9aDjhvfdkoNBfIKcI4 X-Proofpoint-ORIG-GUID: EG3c08o0TBxLKvtmTtmV5ZWkBBNw397J X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX9DcOSv1l3OL/ GZ248VJp7QqsxIWuDjc+yXBaW2ycdmL7/xvzBMWvteUphlByBevrgRpaqilbrsneiCoICF6GnT5 Z0uaGZ8r/KMgwtjzL+O/gN6NMfyQ7sIbWgyr12i0eRNaOQD3a6uI+lr5bwGQrUnKXg/+Vs05DVK DlOxmKpswTacsHOu1hm7ZzmJSQ3vRvni3tcDD1eoRIvYrYMi1KbdZHKJs4+1bhvIchKLCt/JqY2 qmt5FaP7LMGFRHIu37qTLoxDQKKGhRRaz1A1PdUn2/gAViWIJheg8BC2MGnNxLJLenRWbIQDq21 20Px1I0HjeJ24q4uxDD2tGnZ8CfuvPzfVnCxyfBoc6ADqgrnsuawBDlezt3KeS5sGbBFJGcl3g9 YpeUh117V5wMg/7z4KS6lVLq8DndTiI1Y2wpRbuB2m0V0/wMjckHNqAPc8jwylrL9EroBEDYt0t Ko3Ce+xIaiao64N3v9w== X-Authority-Analysis: v=2.4 cv=J5Y/fwnS c=1 sm=1 tr=0 ts=6aaab492 cx=c_pps a=tCAl8lrDRzME13Kae+DQfw==: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=pGLkceISAAAA:8 a=kx9bFl9ssQdwfPT5i8IA:9 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX9ADcuPY7b9vZ c85pF8uMbKZequNsppltaH9QaaqmG7O5CkWogUszQZGMUdbK89tUs2I817DlkIfY9UcpCHRhMY4 EO3e7+WunUm4aByjs1nHNAaKvo9nMXWfOrVk4sanut2AJXUSAt9p 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-16_02,2026-09-16_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-2609160209 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 ; Wed, 16 Sep 2026 15:24:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245985 From: Sunil Dora Backport of rust-lang/rust commit f9d9939 [1] 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. [1] https://github.com/rust-lang/rust/commit/f9d9939467a5185a72f0ee8da778a0b71fc966ae [YOCTO #16376] Signed-off-by: Sunil Dora --- v2: upstream commit reference added as a footnote link. No code change. ...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 Wed Sep 16 15:23:26 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: 98438 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 32500C982C4 for ; Wed, 16 Sep 2026 15:24:20 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.17574.1789572251726073572 for ; Wed, 16 Sep 2026 08:24:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=L9jXxlmv; 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=3719b62dd9=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 68GFDYeD2197918 for ; Wed, 16 Sep 2026 15:24: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=DsQ8/3XApkDgSUgskWOKAtEo9Cs/b7wRTa/pRYapOMo=; b= L9jXxlmvSfWLBJ8UnPvq7dCukNcqfoRV9WAZVy8ojRvSS+yKN/n9mJCi0TVqeDwl nERyiTCMv1cErREnt2k1SWobxMDvcMQiPDMXaLxcJTTyXU1D5k5MtMOMa4bhUnAB OIwn6G3v0PP4J0rmRSxlU9ZwoPd9sLShZB0ewWuV8+4P843ZVW27tnTRnF66jYGM F07NMYlNI6wLsfE6qmCkov3LHT4MLFJ6f9iIWdIm+Vh3KWT8obzv3G/oGTu3PB1t 2q5BS4CZHjXZ418qoxNrsm3kIRHTtiRMCOtl3sJOG47nqpZgFGBK4GB/ZYj4yDIC kuZ8Yg9eeV5FS/g2nFdnaQ== Received: from bn8pr05cu002.outbound.protection.outlook.com (mail-eastus2azon11021128.outbound.protection.outlook.com [52.101.57.128]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4gqc1nhmn3-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 16 Sep 2026 15:24:10 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ydA5fH54isweQBXxXg/edGcLFgeRFP3TxVa6C+be2HdpBjPuGjfA6lBzEXkVQf4lWwS2JE+cQeh4vaslfRL7ZlY0YYZ/XzM/aZiK/N8lwKNF3J5kiWWyydMIChXv5Dj946mdE6c85meNlNXkXOs1kkH2sLoPZq925LQpfl2iFn6pcSQp1/5hkX0XcHoTs09cJQUrwM4l+ATW7NeWvIYgsquG1pz7RbIYMy0kLZaTAWgPPsFrn2RviAD9t6Tmg87+cFSUnqQ+lzjSyAviziM4/3XePuDIovkjy0hEdUi3QF//ulwg1VcgOF9lqPd34eHKuKYdrP2TlkmU3ZVM6TM5Ww== 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=DsQ8/3XApkDgSUgskWOKAtEo9Cs/b7wRTa/pRYapOMo=; b=TT8DWcf7qcKsivcU3whGNXOiOCe3cNfEAWO4Y5HbWTkqo5vxkh8mzdVQSOOKdM6EZGHb9HA1n3gP6X3rlF5ke7PGOBwkYJzDbm+ZxOQOJ3Ob7pSS2lj6roO3gceG6Xzy3DWmLGWcsQX+H+fBwU/QOvoYNnppUAbjj5NcYbq67nPctmvcRx+/CzUUp6u+VXQOgMWPBf7S+ZdVjbQ5sLMrCWd/NVmgmk5fFtOdl9aZNm608UjKRl0f0idRkP2doZTmkAvTbAR2bJEYF18MstP+0HGrVzo1xFygIHzOXA3QW5g6j2yVtBOSPHhLRByX4nyDhWWpepkOy6QeQa8A1TP2dA== 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 SN7PR11MB7091.namprd11.prod.outlook.com (2603:10b6:806:29a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.12; Wed, 16 Sep 2026 15:24:02 +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; Wed, 16 Sep 2026 15:24:02 +0000 From: sunilkumar.dora@windriver.com To: openembedded-core@lists.openembedded.org Cc: richard.purdie@linuxfoundation.org, sundeep.kokkonda@windriver.com, Randy.MacLeod@windriver.com, alejandro@enedino.org, antonin.godard@bootlin.com, sunilkumar.dora@windriver.com Subject: [PATCH v2 5/5] rust: sort hygiene data before it is encoded Date: Wed, 16 Sep 2026 20:53:26 +0530 Message-ID: <20260916152327.1765623-6-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> References: <20260916152327.1765623-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: MA5P287CA0130.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d2::12) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|SN7PR11MB7091:EE_ X-MS-Office365-Filtering-Correlation-Id: 05548890-1acb-400f-297e-08df140689b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|23010399003|1800799024|38350700014|13003099007|6133799003|3023799007|10067099003|25016099003|56012099006|11063799006|22082099003|18002099003|29003799003|12006099003; X-Microsoft-Antispam-Message-Info: y81cmG33w5z1LrZ8IFx1gvLIu/1S9b5IECmxI6mbOu6z9mlb1cu3GmvH862dMazKEaABAlNvbill13PxnyI/qRRCnMEWTUJpsMCPNKOcVyplubcfxAG4AgeRALHE2aZuz+09P7BTdrEv3grMIB3CYMt7OdZC3PzaKvUmPI0gH8VtTk+W32r+bGIMDPWkRqqV20piWTl0KWnJafnJ4349CUtYffyUxdZSypYeospzLAhNWRdqtB9K12OgL4hNWQdAgsRaEKq93eK+/Xky8V+NaUJaqAzK2VZhFXJoizDIKrwMsBaoIRZ9jK75NfHXi10bbZuWRqoT5i+mrH7H6hucgaYoTHiRCsMh51Tk/D0g8WJeYgo/ZpqTO/YLjBlLqGiUc/ge5L5ozBmlgPkbIcXLzW7ZBUtNlCSBczYokpCt6LhD4CTXdFfU558BuLBsB1YfwqrAELGl0nL58Qrgp6hmyOHb3yLNZzF7Zzj6SYwbagspnfH+E7xU0pi5LfuJALGLyy/ozLShPxpL/J2JwkGki3DpwH1AkBKZawyXEDdGWPTKSextO02czeUIECrr+agGCvVjLZ4s+4RWFsB4OUuxqFFF//p6A9xnrjyQo4Nwt7G4A33dp7pHkoJb5G7qv0GahE4C5Yw2sa8Q4WPqQNDhtynuUC1rAxZlprzmejmAceI= 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)(52116014)(376014)(366016)(23010399003)(1800799024)(38350700014)(13003099007)(6133799003)(3023799007)(10067099003)(25016099003)(56012099006)(11063799006)(22082099003)(18002099003)(29003799003)(12006099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YFRy+Uhy88kVrqoJ2Sgr4Z1NaPvxAwA5MZGeVvw86snl/ajhuUf/Y3aPBFCBp8k+ioxvG0E8KDgnqzesG3X3uAHpDpTWYm6r5iQlde/PHkXvhW2z4ZgIvPMgbIoLPBUDhTvixfiUsIbE+5Hff7jkt/ExglMl3XNu2iLnJwet8daJ8hi2uv/h2yOLiCu4AHxejZj8M+9kWJ8tazRG3qtY7PQx5CH/MyC+NoXoOHM/2Ltvpk0VuaX9EjBbc6mVs9JSM9mUqV3WiGtchbkAtZj6GONUaabUcjYwqZCI/DNo0c9xCl3qkmX/ZsOW12XOlNy5o3qMjpJpMTn+0wdeZ9b7dwAjTgP45pzTbLNv91XWpgfP+BCntV4AFcVSMu6QBFTJdRExpPzw4t+dx2M5LJbtxf4R1XYirRmqJ7i/UouebbBu+m/oKtmU4T2JI/gaF+QNOOXPHAesvwGRhMbRGjfp0EJzTTU+tbXIsok1SGVxpF/jGnd9uY+3zhNhDe5ZDU9b/pvVZWg4o9lfvy7jd00/EAMFciLvpn7ZK6BklrGCabh2bGCd7+apDJvjpyTyF8SBwHHlW7mcqbs6mPlUwW3EtFzlwSHep6I/b1HJv7cfACuMAB02M9+sz6nGnhF20SexQfDyJEDwoXG8h7BOh4t26+po3BuYtkV1hc3KHBs9N3gyqj9nr2bGOWDJ582p3vjUyKWpBqEuNeCEFajX9LM7Ef5VKfncaTUZaD2FLPsqw66SkIrPbfhlK0Fl+8CiXrcltQvn0Q6HeBYSpShFwhPMlQl1KGmsgMJPTFw1avujkiHwoDZEMpOa0EBKhIwqMdS9DVM9q+4mxBb6UDxbsrdx7ojKGwfXHDEO1t/7zVo2jhkcZN9KuBati6O3FtDY46wLcAEKnSPPKjlj9NYCRFF0izrRrcROc89SXu9uh5loE3n2nKrcI5rfy3+7Ppbah//yZRmPL9qCkcxLY57BVEx6PAiLW+qmTmhTMVRFnAc7J6PChgnUMCKhyxoSQ4OUQD7zF79Znl7By6203FEyHoJo8cSYNBijq8PfPtBspr3qDQBUzq+vQRKTJD2Zm4XobftSMigtGNfYUirdi/TPpwDS/NeKEzBa8gAkwX0fh5TR6v/2qRhlNRpVALuMoDKuH0k3kXUB5RfXFmDxJBlwj6LPTe3SMv3Dn++ZJ/oHqOlEovAWfW9l/Yaz4LMR6kJSHvM5Cu/HSXm+iPkEpTJg70it3K8yElHQ1E6fUQ+BTMjJVND0Zk9cEUI2oCxHKt0YEsUPqaeC5s80PAaczv9hd216ZiXDsnIxn9mAwCoyXCKk9bvLAYluUq954vz+EUH6VH3H9x5PIAE3medNMbVVJWnQRZK4fQG827eFGxdsBFpFGVt33nvvirS+h813V5w/Ceghh7btpUJAUuzXr/WHbR+LywV8nLH1Swjws4fXLqt496vrwj0wrgCrblzV8aAlRQequogFRxYCv3PyNR8ksbwkV1wr/yNg9DYUwCvqzf3fUPVS8Kz19AKGtsy5/H/gbqar37qB3FlI7jXUiY3G2iJz1Sa3/CDJ4msvWKyVisEnBbTbCvDdtOmPpLyDtA0ZjrrIapqALkUMlbJHbKGoWJ+f2rJiZJ8sU2O4xkLjo9MbT6JXr1S8JXwIs2nq9Cu7xI9bqcm3NAil6FQ/zhPzKgdnUO1bUVRUnIW5obzeTz/Ya5V/Vsb4YhdZiiv6TTsIpRL08VL0b0rwYoAjvQ1kPb5eEV92/DhAWLG0fBiGt4yDqjk= X-Exchange-RoutingPolicyChecked: asaq8RPij+9nlxKPsVP0g2eu3ZggnnGZXvZMOVIqP0hWRVWPF+ksULVEfuegvwsignAIuc2F6irCRzs4mwFdJMSDr0eeCLlvQB2VKZzaqhCtgo57sCgm8wew5Om5Kv0BgwvLi46DRnvERF4rhVVKIYZdRiSHcpWAbpdXj0NTDHj/jgfmNv8FoLrWFS7djULGIffkk54RhIQDok3SFoy6FEkYnQDdb10zzjAfdJKOV1uU5HDNxLPWesasQnQoIsMCwJD0L9waKP5mXQ0lcbmzEiKXcirxyd1XEGO9emjq65SDjjqiwW1hM39/fxW75s/NFabQiThZMLSJObFNNwwHYg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05548890-1acb-400f-297e-08df140689b3 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2026 15:24:02.4023 (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: q0+71klPuBFHVzTB9LuiWfaA6d2Cwa7HZ9Ez9lfK0F1U6+8ayy/pb+kzwgv26kx3vyoMcYg+x+VHG0BynCIl+4Lu0VSkLQVZJ8pTszJWbsg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7091 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: s4OAHo-IFkt-6nAUpM-fWX0uNdKkW34P X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfX+Vw6TqPpXo8H mWeCt9+2sJ7VZ3VEvHTzXiRpVm+tZcJc1E04gI/83WuZqxcQm9WRSBoFAf6dqm9qISYb1NNERmc /zVoJKPWmetC6kP8sIxGNdVg612iSNyWsrprn8swUlsvUcv5AR7E X-Authority-Analysis: v=2.4 cv=L+GI0OT8 c=1 sm=1 tr=0 ts=6aaab49a cx=c_pps a=EDQZ7307M/d1MXNVkApkJA==: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=Q4-j1AaZAAAA: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: qiRTqjMH8L3g-8Qzfpjq_-nbsijqSYGi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE2MDIwOSBTYWx0ZWRfXyq/HdzMHINNo z7Y0wztdBxA8hoKh+pBBiztBbndTwpOvaa9ETnv8qaOeGEikwBFdfVnBrQNn5a8kGPxmZa+rytX crP4Eeh11OxD41aDtHhe11KTGBkIOrZDGB8pdAKFCHo4r0JXW0EkGChdqvV67YbRT7G917nA5oX hbeIAq0ayLwJ+j720p4CuVVuSTCfrBWLtiQS0HN8bKFp2gRoSixd2AO86llHkNguEJLuvXZkP+z ofAESLvEilq+jO1B2T/LZ0GGy7OS7fssQEJHI/2pKM9OaKrhmhaqXl0eeWdv19m1Fz0uHqrs9nH aGIiu3T3zbjkSp6t9a05TdX+y+ebnLXCM/6qEXe/WM28N+cPFrabEhf/J2y3YqAddj6qehft4fd G/cwevzWWoXnxck921AI8DvWzu4r0OHwNvpDQMVnQvvrpcqgwdYDoSowNixW+sPJMJYTlqPBJBJ ZPppiT/pQYleGpbLXqw== 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-16_02,2026-09-16_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 spamscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609160209 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 ; Wed, 16 Sep 2026 15:24:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245986 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 [1] and has fixed it differently in pull request 161450 [2], merged after 1.99 branched. That change is too big to backport to 1.98 safely, so carry this small sort until a rust upgrade contains it. [1] https://github.com/rust-lang/rust/issues/129094 [2] https://github.com/rust-lang/rust/pull/161450 [YOCTO #16376] Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Sunil Dora --- v2: added Alejandro's Signed-off-by, dropped the link paragraph; upstream references now footnote links (PR 161450 merged meanwhile, noted why it is not backported here). No code change. ...hygiene-encoding-order-deterministic.patch | 59 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 60 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..47a713f82e --- /dev/null +++ b/meta/recipes-devtools/rust/files/0009-rustc-span-make-hygiene-encoding-order-deterministic.patch @@ -0,0 +1,59 @@ +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 has fixed the same problem with a different +approach in https://github.com/rust-lang/rust/pull/161450, merged after +rust 1.99 branched, so this stays a local fix rather than a backport +until a rust upgrade contains 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"