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 209C0A04F3 for ; Thu, 19 Dec 2019 15:35:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 14F3F330; Thu, 19 Dec 2019 15:35:36 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id C2D7D1B9BF for ; Thu, 19 Dec 2019 15:35:32 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id q9so5670271wmj.5 for ; Thu, 19 Dec 2019 06:35:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iH8Nqo5aUi+BKUMWeGi1OTh92RD5vET2JepmXuZCxHM=; b=Wf0EFx6Zvd2q0g46x+dJp1BIf3XVA5N8uAW0ceLQr/83jlKgNIjBZmJvPidnxzlbfV u4Bwdamc8Gj0rDHRaPNlYDDh7aeITLBxPif6oFKvN98qaAHvbnL0pur63bYbINzs6DQ/ NuPH35CX3VOwAFS6nmuimWPcvfSO1jmyOWriSfDa2JGEnzVF8L3Ob1TYCMloLaKTUto8 VzfHcYv07jJxw5c7efErLthbzNaE38JwLYWwd8ojiXo3SZ25Wx4lz3xurZYQFnFoWIiW gLonALb+WBZZs+ZSLVKlGq0nZTYyMk8CYdgDg3CmUVloEnKPvoXz28Wx/1rB1dpqPkij DWeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iH8Nqo5aUi+BKUMWeGi1OTh92RD5vET2JepmXuZCxHM=; b=INm7FjuFGsuB77CKZT4P4FrdfOxEdq7OJyrhUaQ2yLaS18qWdbtre4ZC1LR0NrK30X SKXiUhC3iAGBvv9fB+o7m3rLkUCsRMMP3Jl7O39/OLnKkISNlgF5QoGo5COo2G2CINtC zES0J8F/1BXDth22q3WVHIa0AYlRanWRYBfEgk60U+mmeV2qtngBIME+Fi7R49IiyUr3 6bSnQWu/LmRssbuymFamnTXFl5fhjmnwkY4piqMyYJWvOwQTOh/QOgIlAeo0uPO/3dlK JQux//XVV0Yz5rEPX+/NTneyMct+22ElBqDy7JtvVtTiBXHgKvQjYGgsDtZsHdYzf0EG rBrw== X-Gm-Message-State: APjAAAVGNQ6hniBPTsT0sgaT87EEpJ3sfxBkVAcc91A1T+p7UKEHc5Oe yWV8xvBa5vntSFE5B1Z7Czg= X-Google-Smtp-Source: APXvYqwIYQzgBHF6Watgt0A1jNdN2UtWImAGyTZ+WOOk8zQA7qghCzRo+9/nDN0UcTDk1UTrALb84g== X-Received: by 2002:a7b:cd11:: with SMTP id f17mr10684720wmj.48.1576766132527; Thu, 19 Dec 2019 06:35:32 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v83sm6501461wmg.16.2019.12.19.06.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:35:31 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Luca Boccassi , Matan Azrad , dpdk stable Date: Thu, 19 Dec 2019 14:32:43 +0000 Message-Id: <20191219143447.21506-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx: fix build with make and recent gcc' has been queued to LTS release 17.11.10 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 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 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 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 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 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@dpdk.org - Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi Acked-by: Matan Azrad @@ -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