[dpdk-stable] patch 'examples/eventdev: fix build with gcc 10' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:21:49 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/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/5973c23a8e2c8f59127ee8588a3c081cde5c717d

Thanks.

Kevin.

---
>From 5973c23a8e2c8f59127ee8588a3c081cde5c717d Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli at redhat.com>
Date: Wed, 5 Feb 2020 18:05:45 +0100
Subject: [PATCH] examples/eventdev: fix build with gcc 10

[ upstream commit 78de15bb586ac3d8938512db1977d83815c494f8 ]

GCC 10 defaults to -fno-common, this means a linker error will now be
reported if the same global variable is defined in more than one
compilation unit.

Fixes: 3d1b33e44ae2 ("examples/eventdev: move common data into pipeline common")

Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 examples/eventdev_pipeline/main.c            | 2 ++
 examples/eventdev_pipeline/pipeline_common.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/eventdev_pipeline/main.c b/examples/eventdev_pipeline/main.c
index 92e08bc0c8..04b30cf6ea 100644
--- a/examples/eventdev_pipeline/main.c
+++ b/examples/eventdev_pipeline/main.c
@@ -11,4 +11,6 @@
 #include "pipeline_common.h"
 
+struct fastpath_data *fdata;
+
 struct config_data cdata = {
 	.num_packets = (1L << 25), /* do ~32M packets */
diff --git a/examples/eventdev_pipeline/pipeline_common.h b/examples/eventdev_pipeline/pipeline_common.h
index a6cc912fbb..016a3f702b 100644
--- a/examples/eventdev_pipeline/pipeline_common.h
+++ b/examples/eventdev_pipeline/pipeline_common.h
@@ -94,6 +94,6 @@ struct port_link {
 };
 
-struct fastpath_data *fdata;
-struct config_data cdata;
+extern struct fastpath_data *fdata;
+extern struct config_data cdata;
 
 static __rte_always_inline void
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:12:59.302660191 +0100
+++ 0002-examples-eventdev-fix-build-with-gcc-10.patch	2020-05-28 17:12:59.025558120 +0100
@@ -1 +1 @@
-From 78de15bb586ac3d8938512db1977d83815c494f8 Mon Sep 17 00:00:00 2001
+From 5973c23a8e2c8f59127ee8588a3c081cde5c717d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 78de15bb586ac3d8938512db1977d83815c494f8 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index d3ff1bbe4f..d0da51b1c9 100644
+index 92e08bc0c8..04b30cf6ea 100644
@@ -32 +33 @@
-index 8e30393d09..c7245f7f0f 100644
+index a6cc912fbb..016a3f702b 100644



More information about the stable mailing list