On 17/12/2024 07:04, Torbjörn SVENSSON wrote:
> Ok for trunk?
>
> --
>
> Fixes Linaro CI reported regression on r15-6164-gbdf75257aad2 in
> https://linaro.atlassian.net/browse/GNU-1463.
>
> gcc/testsuite/ChangeLog:
>
> * lib/target-supports.exp: Added corresponding -mtune= option
> for each fo the arm_cpu_* effective targets.
>
Please can you add to the comment before this table:
# NOTE: -mcpu does not override -mtune, so to ensure the tuning is consistent
# for tests using these flags all entries should set -mcpu and -mtune explicitly
OK with that change.
R.
> Signed-off-by: Torbjörn SVENSSON <torbjorn.svens...@foss.st.com>
> ---
> gcc/testsuite/lib/target-supports.exp | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/gcc/testsuite/lib/target-supports.exp
> b/gcc/testsuite/lib/target-supports.exp
> index fe2970e024b..34a9b4d3816 100644
> --- a/gcc/testsuite/lib/target-supports.exp
> +++ b/gcc/testsuite/lib/target-supports.exp
> @@ -5958,18 +5958,18 @@ foreach { armfunc armflag armdefs } {
> # This table should only be used to set -mcpu= (and associated
> # flags). See above for setting -march=.
> foreach { armfunc armflag armdefs } {
> - xscale_arm "-mcpu=xscale -mfloat-abi=soft -marm" "__XSCALE__ &&
> !__thumb__"
> - cortex_a57 "-mcpu=cortex-a57" __ARM_ARCH_8A__
> - cortex_m0 "-mcpu=cortex-m0 -mfloat-abi=soft -mthumb"
> "__ARM_ARCH_6M__ && __thumb__"
> - cortex_m0_small "-mcpu=cortex-m0.small-multiply -mfloat-abi=soft
> -mthumb" "__ARM_ARCH_6M__ && __thumb__"
> - cortex_m0plus_small "-mcpu=cortex-m0plus.small-multiply
> -mfloat-abi=soft -mthumb" "__ARM_ARCH_6M__ && __thumb__"
> - cortex_m1_small "-mcpu=cortex-m1.small-multiply -mfloat-abi=soft
> -mthumb" "__ARM_ARCH_6M__ && __thumb__"
> - cortex_m3 "-mcpu=cortex-m3 -mfloat-abi=soft -mthumb"
> "__ARM_ARCH_7M__"
> - cortex_m4 "-mcpu=cortex-m4 -mfpu=auto -mthumb" "__ARM_ARCH_7EM__"
> - cortex_m4_hard "-mcpu=cortex-m4 -mfpu=auto -mfloat-abi=hard
> -mthumb" "__ARM_ARCH_7EM__"
> - cortex_m7 "-mcpu=cortex-m7 -mfpu=auto -mthumb" "__ARM_ARCH_7EM__"
> - cortex_m23 "-mcpu=cortex-m23 -mfloat-abi=soft -mthumb"
> "__ARM_ARCH_8M_BASE__ && __thumb__"
> - cortex_m55 "-mcpu=cortex-m55 -mfpu=auto -mthumb"
> "__ARM_ARCH_8M_MAIN__ && __thumb__"
> + xscale_arm "-mcpu=xscale -mtune=xscale -mfloat-abi=soft -marm"
> "__XSCALE__ && !__thumb__"
> + cortex_a57 "-mcpu=cortex-a57 -mtune=cortex-a57" __ARM_ARCH_8A__
> + cortex_m0 "-mcpu=cortex-m0 -mtune=cortex-m0 -mfloat-abi=soft
> -mthumb" "__ARM_ARCH_6M__ && __thumb__"
> + cortex_m0_small "-mcpu=cortex-m0.small-multiply
> -mtune=cortex-m0.small-multiply -mfloat-abi=soft -mthumb" "__ARM_ARCH_6M__ &&
> __thumb__"
> + cortex_m0plus_small "-mcpu=cortex-m0plus.small-multiply
> -mtune=cortex-m0plus.small-multiply -mfloat-abi=soft -mthumb"
> "__ARM_ARCH_6M__ && __thumb__"
> + cortex_m1_small "-mcpu=cortex-m1.small-multiply
> -mtune=cortex-m1.small-multiply -mfloat-abi=soft -mthumb" "__ARM_ARCH_6M__ &&
> __thumb__"
> + cortex_m3 "-mcpu=cortex-m3 -mtune=cortex-m3 -mfloat-abi=soft
> -mthumb" "__ARM_ARCH_7M__"
> + cortex_m4 "-mcpu=cortex-m4 -mtune=cortex-m4 -mfpu=auto -mthumb"
> "__ARM_ARCH_7EM__"
> + cortex_m4_hard "-mcpu=cortex-m4 -mtune=cortex-m4 -mfpu=auto
> -mfloat-abi=hard -mthumb" "__ARM_ARCH_7EM__"
> + cortex_m7 "-mcpu=cortex-m7 -mtune=cortex-m7 -mfpu=auto -mthumb"
> "__ARM_ARCH_7EM__"
> + cortex_m23 "-mcpu=cortex-m23 -mtune=cortex-m23 -mfloat-abi=soft
> -mthumb" "__ARM_ARCH_8M_BASE__ && __thumb__"
> + cortex_m55 "-mcpu=cortex-m55 -mtune=cortex-m55 -mfpu=auto -mthumb"
> "__ARM_ARCH_8M_MAIN__ && __thumb__"
> } {
> eval [string map [list FUNC $armfunc FLAG $armflag DEFS $armdefs ] {
> proc check_effective_target_arm_cpu_FUNC_ok { } {
