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 A1375A04F0 for ; Tue, 10 Dec 2019 16:00:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9755C1B13C; Tue, 10 Dec 2019 16:00:57 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 9715A1BF70 for ; Tue, 10 Dec 2019 16:00:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990056; 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=gad9zXwdG2qXrtPY/5rUdUav2BFQViGflYS9Q5ZpEDo=; b=GplQhprTeghoUmLhlGeTiVUkKon87oe1DNWDrUaZCiQTliSuji/5X4mHgYM5nq1M8y4EcO qUJHCQ08PGasaPnkdIrgI4sHHHn/Wz0JlpNzwhjmMP8tQ1XYmOZOQb0TiSS1n7FTukr3sw NlUS+d1VsRWav+n8pcU56mIYPNQjt5A= 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-256-ayY7ImwZP02FCPnq_mwGug-1; Tue, 10 Dec 2019 10:00:52 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F0FD8024DD; Tue, 10 Dec 2019 15:00:51 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8AC405D9C5; Tue, 10 Dec 2019 15:00:50 +0000 (UTC) From: Kevin Traynor To: Raslan Darawsheh Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 10 Dec 2019 14:59:06 +0000 Message-Id: <20191210145937.32755-32-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: ayY7ImwZP02FCPnq_mwGug-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 debug build with icc' 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 12/16/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/5f113254fee556d16a= 6b93f286e4c9d507a96110 Thanks. Kevin. --- >From 5f113254fee556d16a6b93f286e4c9d507a96110 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Wed, 23 Oct 2019 11:31:45 +0000 Subject: [PATCH] net/mlx: fix debug build with icc [ upstream commit 38e118c0d8304190d4f24297fe2279a7b658c071 ] Trying to compile mlx5 pmd in debug mode with icc will lead to compilation failures due to the fact that icc doesn't have support for the pragma of pedantic. Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx4/Makefile | 5 ++++- drivers/net/mlx5/Makefile | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index df20c83d5..21b507982 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -65,5 +65,8 @@ endif # User-defined CFLAGS. ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) -CFLAGS +=3D -pedantic -UNDEBUG -DPEDANTIC +CFLAGS +=3D -pedantic -UNDEBUG +ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) +CFLAGS +=3D -DPEDANTIC +endif AUTO_CONFIG_CFLAGS +=3D -Wno-pedantic else diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 3b2f626d4..72a8c97d3 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -83,5 +83,8 @@ endif # User-defined CFLAGS. ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS +=3D -pedantic -UNDEBUG -DPEDANTIC +CFLAGS +=3D -pedantic -UNDEBUG +ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) +CFLAGS +=3D -DPEDANTIC +endif AUTO_CONFIG_CFLAGS +=3D -Wno-pedantic else --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:41.276993295 +0000 +++ 0032-net-mlx-fix-debug-build-with-icc.patch=092019-12-10 14:49:39.04745= 7861 +0000 @@ -1 +1 @@ -From 38e118c0d8304190d4f24297fe2279a7b658c071 Mon Sep 17 00:00:00 2001 +From 5f113254fee556d16a6b93f286e4c9d507a96110 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 38e118c0d8304190d4f24297fe2279a7b658c071 ] + @@ -10,2 +11,0 @@ -Cc: stable@dpdk.org - @@ -20 +20 @@ -index 25d7c7555..7ea6f7489 100644 +index df20c83d5..21b507982 100644 @@ -23 +23 @@ -@@ -68,5 +68,8 @@ endif +@@ -65,5 +65,8 @@ endif @@ -34 +34 @@ -index 04de93a88..dae5b9fac 100644 +index 3b2f626d4..72a8c97d3 100644 @@ -37 +37 @@ -@@ -84,5 +84,8 @@ endif +@@ -83,5 +83,8 @@ endif