patch 'config: fix RISC-V native build' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Mon Dec 11 11:12:09 CET 2023


Hi,

FYI, your patch has been queued to stable release 22.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/13/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=82dd3dde96981b7d2445aa8e64602b67a4b44de0

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 82dd3dde96981b7d2445aa8e64602b67a4b44de0 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Tue, 21 Nov 2023 17:49:03 +0100
Subject: [PATCH] config: fix RISC-V native build
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 3f457edd80900d2771c673843c17088a8c7fcf49 ]

If building riscv natively with -Dplatform=generic, config/meson.build
will select cpu_instruction_set=riscv.

That was fine because config/riscv/meson.build did override it to valid
values later, but since commit b7676fcccab4 ("config: verify machine arch
flag"), it will break the build as it tries to test -march=riscv which
is not a valid value.

The generic setting used in most cases is rv64gc, set this here
as well.

Fixes: b7676fcccab4 ("config: verify machine arch flag")
Fixes: f22e705ebf12 ("eal/riscv: support RISC-V architecture")

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Acked-by: Sivaprasad Tummala <sivaprasad.tummala at amd.com>
---
 config/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index 6c59b28468..5f6320ab19 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -122,7 +122,7 @@ if cpu_instruction_set == 'generic'
     elif host_machine.cpu_family().startswith('ppc')
         cpu_instruction_set = 'power8'
     elif host_machine.cpu_family().startswith('riscv')
-        cpu_instruction_set = 'riscv'
+        cpu_instruction_set = 'rv64gc'
     endif
 endif
 
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:26.454134000 +0800
+++ 0104-config-fix-RISC-V-native-build.patch	2023-12-11 17:56:23.217652300 +0800
@@ -1 +1 @@
-From 3f457edd80900d2771c673843c17088a8c7fcf49 Mon Sep 17 00:00:00 2001
+From 82dd3dde96981b7d2445aa8e64602b67a4b44de0 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 3f457edd80900d2771c673843c17088a8c7fcf49 ]
@@ -27 +30 @@
-index d732154731..a9ccd56deb 100644
+index 6c59b28468..5f6320ab19 100644
@@ -30 +33 @@
-@@ -152,7 +152,7 @@ if cpu_instruction_set == 'generic'
+@@ -122,7 +122,7 @@ if cpu_instruction_set == 'generic'


More information about the stable mailing list