From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id BBEF24F9A for ; Mon, 19 Nov 2018 13:25:51 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id 125so3102668wmh.0 for ; Mon, 19 Nov 2018 04:25:51 -0800 (PST) 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=gvImgNSKyyZaG0/g271/hyQ199qVKBY1iJakGZINPxU=; b=cDPluwyDlzpCsqG6tnhb7zzjUwT/L++743S//Se9BOapn4tC9bjrxmaY4bifVdi5pl 4ArFpH9P7DcuYRubvg7Y1V5UETNl23uoLcxJvHODSGNg8WXLqexrBvgAo0DwW5CFZFRY 7l/VAZ/0FBBIeKF/sOrwk1jlmk9OZvN2XdVXnF+0pAnqoZaOg/KOWArUQLAMSxe2IOhq BblajqWW/mPiF4dnFT/Ll6c1oS2cYvIs7KvCg75h1EHbwgNOMvJg8H0+wsPr7xydQ1R6 kKyEfx73630ZYzl6yZojIoBMQRGETBK+ZQi2Tp+bQLLkgqwuSBYu1Ru+ggj6zydE/Pyx JO8w== X-Gm-Message-State: AGRZ1gLKT+dLTxi1XefgeI2nXr67KVKaW/nQHXDBi4IEK2z9n/v63Rh8 J8bM5UJse/o3KswgLceYcG7iyAW/ X-Google-Smtp-Source: AFSGD/VWsdYlnTM8Cq5rHG1UHO4ehuToakE5X+9EAC5zlMd22oLc0KICdfQIgh0Js84gGUGWJwnNtg== X-Received: by 2002:a1c:f30b:: with SMTP id q11-v6mr7571179wmq.45.1542630351342; Mon, 19 Nov 2018 04:25:51 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id x194-v6sm89939281wmd.41.2018.11.19.04.25.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Nov 2018 04:25:50 -0800 (PST) From: Luca Boccassi To: Thomas Monjalon Cc: Christian Ehrhardt , Adrien Mazarguil , David Wilder , Chao Zhu , dpdk stable Date: Mon, 19 Nov 2018 12:25:22 +0000 Message-Id: <20181119122538.14207-5-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119122538.14207-1-bluca@debian.org> References: <20181108180111.25873-1-bluca@debian.org> <20181119122538.14207-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix build on PPC64' has been queued to LTS release 16.11.9 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: , X-List-Received-Date: Mon, 19 Nov 2018 12:25:51 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 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/21/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From ea27760a2ca7bb94d54368ec1540dd88b47bbbdd Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 7 Nov 2018 17:00:28 +0100 Subject: [PATCH] net/mlx5: fix build on PPC64 [ upstream commit 725f5dd0bfb50192a2d2341d4cc69084c2c4e03d ] The AltiVec header file breaks boolean type: error: incompatible types when initializing type '__vector _bool int' {aka '_vector(4) __bool int'} using type 'int' If __APPLE_ALTIVEC__ is defined, then bool type is redefined and conflicts with stdbool.h. There is no good solution to fix it for the whole project without breaking something else, so a workaround is inserted in mlx5 PMD. This workaround is not compatible with C++ but there is no C++ in DPDK. Suggested-by: Christian Ehrhardt Suggested-by: Adrien Mazarguil Signed-off-by: Thomas Monjalon Tested-by: David Wilder Acked-by: Chao Zhu --- drivers/net/mlx5/mlx5_utils.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index f126979b7..7412103d0 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -43,6 +43,16 @@ #include "mlx5_defs.h" +/* + * Compilation workaround for PPC64 when AltiVec is fully enabled, e.g. std=c11. + * Otherwise there would be a type conflict between stdbool and altivec. + */ +#if defined(__PPC64__) && !defined(__APPLE_ALTIVEC__) +#undef bool +/* redefine as in stdbool.h */ +#define bool _Bool +#endif + /* Bit-field manipulation. */ #define BITFIELD_DECLARE(bf, type, size) \ type bf[(((size_t)(size) / (sizeof(type) * CHAR_BIT)) + \ -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-19 12:15:18.222998195 +0000 +++ 0005-net-mlx5-fix-build-on-PPC64.patch 2018-11-19 12:15:18.071611433 +0000 @@ -1,8 +1,10 @@ -From 725f5dd0bfb50192a2d2341d4cc69084c2c4e03d Mon Sep 17 00:00:00 2001 +From ea27760a2ca7bb94d54368ec1540dd88b47bbbdd Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 7 Nov 2018 17:00:28 +0100 Subject: [PATCH] net/mlx5: fix build on PPC64 +[ upstream commit 725f5dd0bfb50192a2d2341d4cc69084c2c4e03d ] + The AltiVec header file breaks boolean type: error: incompatible types when initializing type @@ -25,10 +27,10 @@ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h -index 886f60e61..97092c749 100644 +index f126979b7..7412103d0 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h -@@ -15,6 +15,16 @@ +@@ -43,6 +43,16 @@ #include "mlx5_defs.h"