1 files changed, 66 insertions, 72 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 e4d57c27ef..0a61862332 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 62e25edd60d45eaec331a3273880f6ff3248ef62 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,21 +26,23 @@ 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/gcc.target/mips/mips.exp | 16 ++++++++++
  gcc/testsuite/lib/gcc-dg.exp           | 11 +++++++
- gcc/testsuite/lib/target-supports.exp  | 45 ++++++++------------------
- 3 files changed, 41 insertions(+), 31 deletions(-)
+ gcc/testsuite/lib/target-supports.exp  | 44 ++++++++------------------
+ 3 files changed, 40 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 82d418a7cd4..46f7bf4ef92 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 6dd8fa3fce9..95672008219 100644
 --- a/gcc/testsuite/lib/gcc-dg.exp
 +++ b/gcc/testsuite/lib/gcc-dg.exp
-@@ -240,9 +240,20 @@ proc schedule-cleanups { opts } {
+@@ -233,9 +233,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 a62f459ad7e..6886cfeee49 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 { } {
+@@ -2949,14 +2949,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 { } {
+@@ -2970,29 +2963,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 } {
+@@ -10354,6 +10325,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 } {
+@@ -10361,6 +10333,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 } {
+@@ -10368,8 +10341,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,67 +169,59 @@ index 40f71e9ed8b..10e267fa16d 100644
         }
      } else {
         set et_index 0
-@@ -10789,6 +10764,7 @@ proc check_effective_target_sigsetjmp {} {
+@@ -12155,6 +12130,7 @@ proc check_effective_target_sigsetjmp {} {
  proc check_vect_support_and_set_flags { } {
      global DEFAULT_VECTCFLAGS
      global dg-do-what-default
 +    global do-what-limit
      global EFFECTIVE_TARGETS
  
-     if  [istarget powerpc-*paired*]  {
-@@ -10797,6 +10773,7 @@ proc check_vect_support_and_set_flags { } {
-             set dg-do-what-default run
-         } else {
-             set dg-do-what-default compile
-+            set do-what-limit link
-         }
-     } elseif [istarget powerpc*-*-*] {
-         # Skip targets not supporting -maltivec.
-@@ -10821,6 +10798,7 @@ proc check_vect_support_and_set_flags { } {
-                 lappend DEFAULT_VECTCFLAGS "-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 { } {
-             set dg-do-what-default run
-         } else {
-             set dg-do-what-default compile
-+            set do-what-limit link
-         }
+     if [istarget powerpc*-*-*] {
+@@ -12186,6 +12162,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 { [check_effective_target_x86] } {
+        lappend DEFAULT_VECTCFLAGS "-msse2"
+@@ -12193,6 +12170,7 @@ proc check_vect_support_and_set_flags { } {
+            set dg-do-what-default run
+        } else {
+            set dg-do-what-default compile
++        set do-what-limit link
+        }
      } elseif { [istarget mips*-*-*]
                && [check_effective_target_nomips16] } {
-@@ -10847,6 +10826,7 @@ proc check_vect_support_and_set_flags { } {
-             set dg-do-what-default run
-         } else {
-             set dg-do-what-default compile
-+            set do-what-limit link
-         }
+@@ -12212,6 +12190,7 @@ proc check_vect_support_and_set_flags { } {
+            set dg-do-what-default run
+        } else {
+            set dg-do-what-default compile
++        set do-what-limit link
+        }
      } elseif [istarget alpha*-*-*] {
-         # Alpha's vectorization capabilities are extremely limited.
-@@ -10860,6 +10840,7 @@ proc check_vect_support_and_set_flags { } {
-             set dg-do-what-default run
-         } else {
-             set dg-do-what-default compile
-+            set do-what-limit link
-         }
+        # Alpha's vectorization capabilities are extremely limited.
+@@ -12225,6 +12204,7 @@ proc check_vect_support_and_set_flags { } {
+            set dg-do-what-default run
+        } else {
+            set dg-do-what-default compile
++        set do-what-limit link
+        }
      } elseif [istarget ia64-*-*] {
-         set dg-do-what-default run
-@@ -10873,6 +10854,7 @@ proc check_vect_support_and_set_flags { } {
-             set dg-do-what-default run
-         } else {
-             set dg-do-what-default compile
-+            set do-what-limit link
-         }
+        set dg-do-what-default run
+@@ -12238,6 +12218,7 @@ proc check_vect_support_and_set_flags { } {
+            set dg-do-what-default run
+        } else {
+            set dg-do-what-default compile
++        set do-what-limit link
+        }
      } elseif [istarget aarch64*-*-*] {
-         set dg-do-what-default run
-@@ -10897,6 +10879,7 @@ proc check_vect_support_and_set_flags { } {
-         } else {
+        set dg-do-what-default run
+@@ -12262,6 +12243,7 @@ proc check_vect_support_and_set_flags { } {
+        } else {
             lappend DEFAULT_VECTCFLAGS "-march=z14" "-mzarch"
-             set dg-do-what-default compile
-+            set do-what-limit link
-         }
+            set dg-do-what-default compile
++        set do-what-limit link
+        }
      } elseif [istarget amdgcn-*-*] {
-         set dg-do-what-default run
+        set dg-do-what-default run