[dpdk-stable] patch 'pmdinfogen: fix build with gcc 11' has been queued to LTS release 18.11.11

Kevin Traynor ktraynor at redhat.com
Thu Nov 5 13:39:57 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/10/20. 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://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3a822363a4f7beb5450f43e7a33fb67698eabbd4

Thanks.

Kevin.

---
>From 3a822363a4f7beb5450f43e7a33fb67698eabbd4 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Mon, 21 Sep 2020 14:38:30 +0100
Subject: [PATCH] pmdinfogen: fix build with gcc 11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 5a75cc3c88143496030b5bed76bd031ddbe9e355 ]

Error observed with gcc 11 under development
gcc (GCC) 11.0.0 20200920 (experimental)

build error:
In file included from ../buildtools/pmdinfogen/pmdinfogen.c:17:
../buildtools/pmdinfogen/pmdinfogen.c: In function ‘parse_elf’:
../buildtools/pmdinfogen/pmdinfogen.h:78:1:
	warning: this ‘else’ clause does not guard...
	[-Wmisleading-indentation]
   78 | else \
      | ^~~~
../buildtools/pmdinfogen/pmdinfogen.h:83:35:
	note: in expansion of macro ‘CONVERT_NATIVE’
   83 | #define TO_NATIVE(fend, width, x) CONVERT_NATIVE(fend, width, x)
      |                                   ^~~~~~~~~~~~~~
../buildtools/pmdinfogen/pmdinfogen.c:152:28:
	note: in expansion of macro ‘TO_NATIVE’
  152 |         hdr->e_type      = TO_NATIVE(endian, 16, hdr->e_type);
      |                            ^~~~~~~~~
../buildtools/pmdinfogen/pmdinfogen.h:80:9:
	note: ...this statement, but the latter is misleadingly indented
	as if it were guarded by the ‘else’
   80 |         ___x; \
      |         ^~~~

Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 buildtools/pmdinfogen/pmdinfogen.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildtools/pmdinfogen/pmdinfogen.h b/buildtools/pmdinfogen/pmdinfogen.h
index 27bab30e5e..b398e99ab7 100644
--- a/buildtools/pmdinfogen/pmdinfogen.h
+++ b/buildtools/pmdinfogen/pmdinfogen.h
@@ -83,5 +83,5 @@ if ((fend) == ELFDATA2LSB) \
 else \
 	___x = be##width##toh(x); \
-	___x; \
+___x; \
 })
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.193232857 +0000
+++ 0050-pmdinfogen-fix-build-with-gcc-11.patch	2020-11-05 12:38:54.249896027 +0000
@@ -1 +1 @@
-From 5a75cc3c88143496030b5bed76bd031ddbe9e355 Mon Sep 17 00:00:00 2001
+From 3a822363a4f7beb5450f43e7a33fb67698eabbd4 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 5a75cc3c88143496030b5bed76bd031ddbe9e355 ]
+
@@ -35 +36,0 @@
-Cc: stable at dpdk.org
@@ -44 +45 @@
-index 93930e4543..38fd3ddcc3 100644
+index 27bab30e5e..b398e99ab7 100644
@@ -47 +48 @@
-@@ -78,5 +78,5 @@ if ((fend) == ELFDATA2LSB) \
+@@ -83,5 +83,5 @@ if ((fend) == ELFDATA2LSB) \



More information about the stable mailing list