PPC64: fix boolean type conflict
PATCH 1/1 PPC64: fix boolean type conflict
The altivec.h on PPC64 breaks boolean type:
In file included from ../lib/librte_mempool/rte_mempool_trace_fp.h:18:0,
from ../lib/librte_mempool/rte_mempool.h:54,
from ../lib/librte_mbuf/rte_mbuf.h:38,
from ../lib/librte_net/rte_ether.h:23,
from ../drivers/common/mlx5/mlx5_nl.h:10,
from ../drivers/common/mlx5/mlx5_nl.c:23:../lib/librte_eal/include/rte_trace_point.h: In function ‘__rte_trace_point_fp_is_enabled’:../lib/librte_eal/include/rte_trace_point.h:226:9: error: incompatible types when returning type ‘int’ but ‘__vector __bool int {aka __vector(4) __bool int}’ was expected
return false;
It needs to be redefinded as in the stdbool.h
--- drivers/common/mlx5/mlx5_common.h | 10 ---------- drivers/net/mlx4/mlx4_utils.h | 10 ---------- drivers/net/mlx5/mlx5_utils.h | 10 ---------- lib/librte_eal/ppc/include/rte_memcpy.h | 4 ++++ 4 files changed, 4 insertions(+), 30 deletions(-)
drivers/common/mlx5/mlx5_common.h +0 -10
@@ -17,16 +17,6 @@#include "mlx5_prm.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)) + \
drivers/net/mlx4/mlx4_utils.h +0 -10
@@ -14,16 +14,6 @@#include "mlx4.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 -extern int mlx4_logtype;#ifdef RTE_LIBRTE_MLX4_DEBUG
drivers/net/mlx5/mlx5_utils.h +0 -10
@@ -21,16 +21,6 @@#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 -/* Convert a bit number to the corresponding 64-bit mask */ #define MLX5_BITSHIFT (v) (UINT64_C(1) << (v))
lib/librte_eal/ppc/include/rte_memcpy.h +4 -0
@@ -11,6 +11,10 @@/*To include altivec.h, GCC version must >= 4.8 */ #include <altivec.h> +/* redefine as in stdbool.h after altivec.h */ +#undef bool +#define bool _Bool +#ifdef __cplusplusextern "C" {#endif
Signature · 1 line
2.17.1
Please, ignore this patch and pull the patches from Ori Kam and David Christensen
https://mails.dpdk.org/archives/dev/2020-April/165783.html
Thanks,
Thinh Tran
Quoted 105 lines · Thinh Tran
The
altivec.hon PPC64 breaks boolean type:In file included from
../lib/librte_mempool/rte_mempool_trace_fp.h:18:0,from ../lib/librte_mempool/rte_mempool.h:54, from ../lib/librte_mbuf/rte_mbuf.h:38, from ../lib/librte_net/rte_ether.h:23, from ../drivers/common/mlx5/mlx5_nl.h:10, from ../drivers/common/mlx5/mlx5_nl.c:23:
../lib/librte_eal/include/rte_trace_point.h: In function ‘__rte_trace_point_fp_is_enabled’:../lib/librte_eal/include/rte_trace_point.h:226:9: error: incompatible types when returning type ‘int’ but ‘__vector__boolint {aka__vector(4)__boolint}’ was expected
return false;It needs to be redefinded as in the
stdbool.hSigned-off-by Thinh Tran <[email protected]>--- drivers/common/mlx5/mlx5_common.h | 10 ---------- drivers/net/mlx4/mlx4_utils.h | 10 ---------- drivers/net/mlx5/mlx5_utils.h | 10 ---------- lib/librte_eal/ppc/include/rte_memcpy.h | 4 ++++ 4 files changed, 4 insertions(+), 30 deletions(-)drivers/common/mlx5/mlx5_common.h +0
-10@@ -17,16 +17,6 @@#include "mlx5_prm.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)) + \drivers/net/mlx4/mlx4_utils.h +0
-10@@ -14,16 +14,6 @@#include "mlx4.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 -extern int mlx4_logtype;#ifdef RTE_LIBRTE_MLX4_DEBUG drivers/net/mlx5/mlx5_utils.h +0
-10@@ -21,16 +21,6 @@#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 -/* Convert a bit number to the corresponding 64-bit mask */ #define MLX5_BITSHIFT (v) (UINT64_C(1) << (v))lib/librte_eal/ppc/include/rte_memcpy.h +4
-0@@ -11,6 +11,10 @@/*To include altivec.h, GCC version must >= 4.8 */ #include <altivec.h> +/* redefine as in stdbool.h after altivec.h */ +#undef bool +#define bool _Bool +#ifdef __cplusplusextern "C" {#endif