[dpdk-stable] patch 'eal: fix C++17 compilation' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri May 22 11:39:47 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/24/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 da5586fcbea509717b38c764e20de12e3dceb5b5 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Fri, 8 May 2020 16:25:05 -0700
Subject: [PATCH] eal: fix C++17 compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa ]

Compiling a C++ application that includes directly or indirectly
rte_common.h will cause a warning:

include/rte_common.h:350:37: warning: ISO C++17 does not allow
  ‘register’ storage class specifier [-Wregister]
 rte_combine32ms1b(register uint32_t x)

C++ is pickier than standard C and flags this antique usage.

The register keyword is an old K&R legacy and should be removed
everywhere in DPDK. For now, fix it where it hurts.

Fixes: 08f683174e94 ("eal: add functions for previous power of 2 alignment")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 lib/librte_eal/common/include/rte_common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
index c352838073..41e2778ec1 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -347,7 +347,7 @@ typedef uint64_t rte_iova_t;
  *    The combined value.
  */
 static inline uint32_t
-rte_combine32ms1b(register uint32_t x)
+rte_combine32ms1b(uint32_t x)
 {
 	x |= x >> 1;
 	x |= x >> 2;
@@ -369,7 +369,7 @@ rte_combine32ms1b(register uint32_t x)
  *    The combined value.
  */
 static inline uint64_t
-rte_combine64ms1b(register uint64_t v)
+rte_combine64ms1b(uint64_t v)
 {
 	v |= v >> 1;
 	v |= v >> 2;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:39.536608858 +0100
+++ 0008-eal-fix-C-17-compilation.patch	2020-05-22 10:37:39.064411567 +0100
@@ -1,4 +1,4 @@
-From 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa Mon Sep 17 00:00:00 2001
+From da5586fcbea509717b38c764e20de12e3dceb5b5 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Fri, 8 May 2020 16:25:05 -0700
 Subject: [PATCH] eal: fix C++17 compilation
@@ -6,6 +6,8 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa ]
+
 Compiling a C++ application that includes directly or indirectly
 rte_common.h will cause a warning:
 
@@ -19,19 +21,18 @@
 everywhere in DPDK. For now, fix it where it hurts.
 
 Fixes: 08f683174e94 ("eal: add functions for previous power of 2 alignment")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
 ---
- lib/librte_eal/include/rte_common.h | 4 ++--
+ lib/librte_eal/common/include/rte_common.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/lib/librte_eal/include/rte_common.h b/lib/librte_eal/include/rte_common.h
-index 668e8b0af8..0843ce69e7 100644
---- a/lib/librte_eal/include/rte_common.h
-+++ b/lib/librte_eal/include/rte_common.h
-@@ -409,7 +409,7 @@ __extension__ typedef uint64_t RTE_MARKER64[0];
+diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
+index c352838073..41e2778ec1 100644
+--- a/lib/librte_eal/common/include/rte_common.h
++++ b/lib/librte_eal/common/include/rte_common.h
+@@ -347,7 +347,7 @@ typedef uint64_t rte_iova_t;
   *    The combined value.
   */
  static inline uint32_t
@@ -40,7 +41,7 @@
  {
  	x |= x >> 1;
  	x |= x >> 2;
-@@ -431,7 +431,7 @@ rte_combine32ms1b(register uint32_t x)
+@@ -369,7 +369,7 @@ rte_combine32ms1b(register uint32_t x)
   *    The combined value.
   */
  static inline uint64_t


More information about the stable mailing list