From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id D5EDE1B512 for ; Fri, 30 Nov 2018 00:15:30 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:22 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW8h032075; Fri, 30 Nov 2018 01:15:26 +0200 From: Yongseok Koh To: Thomas Monjalon Cc: Christian Ehrhardt , Adrien Mazarguil , David Wilder , Chao Zhu , dpdk stable Date: Thu, 29 Nov 2018 15:11:37 -0800 Message-Id: <20181129231202.30436-103-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/mlx5: fix build on PPC64' has been queued to LTS release 17.11.5 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: Thu, 29 Nov 2018 23:15:31 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 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/01/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. Yongseok --- >>From a8cbfdf37a4d6b207bed3e1825956c8bb9f21499 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 e48352f37..572296575 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.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:49.710766496 -0800 +++ 0103-net-mlx5-fix-build-on-PPC64.patch 2018-11-29 15:01:45.273961000 -0800 @@ -1,8 +1,10 @@ -From 725f5dd0bfb50192a2d2341d4cc69084c2c4e03d Mon Sep 17 00:00:00 2001 +From a8cbfdf37a4d6b207bed3e1825956c8bb9f21499 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 e48352f37..572296575 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"