[PATCH v3] config/arm: update aarch32 build with gcc13

[Paul Szczepanek]

On 25/10/2023 13:57, Juraj Linkeš wrote:
> The aarch32 with gcc13 fails with:
>
> Compiler for C supports arguments -march=armv8-a: NO
>
> ../config/arm/meson.build:714:12: ERROR: Problem encountered: No
> suitable armv8 march version found.
>
> This is because we test -march=armv8-a alone (without the -mpfu option),
> which is no longer supported in gcc13 aarch32 builds.
>
> The most recent recommendation from the compiler team is to build with
> -march=armv8-a+simd -mfpu=auto, which should work for compilers old and
> new. The suggestion is to first check -march=armv8-a+simd and only then
> check -mfpu=auto.
>
> To address this, add a way to force the architecture (the value of
> the -march option).
>
> Signed-off-by: Juraj Linkeš <juraj.linkes at pantheon.tech>
> ---
>   config/arm/meson.build | 40 +++++++++++++++++++++++-----------------
>   1 file changed, 23 insertions(+), 17 deletions(-)
>
> diff --git a/config/arm/meson.build b/config/arm/meson.build
> index 3f22d8a2fc..c3f763764a 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -43,7 +43,9 @@ implementer_generic = {
>           },
>           'generic_aarch32': {
>               'march': 'armv8-a',
> -            'compiler_options': ['-mfpu=neon'],
> +            'force_march': true,
> +            'march_features': ['simd'],
> +            'compiler_options': ['-mfpu=auto'],
>               'flags': [
>                   ['RTE_ARCH_ARM_NEON_MEMCPY', false],
>                   ['RTE_ARCH_STRICT_ALIGN', true],
> @@ -695,21 +697,25 @@ if update_flags
>       # probe supported archs and their features
>       candidate_march = ''
>       if part_number_config.has_key('march')
> -        supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a', 'armv8.3-a',
> -                            'armv8.2-a', 'armv8.1-a', 'armv8-a']
> -        check_compiler_support = false
> -        foreach supported_march: supported_marchs
> -            if supported_march == part_number_config['march']
> -                # start checking from this version downwards
> -                check_compiler_support = true
> -            endif
> -            if (check_compiler_support and
> -                cc.has_argument('-march=' + supported_march))
> -                candidate_march = supported_march
> -                # highest supported march version found
> -                break
> -            endif
> -        endforeach
> +        if part_number_config.get('force_march', false)
> +            candidate_march = part_number_config['march']
> +        else
> +            supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a', 'armv8.3-a',
> +                                'armv8.2-a', 'armv8.1-a', 'armv8-a']
> +            check_compiler_support = false
> +            foreach supported_march: supported_marchs
> +                if supported_march == part_number_config['march']
> +                    # start checking from this version downwards
> +                    check_compiler_support = true
> +                endif
> +                if (check_compiler_support and
> +                    cc.has_argument('-march=' + supported_march))
> +                    candidate_march = supported_march
> +                    # highest supported march version found
> +                    break
> +                endif
> +            endforeach
> +        endif
>           if candidate_march == ''
>               error('No suitable armv8 march version found.')
>           endif
> @@ -741,7 +747,7 @@ if update_flags
>       # apply supported compiler options
>       if part_number_config.has_key('compiler_options')
>           foreach flag: part_number_config['compiler_options']
> -            if cc.has_argument(flag)
> +            if cc.has_multi_arguments(machine_args + [flag])
>                   machine_args += flag
>               else
>                   warning('Configuration compiler option ' +


Reviewed-by: Paul Szczepanek <paul.szczepanek at arm.com>