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 851D9A04F3 for ; Thu, 19 Dec 2019 15:38:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B5771BF7B; Thu, 19 Dec 2019 15:38:40 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by dpdk.org (Postfix) with ESMTP id 827BE1BF7B for ; Thu, 19 Dec 2019 15:38:39 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id c9so6210816wrw.8 for ; Thu, 19 Dec 2019 06:38:39 -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=FbW7CJy42TA8P7wF5dMqM77CpBSNsp6QNWAxG4ePn0g=; b=YCm5t4qm8qIenFxI0tw0lDdr9BoGWgsKxJ5F+LC+mh3SY8BLIWWQ22NckzDUbd7Wvl RERrjtJCXqcVLR6Hf2PHFmdF9kZ/9AX3FWYGmRvuKgbcs7dE5ebhWQT7gaT46nhGov4h sjEkBYq+eUvhyfQdUUm+rtVFAEbxQKniuDYxunCID7KM0JiArUCT9lfceBU7091PQNvO QkEh+ddlxeqtJ0C3d70kj94jsoUm2RT4SJz9T4+JURYmVW4RBZQvZYx0tR4SHmZds3Af dRn8R9FSt/Ow7zUesNQAg0dZ4uWzWmV3gGclUjxY+8tEyrcNiDdkKB+eu8p/hm8G4g5O byrQ== 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=FbW7CJy42TA8P7wF5dMqM77CpBSNsp6QNWAxG4ePn0g=; b=WpKt2lXTOHEY63Y7NqSfEasn1x4C+JefcSxBzU4ezfMCAZz4ePssNQHpOb01gtXQXB PgIIWCB2fdfZiMZT/UpTeAkbpzVaj20S9O1iGXypMAIlVP10vURP1R9tVFd7aoK0CBVd r7y3D7RMFIjBQQqZTrKEley7z7loJFOiB0bvP2LW82ME3b/qoZrtiBnF29MKUBUHzNU9 /qINI3v3w45/OtkFtmPpwQzR0y/nMprr/Mj3By6v271N+vL0lxRI/zL+zotwM2Hd2YFp 0xV7a86upwzmUz+s83qxLrSeWzvzUXeIFPHbHpELIWMfXrLvHLp+WaVhi5gBHDGEmf5R gzjg== X-Gm-Message-State: APjAAAWLWtGXzgxNR2xNYMFBtj29pW2PfPObVDAtr5Bwg/NU+cA5+iqk 6NB8BVaVw2UOhxx6+gXAbms= X-Google-Smtp-Source: APXvYqworqILT6EdQvVEBYwLO/iaMSMa+3WYOyjqZh0B96Afq8BH83Zt8GRQ0lCEtU8/k0cAAtV3CQ== X-Received: by 2002:adf:f64b:: with SMTP id x11mr10185150wrp.355.1576766319229; Thu, 19 Dec 2019 06:38:39 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u8sm6182313wmm.15.2019.12.19.06.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:38:38 -0800 (PST) From: luca.boccassi@gmail.com To: Raslan Darawsheh Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 19 Dec 2019 14:33:54 +0000 Message-Id: <20191219143447.21506-87-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 debug build with icc' 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 5aa7b1b186e4fab11edc259052e57e95826f7427 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 e0a8aaceca..0bde672958 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -73,7 +73,10 @@ endif # User-defined CFLAGS. ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) -CFLAGS += -pedantic -UNDEBUG -DPEDANTIC +CFLAGS += -pedantic -UNDEBUG +ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) +CFLAGS += -DPEDANTIC +endif AUTO_CONFIG_CFLAGS += -Wno-pedantic else CFLAGS += -DNDEBUG -UPEDANTIC diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index ed720b6a70..e6fe1c60ae 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -83,7 +83,10 @@ endif # User-defined CFLAGS. ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -UNDEBUG -DPEDANTIC +CFLAGS += -pedantic -UNDEBUG +ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) +CFLAGS += -DPEDANTIC +endif AUTO_CONFIG_CFLAGS += -Wno-pedantic else CFLAGS += -DNDEBUG -UPEDANTIC -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.815184915 +0000 +++ 0087-net-mlx-fix-debug-build-with-icc.patch 2019-12-19 14:32:26.209299888 +0000 @@ -1,14 +1,14 @@ -From 38e118c0d8304190d4f24297fe2279a7b658c071 Mon Sep 17 00:00:00 2001 +From 5aa7b1b186e4fab11edc259052e57e95826f7427 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. -Cc: stable@dpdk.org - Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko --- @@ -17,10 +17,10 @@ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile -index 25d7c7555d..7ea6f74895 100644 +index e0a8aaceca..0bde672958 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile -@@ -67,7 +67,10 @@ endif +@@ -73,7 +73,10 @@ endif # User-defined CFLAGS. ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) @@ -33,7 +33,7 @@ else CFLAGS += -DNDEBUG -UPEDANTIC diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile -index 04de93a881..dae5b9fac1 100644 +index ed720b6a70..e6fe1c60ae 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -83,7 +83,10 @@ endif