[dpdk-stable] patch 'test: fix build with gcc 10' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue May 19 14:53:12 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.3

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

Thanks.

Luca Boccassi

---
>From ef348e22a0cb1437b297e0f1ffdd7338ca340aae Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli at redhat.com>
Date: Wed, 5 Feb 2020 13:50:42 +0100
Subject: [PATCH] test: fix build with gcc 10

[ upstream commit 53ba646a0a63c053974548cf03a7537538042b85 ]

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: 08e0c7581468 ("test/fib: add performance autotests")

Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
---
 app/test/test_fib_perf.c | 2 +-
 app/test/test_lpm_perf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test/test_fib_perf.c b/app/test/test_fib_perf.c
index 573087c3c0..dd2e54db8b 100644
--- a/app/test/test_fib_perf.c
+++ b/app/test/test_fib_perf.c
@@ -35,7 +35,7 @@ struct route_rule {
 	uint8_t depth;
 };
 
-struct route_rule large_route_table[MAX_RULE_NUM];
+static struct route_rule large_route_table[MAX_RULE_NUM];
 
 static uint32_t num_route_entries;
 #define NUM_ROUTE_ENTRIES num_route_entries
diff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c
index a2578fe90e..489719c40b 100644
--- a/app/test/test_lpm_perf.c
+++ b/app/test/test_lpm_perf.c
@@ -34,7 +34,7 @@ struct route_rule {
 	uint8_t depth;
 };
 
-struct route_rule large_route_table[MAX_RULE_NUM];
+static struct route_rule large_route_table[MAX_RULE_NUM];
 
 static uint32_t num_route_entries;
 #define NUM_ROUTE_ENTRIES num_route_entries
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:18.953662192 +0100
+++ 0002-test-fix-build-with-gcc-10.patch	2020-05-19 13:56:18.167500883 +0100
@@ -1,14 +1,15 @@
-From 53ba646a0a63c053974548cf03a7537538042b85 Mon Sep 17 00:00:00 2001
+From ef348e22a0cb1437b297e0f1ffdd7338ca340aae Mon Sep 17 00:00:00 2001
 From: Timothy Redaelli <tredaelli at redhat.com>
 Date: Wed, 5 Feb 2020 13:50:42 +0100
 Subject: [PATCH] test: fix build with gcc 10
 
+[ upstream commit 53ba646a0a63c053974548cf03a7537538042b85 ]
+
 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: 08e0c7581468 ("test/fib: add performance autotests")
-Cc: stable at dpdk.org
 
 Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
 Acked-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>


More information about the stable mailing list