From 0ac0e640a7f86ba45b7e13ed018826177197f3ce Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 27 Jul 2024 00:17:03 +0100
Subject: [PATCH] testsuite: fix dg-do ordering wrt dg-require-*

Per gccint, dg-do must precede dg-require-effective-target or
dg-require-support. Fix a handful of deviant cases.

gcc/testsuite/ChangeLog:
	PR middle-end/25521
	PR debug/93122
	* gcc.dg/pr25521.c: Fix dg-do directive order.
	* gcc.dg/vect/vect-simd-clone-19.c: Likewise.
	* gcc.target/arm/stack-protector-7.c: Likewise.
	* gcc.target/arm/stack-protector-8.c: Likewise.
	* gcc.target/powerpc/pr93122.c: Likewise.

libstdc++-v3/ChangeLog:
	PR libstdc++/110572
	* testsuite/18_support/type_info/110572.cc: Fix dg-do directive order.
---
 gcc/testsuite/gcc.dg/pr25521.c                        | 2 +-
 gcc/testsuite/gcc.dg/vect/vect-simd-clone-19.c        | 2 +-
 gcc/testsuite/gcc.target/arm/stack-protector-7.c      | 2 +-
 gcc/testsuite/gcc.target/arm/stack-protector-8.c      | 2 +-
 gcc/testsuite/gcc.target/powerpc/pr93122.c            | 2 +-
 libstdc++-v3/testsuite/18_support/type_info/110572.cc | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/pr25521.c b/gcc/testsuite/gcc.dg/pr25521.c
index 82b4cd88ec0..cd1b90085e1 100644
--- a/gcc/testsuite/gcc.dg/pr25521.c
+++ b/gcc/testsuite/gcc.dg/pr25521.c
@@ -1,8 +1,8 @@
 /* PR middle-end/25521 - place `const volatile' objects in read-only
    sections.
 
-   { dg-require-effective-target elf }
    { dg-do compile }
+   { dg-require-effective-target elf }
    { dg-skip-if "" { ! const_volatile_readonly_section } } */
 
 const volatile int foo = 30;
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-19.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-19.c
index e7ed56ca754..46d25526479 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-19.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-19.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target vect_simd_clones } */
 /* { dg-do compile } */
+/* { dg-require-effective-target vect_simd_clones } */
 
 int __attribute__ ((__simd__, const)) fn (int);
 
diff --git a/gcc/testsuite/gcc.target/arm/stack-protector-7.c b/gcc/testsuite/gcc.target/arm/stack-protector-7.c
index 2173bc5a35a..23207fd98c8 100644
--- a/gcc/testsuite/gcc.target/arm/stack-protector-7.c
+++ b/gcc/testsuite/gcc.target/arm/stack-protector-7.c
@@ -1,6 +1,6 @@
+/* { dg-do compile } */
 /* { dg-require-effective-target arm_hard_vfp_ok }  */
 /* { dg-require-effective-target arm_arch_v7a_ok } */
-/* { dg-do compile } */
 /* { dg-options "-march=armv7-a -mfpu=vfp -fstack-protector-all -Os -mstack-protector-guard=tls -mstack-protector-guard-offset=1296 -mtp=cp15" } */
 
 #include "stack-protector-5.c"
diff --git a/gcc/testsuite/gcc.target/arm/stack-protector-8.c b/gcc/testsuite/gcc.target/arm/stack-protector-8.c
index ea5ef321167..165f34706cc 100644
--- a/gcc/testsuite/gcc.target/arm/stack-protector-8.c
+++ b/gcc/testsuite/gcc.target/arm/stack-protector-8.c
@@ -1,6 +1,6 @@
+/* { dg-do compile } */
 /* { dg-require-effective-target arm_hard_vfp_ok }  */
 /* { dg-require-effective-target arm_arch_v7a_ok } */
-/* { dg-do compile } */
 /* { dg-error "needs a hardware TLS register" "missing error when using TLS stack protector without hardware TLS register" { target *-*-* } 0 } */
 /* { dg-options "-fstack-protector-all -Os -mstack-protector-guard=tls -mtp=soft" } */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93122.c b/gcc/testsuite/gcc.target/powerpc/pr93122.c
index 97bcb0cea5f..42d1d94ba15 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr93122.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr93122.c
@@ -1,6 +1,6 @@
 /* PR target/93122 */
-/* { dg-require-effective-target power10_ok } */
 /* { dg-do compile { target lp64 } } */
+/* { dg-require-effective-target power10_ok } */
 /* { dg-options "-fstack-clash-protection -mprefixed -mdejagnu-cpu=power10" } */
 
 void bar (char *);
diff --git a/libstdc++-v3/testsuite/18_support/type_info/110572.cc b/libstdc++-v3/testsuite/18_support/type_info/110572.cc
index 64081879b77..f727653adfb 100644
--- a/libstdc++-v3/testsuite/18_support/type_info/110572.cc
+++ b/libstdc++-v3/testsuite/18_support/type_info/110572.cc
@@ -1,7 +1,7 @@
 // { dg-options "-static-libstdc++" }
+// { dg-do link }
 // { dg-require-static-libstdcxx }
 // { dg-require-cpp-feature-test __cpp_rtti }
-// { dg-do link }
 
 #include <typeinfo>