diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch b/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch index e4d57c27ef1..454d05d4734 100644 --- a/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch +++ b/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch @@ -1,6 +1,6 @@ -From f12acc6a383546d48da3bdfb2f25ca2adb7976d7 Mon Sep 17 00:00:00 2001 +From 8845248c81c0695ccc65311017deef824fa538fa Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Sun, 13 Aug 2023 10:24:05 +0100 +Date: Thu, 17 Aug 2023 09:01:40 -0700 Subject: [PATCH] gcc testsuite tweaks for mips/OE Disable loongson-mmi runtine, qemu doesn't appear to fully support them even if some @@ -26,10 +26,12 @@ Also, for gcc.target tests, add checks on wheter loongson or msa code can be run before trying that, allowing downgrading of tests there to work too. Upstream-Status: Pending + [Parts of the patch may be able to be split off and acceptable to upstream with discussion. Need to investigate why qemu-user passes the 'bad' instructions'] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- gcc/testsuite/gcc.target/mips/mips.exp | 16 +++++++++ gcc/testsuite/lib/gcc-dg.exp | 11 +++++++ @@ -37,10 +39,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp -index 15d574202d3..2cef9709774 100644 +index e028bc93b40..b54a40d6509 100644 --- a/gcc/testsuite/gcc.target/mips/mips.exp +++ b/gcc/testsuite/gcc.target/mips/mips.exp -@@ -709,7 +709,23 @@ proc mips_first_unsupported_option { upstatus } { +@@ -711,7 +711,23 @@ proc mips_first_unsupported_option { upstatus } { global mips_option_tests upvar $upstatus status @@ -65,10 +67,10 @@ index 15d574202d3..2cef9709774 100644 regsub -all "\n" $code "\\n\\\n" asm # Use check_runtime from target-supports.exp, which caches diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp -index 9d79b9402e9..e0e5cbb1af8 100644 +index 228c21d1207..d3b88e0419e 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp -@@ -240,9 +240,20 @@ proc schedule-cleanups { opts } { +@@ -232,9 +232,20 @@ proc schedule-cleanups { opts } { proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } { # Set up the compiler flags, based on what we're going to do. @@ -77,23 +79,23 @@ index 9d79b9402e9..e0e5cbb1af8 100644 set options [list] + if [info exists do-what-limit] then { -+ # Demote run tests to $do-what-limit if set -+ switch $do_what { ++ # Demote run tests to $do-what-limit if set ++ switch $do_what { + run { -+ set do_what ${do-what-limit} -+ set dg-do-what ${do-what-limit} -+ } -+ } ++ set do_what ${do-what-limit} ++ set dg-do-what ${do-what-limit} ++ } ++ } + } + switch $do_what { "preprocess" { set compile_type "preprocess" diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp -index 40f71e9ed8b..10e267fa16d 100644 +index 45435586de2..04942540d8b 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp -@@ -2155,14 +2155,7 @@ proc check_mips_loongson_mmi_hw_available { } { +@@ -2483,14 +2483,7 @@ proc check_mips_loongson_mmi_hw_available { } { if { !([istarget mips*-*-*]) } { expr 0 } else { @@ -109,7 +111,7 @@ index 40f71e9ed8b..10e267fa16d 100644 } }] } -@@ -2176,29 +2169,7 @@ proc check_mips_msa_hw_available { } { +@@ -2504,29 +2497,7 @@ proc check_mips_msa_hw_available { } { if { !([istarget mips*-*-*]) } { expr 0 } else { @@ -140,7 +142,7 @@ index 40f71e9ed8b..10e267fa16d 100644 } }] } -@@ -9187,6 +9158,7 @@ proc is-effective-target-keyword { arg } { +@@ -9897,6 +9868,7 @@ proc is-effective-target-keyword { arg } { proc et-dg-runtest { runtest testcases flags default-extra-flags } { global dg-do-what-default @@ -148,7 +150,7 @@ index 40f71e9ed8b..10e267fa16d 100644 global EFFECTIVE_TARGETS global et_index -@@ -9194,6 +9166,7 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { +@@ -9904,6 +9876,7 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { foreach target $EFFECTIVE_TARGETS { set target_flags $flags set dg-do-what-default compile @@ -156,7 +158,7 @@ index 40f71e9ed8b..10e267fa16d 100644 set et_index [lsearch -exact $EFFECTIVE_TARGETS $target] if { [info procs add_options_for_${target}] != [list] } { set target_flags [add_options_for_${target} "$flags"] -@@ -9201,8 +9174,10 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { +@@ -9911,8 +9884,10 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { if { [info procs check_effective_target_${target}_runtime] != [list] && [check_effective_target_${target}_runtime] } { set dg-do-what-default run @@ -167,7 +169,7 @@ index 40f71e9ed8b..10e267fa16d 100644 } } else { set et_index 0 -@@ -10789,6 +10764,7 @@ proc check_effective_target_sigsetjmp {} { +@@ -11606,6 +11581,7 @@ proc check_effective_target_sigsetjmp {} { proc check_vect_support_and_set_flags { } { global DEFAULT_VECTCFLAGS global dg-do-what-default @@ -175,7 +177,7 @@ index 40f71e9ed8b..10e267fa16d 100644 global EFFECTIVE_TARGETS if [istarget powerpc-*paired*] { -@@ -10797,6 +10773,7 @@ proc check_vect_support_and_set_flags { } { +@@ -11614,6 +11590,7 @@ proc check_vect_support_and_set_flags { } { set dg-do-what-default run } else { set dg-do-what-default compile @@ -183,15 +185,15 @@ index 40f71e9ed8b..10e267fa16d 100644 } } elseif [istarget powerpc*-*-*] { # Skip targets not supporting -maltivec. -@@ -10821,6 +10798,7 @@ proc check_vect_support_and_set_flags { } { - lappend DEFAULT_VECTCFLAGS "-mcpu=970" +@@ -11644,6 +11621,7 @@ proc check_vect_support_and_set_flags { } { + set DEFAULT_VECTCFLAGS [linsert $DEFAULT_VECTCFLAGS 0 "-mcpu=970"] } set dg-do-what-default compile + set do-what-limit link } } elseif { [istarget i?86-*-*] || [istarget x86_64-*-*] } { lappend DEFAULT_VECTCFLAGS "-msse2" -@@ -10828,6 +10806,7 @@ proc check_vect_support_and_set_flags { } { +@@ -11651,6 +11629,7 @@ proc check_vect_support_and_set_flags { } { set dg-do-what-default run } else { set dg-do-what-default compile @@ -199,7 +201,7 @@ index 40f71e9ed8b..10e267fa16d 100644 } } elseif { [istarget mips*-*-*] && [check_effective_target_nomips16] } { -@@ -10847,6 +10826,7 @@ proc check_vect_support_and_set_flags { } { +@@ -11670,6 +11649,7 @@ proc check_vect_support_and_set_flags { } { set dg-do-what-default run } else { set dg-do-what-default compile @@ -207,7 +209,7 @@ index 40f71e9ed8b..10e267fa16d 100644 } } elseif [istarget alpha*-*-*] { # Alpha's vectorization capabilities are extremely limited. -@@ -10860,6 +10840,7 @@ proc check_vect_support_and_set_flags { } { +@@ -11683,6 +11663,7 @@ proc check_vect_support_and_set_flags { } { set dg-do-what-default run } else { set dg-do-what-default compile @@ -215,7 +217,7 @@ index 40f71e9ed8b..10e267fa16d 100644 } } elseif [istarget ia64-*-*] { set dg-do-what-default run -@@ -10873,6 +10854,7 @@ proc check_vect_support_and_set_flags { } { +@@ -11696,6 +11677,7 @@ proc check_vect_support_and_set_flags { } { set dg-do-what-default run } else { set dg-do-what-default compile @@ -223,7 +225,7 @@ index 40f71e9ed8b..10e267fa16d 100644 } } elseif [istarget aarch64*-*-*] { set dg-do-what-default run -@@ -10897,6 +10879,7 @@ proc check_vect_support_and_set_flags { } { +@@ -11720,6 +11702,7 @@ proc check_vect_support_and_set_flags { } { } else { lappend DEFAULT_VECTCFLAGS "-march=z14" "-mzarch" set dg-do-what-default compile |