From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C6626A04C3 for ; Fri, 22 Nov 2019 15:42:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B3BBA1B103; Fri, 22 Nov 2019 15:42:37 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 92D2D2BC7 for ; Fri, 22 Nov 2019 15:42:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NdeBbdDSg9wR0bT4RDhzUmGKpC8j5jhs35wwotjlDys=; b=NqYiMKaxgXXzw5axMPvZO1/U35AaFCLI7hL9LuTxNLvQVTg5hgFBcsfm0tB1XFnRl/S5en gucGxQE5fm3L80Ak4VgaArpYJhePYOcX8obYU+HjfB1zdSZeXZJTinbwgga/FfopP6zWy/ T5AIgzzrcdenCb6ccJU5QGRrZut/Kck= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-pZ336vM1MS-H_M-w4q992Q-1; Fri, 22 Nov 2019 09:42:29 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F272F107ACC4; Fri, 22 Nov 2019 14:42:27 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF48D8516; Fri, 22 Nov 2019 14:42:26 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Luca Boccassi , Matan Azrad , dpdk stable Date: Fri, 22 Nov 2019 14:41:10 +0000 Message-Id: <20191122144131.21231-24-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: pZ336vM1MS-H_M-w4q992Q-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/mlx: fix build with make and recent gcc' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 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/29/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 rebasi= ng (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/d0690d9eeb8a85fe0d= b5231c7d66dabe80f3faf0 Thanks. Kevin. --- >From d0690d9eeb8a85fe0db5231c7d66dabe80f3faf0 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon 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=3D1, 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_verb= s.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 Acked-by: Luca Boccassi Acked-by: Matan Azrad --- 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 92e932250..df20c83d5 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -66,4 +66,5 @@ endif ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) CFLAGS +=3D -pedantic -UNDEBUG -DPEDANTIC +AUTO_CONFIG_CFLAGS +=3D -Wno-pedantic else CFLAGS +=3D -DNDEBUG -UPEDANTIC @@ -75,5 +76,5 @@ include $(RTE_SDK)/mk/rte.lib.mk =20 export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS =3D -Wno-error +export AUTO_CONFIG_CFLAGS +=3D -Wno-error =20 ifndef V diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 63dfa45b2..3b2f626d4 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -84,4 +84,5 @@ endif ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) CFLAGS +=3D -pedantic -UNDEBUG -DPEDANTIC +AUTO_CONFIG_CFLAGS +=3D -Wno-pedantic else CFLAGS +=3D -DNDEBUG -UPEDANTIC @@ -93,5 +94,5 @@ include $(RTE_SDK)/mk/rte.lib.mk =20 export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS =3D -Wno-error +export AUTO_CONFIG_CFLAGS +=3D -Wno-error =20 ifndef V --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.506383252 +0000 +++ 0024-net-mlx-fix-build-with-make-and-recent-gcc.patch=092019-11-22 14:3= 6:55.192149393 +0000 @@ -1 +1 @@ -From b38a54aeb16cb36e42d638c4335b8314aa0b1794 Mon Sep 17 00:00:00 2001 +From d0690d9eeb8a85fe0db5231c7d66dabe80f3faf0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b38a54aeb16cb36e42d638c4335b8314aa0b1794 ] + @@ -27,2 +28,0 @@ -Cc: stable@dpdk.org - @@ -38 +38 @@ -index 8126b0dfc..25d7c7555 100644 +index 92e932250..df20c83d5 100644 @@ -41 +41 @@ -@@ -69,4 +69,5 @@ endif +@@ -66,4 +66,5 @@ endif @@ -47 +47 @@ -@@ -78,5 +79,5 @@ include $(RTE_SDK)/mk/rte.lib.mk +@@ -75,5 +76,5 @@ include $(RTE_SDK)/mk/rte.lib.mk @@ -55 +55 @@ -index dbb2a4e80..299cf3afe 100644 +index 63dfa45b2..3b2f626d4 100644