[PATCH 20.11] config/ppc: fix build with GCC >= 10

[PATCH 20.11] config/ppc: fix build with GCC >= 10

[luca.boccassi]

From: David Marchand <david.marchand@redhat.com>

[ backported from upstream commit dfb1ad1e7a070926c9bd9fdf38e6b944a21f1d49 ]

Like for python, multiline statements in meson must either use a
backslash character (explicit continuation) or be enclosed in ()
(implicit continuation).

python PEP8 recommends the latter [1], and it looks like meson had
an issue with backslash before 0.50 [2].

1: https://www.python.org/dev/peps/pep-0008/#multiline-if-statements
2: https://github.com/mesonbuild/meson/commit/90c9b868b20b

Fixes: 394407f50c90 ("config/ppc: ignore GCC 11 psabi warnings")

Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
Tested-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
Required to fix build on ppc64el with gcc 10+

 config/ppc/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/ppc/meson.build b/config/ppc/meson.build
index bea72f86b5..dc4a3d8c13 100644
--- a/config/ppc/meson.build
+++ b/config/ppc/meson.build
@@ -20,8 +20,8 @@ endif
 
 # Suppress the gcc warning "note: the layout of aggregates containing
 # vectors with 4-byte alignment has changed in GCC 5".
-if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0') and
-        cc.version().version_compare('<12.0') and cc.has_argument('-Wno-psabi')
+if (cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0') and
+        cc.version().version_compare('<12.0') and cc.has_argument('-Wno-psabi'))
     add_project_arguments('-Wno-psabi', language: 'c')
 endif
 
-- 
2.30.2

Re: [PATCH 20.11] config/ppc: fix build with GCC >= 10

[David Christensen]

On 1/20/22 3:02 AM, luca.boccassi@gmail.com wrote:
> From: David Marchand <david.marchand@redhat.com>
> 
> [ backported from upstream commit dfb1ad1e7a070926c9bd9fdf38e6b944a21f1d49 ]
> 
> Like for python, multiline statements in meson must either use a
> backslash character (explicit continuation) or be enclosed in ()
> (implicit continuation).
> 
> python PEP8 recommends the latter [1], and it looks like meson had
> an issue with backslash before 0.50 [2].
> 
> 1: https://www.python.org/dev/peps/pep-0008/#multiline-if-statements
> 2: https://github.com/mesonbuild/meson/commit/90c9b868b20b
> 
> Fixes: 394407f50c90 ("config/ppc: ignore GCC 11 psabi warnings")
> 
> Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> Tested-by: Ferruh Yigit <ferruh.yigit@intel.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> Required to fix build on ppc64el with gcc 10+

Reviewed-by: David Christensen <drc@linux.vnet.ibm.com>