On Fri, Aug 31, 2018 at 3:48 AM Chao Zhu <chao...@linux.vnet.ibm.com> wrote:
> I think this patch is good enough to solve the confliction issue. > > > -----Original Message----- > > From: Christian Ehrhardt [mailto:christian.ehrha...@canonical.com] > > Sent: 2018年8月30日 20:00 > > To: adrien.mazarg...@6wind.com; dev <dev@dpdk.org>; Gowrishankar > > Muthukrishnan <gowrishanka...@linux.vnet.ibm.com>; Chao Zhu > > <chao...@linux.vnet.ibm.com> > > Cc: Luca Boccassi <bl...@debian.org>; Thomas Monjalon > > <thom...@mellanox.com>; Christian Ehrhardt > > <christian.ehrha...@canonical.com> > > Subject: [PATCH v3] ppc64: fix compilation of when AltiVec is enabled > > > > The definition of almost any newer standard like --stc=c11 will drop > > __APPLCE_ALTIVEC__ which otherwise would be defined. > > If that is the case then altivec.h will redefine bool to a type > conflicting with > > those defined by stdbool.h. > > > > This breaks compilation of 18.08 on ppc64 like: > > mlx5_nl_flow.c:407:17: error: incompatible types when assigning > > to type ‘__vector __bool int’ {aka ‘__vector(4) __bool int’} > > from type ‘int’ in_port_id_set = false; > > > > Other alternatives were pursued on [1] but they always ended up being > more > > complex than what would be appropriate for the issue we face. > > > > [1]: http://mails.dpdk.org/archives/dev/2018-August/109926.html > > > > Tested-by: Takeshi T Yoshimura <t...@jp.ibm.com> > > Reviewed-by: Adrien Mazarguil <adrien.mazarg...@6wind.com> > > Signed-off-by: Christian Ehrhardt <christian.ehrha...@canonical.com> > > --- > > .../common/include/arch/ppc_64/rte_memcpy.h | 11 > > +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h > > b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h > > index 75f74897b..0b3b89b56 100644 > > --- a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h > > +++ b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h > > @@ -37,6 +37,17 @@ > > #include <string.h> > > /*To include altivec.h, GCC version must >= 4.8 */ #include > <altivec.h> > > +/* > > + * Compilation workaround for PPC64 targets when AltiVec is fully > > + * enabled e.g. with std=c11. Otherwise there would be a type conflict > > + * of "bool" between stdbool and altivec. > > + */ > > +#if defined(__PPC64__) && !defined(__APPLE_ALTIVEC__) #undef bool > > + /* redefine as in stdbool.h */ > > + #define bool _Bool > > +#endif > > + > > > > #ifdef __cplusplus > > extern "C" { > > -- > > 2.17.1 > Acked-by: Chao Zhu <chao...@linux.vnet.ibm.com> > Thanks Chao for taking over for now. Being listed as Maintainer for "IBM Power" atm, can you push this yourself or do you need someone else to commit it? -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd
