From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A049F41D8D for ; Mon, 27 Feb 2023 08:18:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9B74E410D3; Mon, 27 Feb 2023 08:18:18 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2073.outbound.protection.outlook.com [40.107.237.73]) by mails.dpdk.org (Postfix) with ESMTP id D7B6F40A84 for ; Mon, 27 Feb 2023 08:18:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SFupSGaao+m1Ohibuek//eI6ZZVYhmjs0N4DVbNdVeMvJ9V/gEbsS9GYgIQdRoJyEM4nZ5Gg1SzafIflyVs7YUfhOfcsNWzznaWxUng76I2GkGgfquQij7ntEVPunk+T5wgchM7ubr8o3/nrB9PRcj0lUm8jGH9Blx2nXJcNcvechepSY9ELTz6d8+gyiXmXfeDjrNyBCjAYIviL2+mXKhjejsKZ6MnaUk+PvRAzCfige7AF6zS5HMtFWSfptMrGXaO04zMOKcgMY9r/N9AJDLt/DbY4a+4mM5fhXORebM2pvoyPeOOnsKWBiKbfpPt4s6b06V4aPqi0kSj4d2Izvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=UvR4UtmmJdMizrgTJ5t4vqF9RNuurk2SxoNSnbnp34Q=; b=QCW8shiSpgTw1azYz/rMSYlDe70VfwF3QwdQNK5o9dPnxz64VCJtjUhLYDjmEIeMOSwzUpKoGSNJRjgz3KBM3C80R3KVUTLDMU/CrKu8dlOKznOuhk+uA3j1imh3CS/I4PBXKMm1WyiYmzHXwBkh6+TbGA3UF0lLSZI6AVk7l7wUxImIdFCTcnFf8MVxoikLxixqFfsl+ucETkZ0+qV4zMPupkpLTykBPsSQoF+LUobLhgWsyW8Zs8IEO30UvLgPwrtGXuM4uOJHu4q9qZ7FdKBrSz9xeXcZaQnA3Dzi4WzE+etrRB+59rGpw5qF9MckXOYvyuEaJhnpZKVJAHDCxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UvR4UtmmJdMizrgTJ5t4vqF9RNuurk2SxoNSnbnp34Q=; b=g+SmFwoJV4wIz6j0kAovADce6YULxO+AffYUhe7TpQhJMG7KqBO7Mxm1AL570A6F2AT0jV6Q+FRFjjtrmQa87km47gRZ4TzhZDGVY5w/ssuEip7Rle2AJbh5Q/3A+mPrh7jMNAFhxF/iLxvrTzkX+/PaSqE2Gc7gffnkvkH5uDZqNNcxaEm5OgEAvYawRl1S7axTODWiMGqQ8bH8ic61G8+DkjXlLTls5vbCGUJXVqiGwmcxoKBwWMYOixXwvvhEITf1708Fa+TJE/TCB4NwmaGuNsrmm5kyRe9ea++Gy+xQ2HTIQHUh0+zXOsxZj3fgi4Aq7gWEgEMdPe6m0cCGQQ== Received: from DS7PR03CA0138.namprd03.prod.outlook.com (2603:10b6:5:3b4::23) by PH8PR12MB6914.namprd12.prod.outlook.com (2603:10b6:510:1cb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 07:18:13 +0000 Received: from DM6NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b4:cafe::86) by DS7PR03CA0138.outlook.office365.com (2603:10b6:5:3b4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:18:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT017.mail.protection.outlook.com (10.13.172.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:18:13 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:18:02 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:17:59 -0800 From: Xueming Li To: Bruce Richardson CC: Keith Wiles , Tyler Retzlaff , dpdk stable Subject: patch 'build: fix toolchain definition' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:01:04 +0800 Message-ID: <20230227070107.15664-156-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT017:EE_|PH8PR12MB6914:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f92b54f-3c7c-4ccc-0114-08db1892c9ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lxMxq/0wR5a4yoFG7mcXj3Cc6E3HrgaWam82USboPpfYFvdUa7Eqq6lwyupn6TgpV6ykPeDBeAZ98eEtZgvJd8IXK1eyzJA811oMA13TDRn73UxWMeDdsbDYBVTKZ+PfjhMxokTCXN4IbUYBFb7j/IirYLCy60WME30FMgAJeu/GBRpoUnVbS4nWUd7nVf0OAFjBbbbmmiluBUssW5+HoFxkOh65crcPCv+u2PdaCfqiXXFySGKztE+GyHQ0c/E+Y4KxC7yhilmDYZfUtK5lR+i6nyiI21EWqxo1nahp1EHixqvblWa0/ChWUn4H/9nfdWtsvTvBEsm83Cdw6OecU/r2vJnSXKGdosUCzInsWSSXBaiJN7mpzyjp5JZwBOQnB0b4L1VJskBEA3iORRYEi/Yt78UmUJ5wfFbcXfPIfY0X+4AsZoG5JN3ooONioFmhPWI8JFn/BuNwadmDoZo631u6EiAIu8o67UpTm2sdK/H3gRR7C+pcd1oQSfVzI3Oxx9QLT9vWaP7KPjH+wyOOtKPJYJKu3eYT9rh+aMs0enAaNmVGOkkAqZTaamWmePkHo+QMPWS0WPOLmMuABURoh+Ieru2jUCd4fHwowrB8T6ewPvGyaUMe+G03HKBPJ6RIgC+WhmD12heoBUeToPj9so+PQGC+94hnWrlK0i3fJxqZ134r6xue0qeCOk91X5qiY3EDvKg3AbD5JbUy8vRuII2TohWAT7sT3xT2yPPPgiZcjtVy4PCQjfPOgDKIR2blNXNgJEjxOyyhvHpbOijddyeUg/cCvhcAIQKsLsGF4F3/TjWKFJ+EfYTb541BKdjM X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(346002)(376002)(136003)(396003)(39860400002)(451199018)(40470700004)(36840700001)(46966006)(40480700001)(55016003)(36756003)(40460700003)(86362001)(478600001)(6916009)(41300700001)(356005)(70586007)(8676002)(8936002)(70206006)(7696005)(4326008)(82310400005)(316002)(5660300002)(34020700004)(54906003)(6286002)(2906002)(36860700001)(83380400001)(7636003)(2616005)(426003)(186003)(26005)(16526019)(53546011)(966005)(6666004)(47076005)(1076003)(336012)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:18:13.1558 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f92b54f-3c7c-4ccc-0114-08db1892c9ca X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6914 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a5d83cee8ef87c616435a86100d4b571e39419d0 Thanks. Xueming Li --- >From a5d83cee8ef87c616435a86100d4b571e39419d0 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 7 Feb 2023 15:22:00 +0000 Subject: [PATCH] build: fix toolchain definition Cc: Xueming Li [ upstream commit e08c1645df1f2967b331e132ddb36ba817812dc2 ] When using "icx" (Intel(R) oneAPI DPC++/C++ Compiler) to build DPDK, meson reports the toolchain as "intel-llvm"[1]. This value is used directly to define the RTE_TOOLCHAIN macros, which means that we end up with the invalid macro name "RTE_TOOLCHAIN_INTEL-LLVM", and getting the compiler warning: rte_build_config.h:422:28: warning: ISO C99 requires whitespace after the macro name This can be fixed, and the macro generation made more robust generally, by adding "underscorify()" on the string. This replaces the "-", and any other invalid characters, with "_" [2]. [1] https://mesonbuild.com/Reference-tables.html#compiler-ids [2] https://mesonbuild.com/Reference-manual_elementary_str.html#strunderscorify Fixes: afd18fa21b5e ("build: set toolchain info during meson configure") Reported-by: Keith Wiles Signed-off-by: Bruce Richardson Acked-by: Keith Wiles Acked-by: Tyler Retzlaff --- config/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index 239d3ea0ec..6597fa24e3 100644 --- a/config/meson.build +++ b/config/meson.build @@ -139,7 +139,7 @@ endif toolchain = cc.get_id() dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain) -dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper(), 1) +dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper().underscorify(), 1) dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8) dpdk_conf.set('RTE_ARCH_32', cc.sizeof('void *') == 4) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.843926500 +0800 +++ 0157-build-fix-toolchain-definition.patch 2023-02-27 14:08:40.959237000 +0800 @@ -1 +1 @@ -From e08c1645df1f2967b331e132ddb36ba817812dc2 Mon Sep 17 00:00:00 2001 +From a5d83cee8ef87c616435a86100d4b571e39419d0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e08c1645df1f2967b331e132ddb36ba817812dc2 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org @@ -33 +35 @@ -index 26f3168bc9..fc3ac99a32 100644 +index 239d3ea0ec..6597fa24e3 100644