[dpdk-stable] patch 'net/mlx: fix build with make and recent gcc' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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/21/19. 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 005b17cbab02eaabe3f2a7ccf10ce1a9ea40147c Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 13 Aug 2019 01:03:56 +0200
Subject: [PATCH] net/mlx: fix build with make and recent gcc

[ upstream commit b38a54aeb16cb36e42d638c4335b8314aa0b1794 ]

With VERBOSE=1, this error was seen in debug mode with gcc 9.1:

In file included from /tmp/dpdk.auto-config-h.sh.c.w0VWMi:1:
In file included from rdma-core/build/include/infiniband/mlx5dv.h:47:
In file included from rdma-core/build/include/infiniband/verbs.h:46:
In file included from rdma-core/build/include/infiniband/verbs_api.h:66:
In file included from rdma-core/build/include/infiniband/ib_user_ioctl_verbs.h:38:
include/rdma/ib_user_verbs.h:161:28: fatal error:
zero size arrays are an extension [-Wzero-length-array]
__aligned_u64 driver_data0;
^
1 error generated.

As a result, buildtools/auto-config-h.sh was not generating
a correct autoconf file, so the compilation was generating such error:

fatal error: redefinition of 'mlx5_ib_uapi_flow_action_packet_reformat_type'

It is fixed by disabling -pedantic option when calling auto-config-h.sh
from the makefile-based system.

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Luca Boccassi <bluca at debian.org>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx4/Makefile | 3 ++-
 drivers/net/mlx5/Makefile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
index 1f95e0df9b..e0a8aaceca 100644
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -74,6 +74,7 @@ endif
 # User-defined CFLAGS.
 ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)
 CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
+AUTO_CONFIG_CFLAGS += -Wno-pedantic
 else
 CFLAGS += -DNDEBUG -UPEDANTIC
 endif
@@ -87,7 +88,7 @@ include $(RTE_SDK)/mk/rte.lib.mk
 # Generate and clean-up mlx4_autoconf.h.
 
 export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
-export AUTO_CONFIG_CFLAGS = -Wno-error
+export AUTO_CONFIG_CFLAGS += -Wno-error
 
 ifndef V
 AUTOCONF_OUTPUT := >/dev/null
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index c62ad11884..ed720b6a70 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -84,6 +84,7 @@ endif
 # User-defined CFLAGS.
 ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y)
 CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
+AUTO_CONFIG_CFLAGS += -Wno-pedantic
 else
 CFLAGS += -DNDEBUG -UPEDANTIC
 endif
@@ -97,7 +98,7 @@ include $(RTE_SDK)/mk/rte.lib.mk
 # Generate and clean-up mlx5_autoconf.h.
 
 export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
-export AUTO_CONFIG_CFLAGS = -Wno-error
+export AUTO_CONFIG_CFLAGS += -Wno-error
 
 ifndef V
 AUTOCONF_OUTPUT := >/dev/null
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:26.970996918 +0000
+++ 0016-net-mlx-fix-build-with-make-and-recent-gcc.patch	2019-12-19 14:32:25.449284817 +0000
@@ -1,8 +1,10 @@
-From b38a54aeb16cb36e42d638c4335b8314aa0b1794 Mon Sep 17 00:00:00 2001
+From 005b17cbab02eaabe3f2a7ccf10ce1a9ea40147c Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Tue, 13 Aug 2019 01:03:56 +0200
 Subject: [PATCH] net/mlx: fix build with make and recent gcc
 
+[ upstream commit b38a54aeb16cb36e42d638c4335b8314aa0b1794 ]
+
 With VERBOSE=1, this error was seen in debug mode with gcc 9.1:
 
 In file included from /tmp/dpdk.auto-config-h.sh.c.w0VWMi:1:
@@ -24,8 +26,6 @@
 It is fixed by disabling -pedantic option when calling auto-config-h.sh
 from the makefile-based system.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
 Acked-by: Luca Boccassi <bluca at debian.org>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -35,10 +35,10 @@
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
-index 8126b0dfc6..25d7c7555d 100644
+index 1f95e0df9b..e0a8aaceca 100644
 --- a/drivers/net/mlx4/Makefile
 +++ b/drivers/net/mlx4/Makefile
-@@ -68,6 +68,7 @@ endif
+@@ -74,6 +74,7 @@ endif
  # User-defined CFLAGS.
  ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)
  CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
@@ -46,7 +46,7 @@
  else
  CFLAGS += -DNDEBUG -UPEDANTIC
  endif
-@@ -77,7 +78,7 @@ include $(RTE_SDK)/mk/rte.lib.mk
+@@ -87,7 +88,7 @@ include $(RTE_SDK)/mk/rte.lib.mk
  # Generate and clean-up mlx4_autoconf.h.
  
  export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
@@ -56,10 +56,10 @@
  ifndef V
  AUTOCONF_OUTPUT := >/dev/null
 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
-index dbb2a4e80c..299cf3afe4 100644
+index c62ad11884..ed720b6a70 100644
 --- a/drivers/net/mlx5/Makefile
 +++ b/drivers/net/mlx5/Makefile
-@@ -83,6 +83,7 @@ endif
+@@ -84,6 +84,7 @@ endif
  # User-defined CFLAGS.
  ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y)
  CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
@@ -67,7 +67,7 @@
  else
  CFLAGS += -DNDEBUG -UPEDANTIC
  endif
-@@ -92,7 +93,7 @@ include $(RTE_SDK)/mk/rte.lib.mk
+@@ -97,7 +98,7 @@ include $(RTE_SDK)/mk/rte.lib.mk
  # Generate and clean-up mlx5_autoconf.h.
  
  export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS