[testsuite] Fix directives order

Message ID CAKdteObuJgDqqc7NcNA1KST1rHHBJOkt9hq98kxZgfU2ojabnA@mail.gmail.com
State New
Headers show
Series
  • [testsuite] Fix directives order
Related show

Commit Message

Christophe Lyon Oct. 16, 2017, 8:45 p.m.
Hi,

I have noticed a few testcases where dg-do should be moved as the
first directive, and others where dg-options should be moved before
dg-add-options. The attached patch does that. I noticed no difference
in testing, at least because the arm configs I test do not include
v8m.
So, no regression from my point of view, but this should avoid some headaches.

OK?

Thanks,

Christophe
2017-10-16  Christophe Lyon  <christophe.lyon@linaro.org>

	* gcc.c-torture/execute/pr23135.c: Move dg-add-options after
	dg-options.
	* gcc.dg/torture/pr78305.c: Move dg-do as first directive.
	* gcc.misc-tests/gcov-3.c: Likewise.
	* gcc.target/arm/cmse/baseline/cmse-11.c: Move dg-options before dg-add-options.
	* gcc.target/arm/cmse/baseline/cmse-13.c: Likewise.
	* gcc.target/arm/cmse/baseline/cmse-2.c: Likewise.
	* gcc.target/arm/cmse/baseline/cmse-6.c: Likewise.
	* gcc.target/arm/cmse/baseline/softfp.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard/cmse-13.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard/cmse-5.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard/cmse-7.c: Likewise.
	* gcc.target/arm/cmse/mainline/hard/cmse-8.c: Likewise.
	* gcc.target/arm/cmse/mainline/soft/cmse-13.c: Likewise.
	* gcc.target/arm/cmse/mainline/soft/cmse-5.c: Likewise.
	* gcc.target/arm/cmse/mainline/soft/cmse-7.c: Likewise.
	* gcc.target/arm/cmse/mainline/soft/cmse-8.c: Likewise.
	* gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c: Likewise.
	* gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c: Likewise.
	* gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c: Likewise.
	* gcc.target/arm/cmse/mainline/softfp/cmse-13.c: Likewise.
	* gcc.target/arm/cmse/mainline/softfp/cmse-5.c: Likewise.
	* gcc.target/arm/cmse/mainline/softfp/cmse-7.c: Likewise.
	* gcc.target/arm/cmse/mainline/softfp/cmse-8.c: Likewise.
	* gcc.target/arm/lp1189445.c: Likewise.

Comments

Richard Earnshaw (lists) Oct. 20, 2017, 1:51 p.m. | #1
On 16/10/17 21:45, Christophe Lyon wrote:
> Hi,

> 

> I have noticed a few testcases where dg-do should be moved as the

> first directive, and others where dg-options should be moved before

> dg-add-options. The attached patch does that. I noticed no difference

> in testing, at least because the arm configs I test do not include

> v8m.

> So, no regression from my point of view, but this should avoid some headaches.

> 

> OK?


This all looks pretty sensible.

OK.

R.

> 

> Thanks,

> 

> Christophe

> 

> 

> dg-order.chlog.txt

> 

> 

> 2017-10-16  Christophe Lyon  <christophe.lyon@linaro.org>

> 

> 	* gcc.c-torture/execute/pr23135.c: Move dg-add-options after

> 	dg-options.

> 	* gcc.dg/torture/pr78305.c: Move dg-do as first directive.

> 	* gcc.misc-tests/gcov-3.c: Likewise.

> 	* gcc.target/arm/cmse/baseline/cmse-11.c: Move dg-options before dg-add-options.

> 	* gcc.target/arm/cmse/baseline/cmse-13.c: Likewise.

> 	* gcc.target/arm/cmse/baseline/cmse-2.c: Likewise.

> 	* gcc.target/arm/cmse/baseline/cmse-6.c: Likewise.

> 	* gcc.target/arm/cmse/baseline/softfp.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard/cmse-13.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard/cmse-5.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard/cmse-7.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/hard/cmse-8.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/soft/cmse-13.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/soft/cmse-5.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/soft/cmse-7.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/soft/cmse-8.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/softfp/cmse-13.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/softfp/cmse-5.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/softfp/cmse-7.c: Likewise.

> 	* gcc.target/arm/cmse/mainline/softfp/cmse-8.c: Likewise.

> 	* gcc.target/arm/lp1189445.c: Likewise.

> 

> 

> dg-order.patch.txt

> 

> 

> diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23135.c b/gcc/testsuite/gcc.c-torture/execute/pr23135.c

> index 8dd6358..e740ff5 100644

> --- a/gcc/testsuite/gcc.c-torture/execute/pr23135.c

> +++ b/gcc/testsuite/gcc.c-torture/execute/pr23135.c

> @@ -1,9 +1,8 @@

> -/* { dg-add-options stack_size } */

> -

>  /* Based on execute/simd-1.c, modified by joern.rennecke@st.com to

>     trigger a reload bug.  Verified for gcc mainline from 20050722 13:00 UTC

>     for sh-elf -m4 -O2.  */

>  /* { dg-options "-Wno-psabi" } */

> +/* { dg-add-options stack_size } */

>  

>  #ifndef STACK_SIZE

>  #define STACK_SIZE (256*1024)

> diff --git a/gcc/testsuite/gcc.dg/torture/pr78305.c b/gcc/testsuite/gcc.dg/torture/pr78305.c

> index ccb8c6f..36d3620 100644

> --- a/gcc/testsuite/gcc.dg/torture/pr78305.c

> +++ b/gcc/testsuite/gcc.dg/torture/pr78305.c

> @@ -1,5 +1,5 @@

> -/* { dg-require-effective-target int32plus } */

>  /* { dg-do run } */

> +/* { dg-require-effective-target int32plus } */

>  

>  int main ()

>  {

> diff --git a/gcc/testsuite/gcc.misc-tests/gcov-3.c b/gcc/testsuite/gcc.misc-tests/gcov-3.c

> index eb6e4cc..5b07dd7 100644

> --- a/gcc/testsuite/gcc.misc-tests/gcov-3.c

> +++ b/gcc/testsuite/gcc.misc-tests/gcov-3.c

> @@ -1,10 +1,10 @@

> +/* { dg-do run { target native } } */

>  /* { dg-require-effective-target label_values } */

>  

>  /* Test Gcov with computed gotos.

>     This is the same as test gcc.c-torture/execute/980526-1.c */

>  

>  /* { dg-options "-fprofile-arcs -ftest-coverage" } */

> -/* { dg-do run { target native } } */

>  

>  extern void abort (void);

>  extern void exit (int);

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c

> index 3007409..795544f 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c

> @@ -1,7 +1,7 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse" }  */

>  /* { dg-require-effective-target arm_arch_v8m_base_ok } */

>  /* { dg-add-options arm_arch_v8m_base } */

> -/* { dg-options "-mcmse" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (int);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c

> index f2b931b..8ced14b 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c

> @@ -1,7 +1,7 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse" } */

>  /* { dg-require-effective-target arm_arch_v8m_base_ok } */

>  /* { dg-add-options arm_arch_v8m_base } */

> -/* { dg-options "-mcmse" } */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c

> index 814502d..fec7dc1 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c

> @@ -1,7 +1,7 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse" }  */

>  /* { dg-require-effective-target arm_arch_v8m_base_ok } */

>  /* { dg-add-options arm_arch_v8m_base } */

> -/* { dg-options "-mcmse" }  */

>  

>  extern float bar (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c

> index 95da045..43d45e7 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c

> @@ -1,7 +1,7 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse" }  */

>  /* { dg-require-effective-target arm_arch_v8m_base_ok } */

>  /* { dg-add-options arm_arch_v8m_base } */

> -/* { dg-options "-mcmse" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c

> index 0069fcd..ca76e12 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c

> @@ -1,7 +1,7 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp" } */

>  /* { dg-require-effective-target arm_arch_v8m_base_ok } */

>  /* { dg-add-options arm_arch_v8m_base } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp" } */

>  

>  double __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c

> index d90ad81..a484cfe 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c

> index 88dec27..ebc080a 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  

>  extern float bar (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c

> index c047cd5..4fabd45 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c

> index 20d2d4a..9b18c3a 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c

> index 0af586a..36e301a 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c

> index 29f60ba..5a7fb04 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  

>  extern float bar (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c

> index a5c64fb..ff77579 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c

> index 5e041b1..dce0d90 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c

> index dbbd262..fe2ac47 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c

> @@ -1,8 +1,8 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c

> index a7229ea..dff8baa 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c

> @@ -1,8 +1,8 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  

>  extern float bar (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c

> index e335684..a451f7a 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c

> @@ -1,8 +1,8 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c

> index 024a12e..6502fb7 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c

> @@ -1,8 +1,8 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=soft" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c

> index 7734d77..c14ef43 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */

>  /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */

>  

>  extern float bar (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c

> index fb195eb..db17035 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */

>  /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c

> index 22ed3f8..27acb9e 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */

>  /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c

> index 9634065..97aba0d 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c

> index 6addaa1..5db8880 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  

>  extern float bar (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c

> index 04f8466..c4d678d 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c

> index ffe94de..948476d 100644

> --- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c

> +++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c

> @@ -1,9 +1,9 @@

>  /* { dg-do compile } */

> +/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  /* { dg-require-effective-target arm_arch_v8m_main_ok } */

>  /* { dg-add-options arm_arch_v8m_main } */

>  /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */

>  /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */

> -/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */

>  

>  int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);

>  

> diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c b/gcc/testsuite/gcc.target/arm/lp1189445.c

> index 766748e..4866953 100644

> --- a/gcc/testsuite/gcc.target/arm/lp1189445.c

> +++ b/gcc/testsuite/gcc.target/arm/lp1189445.c

> @@ -1,7 +1,7 @@

>  /* { dg-do compile } */

> +/* { dg-options "-O3" } */

>  /* { dg-require-effective-target arm_neon } */

>  /* { dg-add-options arm_neon } */

> -/* { dg-options "-O3" } */

>  

>  int id;

>  int

>

Patch

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23135.c b/gcc/testsuite/gcc.c-torture/execute/pr23135.c
index 8dd6358..e740ff5 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr23135.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr23135.c
@@ -1,9 +1,8 @@ 
-/* { dg-add-options stack_size } */
-
 /* Based on execute/simd-1.c, modified by joern.rennecke@st.com to
    trigger a reload bug.  Verified for gcc mainline from 20050722 13:00 UTC
    for sh-elf -m4 -O2.  */
 /* { dg-options "-Wno-psabi" } */
+/* { dg-add-options stack_size } */
 
 #ifndef STACK_SIZE
 #define STACK_SIZE (256*1024)
diff --git a/gcc/testsuite/gcc.dg/torture/pr78305.c b/gcc/testsuite/gcc.dg/torture/pr78305.c
index ccb8c6f..36d3620 100644
--- a/gcc/testsuite/gcc.dg/torture/pr78305.c
+++ b/gcc/testsuite/gcc.dg/torture/pr78305.c
@@ -1,5 +1,5 @@ 
-/* { dg-require-effective-target int32plus } */
 /* { dg-do run } */
+/* { dg-require-effective-target int32plus } */
 
 int main ()
 {
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-3.c b/gcc/testsuite/gcc.misc-tests/gcov-3.c
index eb6e4cc..5b07dd7 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-3.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-3.c
@@ -1,10 +1,10 @@ 
+/* { dg-do run { target native } } */
 /* { dg-require-effective-target label_values } */
 
 /* Test Gcov with computed gotos.
    This is the same as test gcc.c-torture/execute/980526-1.c */
 
 /* { dg-options "-fprofile-arcs -ftest-coverage" } */
-/* { dg-do run { target native } } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c
index 3007409..795544f 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-11.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse" }  */
 /* { dg-require-effective-target arm_arch_v8m_base_ok } */
 /* { dg-add-options arm_arch_v8m_base } */
-/* { dg-options "-mcmse" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (int);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c
index f2b931b..8ced14b 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-13.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse" } */
 /* { dg-require-effective-target arm_arch_v8m_base_ok } */
 /* { dg-add-options arm_arch_v8m_base } */
-/* { dg-options "-mcmse" } */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c
index 814502d..fec7dc1 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-2.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse" }  */
 /* { dg-require-effective-target arm_arch_v8m_base_ok } */
 /* { dg-add-options arm_arch_v8m_base } */
-/* { dg-options "-mcmse" }  */
 
 extern float bar (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c
index 95da045..43d45e7 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/cmse-6.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse" }  */
 /* { dg-require-effective-target arm_arch_v8m_base_ok } */
 /* { dg-add-options arm_arch_v8m_base } */
-/* { dg-options "-mcmse" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c b/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c
index 0069fcd..ca76e12 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/baseline/softfp.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp" } */
 /* { dg-require-effective-target arm_arch_v8m_base_ok } */
 /* { dg-add-options arm_arch_v8m_base } */
-/* { dg-options "-mcmse -mfloat-abi=softfp" } */
 
 double __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c
index d90ad81..a484cfe 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-13.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c
index 88dec27..ebc080a 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-5.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 
 extern float bar (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c
index c047cd5..4fabd45 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-7.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c
index 20d2d4a..9b18c3a 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard-sp/cmse-8.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-sp-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c
index 0af586a..36e301a 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-13.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c
index 29f60ba..5a7fb04 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-5.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 
 extern float bar (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c
index a5c64fb..ff77579 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-7.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c
index 5e041b1..dce0d90 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/hard/cmse-8.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=softfp } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=hard -mfpu=fpv5-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c
index dbbd262..fe2ac47 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-13.c
@@ -1,8 +1,8 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */
-/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c
index a7229ea..dff8baa 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-5.c
@@ -1,8 +1,8 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */
-/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 
 extern float bar (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c
index e335684..a451f7a 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-7.c
@@ -1,8 +1,8 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */
-/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c
index 024a12e..6502fb7 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/soft/cmse-8.c
@@ -1,8 +1,8 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=hard" -mfloat-abi=softfp } {""} } */
-/* { dg-options "-mcmse -mfloat-abi=soft" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c
index 7734d77..c14ef43 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-5.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */
 /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */
 
 extern float bar (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c
index fb195eb..db17035 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-7.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */
 /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c
index 22ed3f8..27acb9e 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp-sp/cmse-8.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */
 /* { dg-skip-if "Skip these if testing double precision" {*-*-*} {"-mfpu=fpv[4-5]-d16"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-sp-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c
index 9634065..97aba0d 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-13.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (float, double);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c
index 6addaa1..5db8880 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-5.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 
 extern float bar (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c
index 04f8466..c4d678d 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-7.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (void);
 
diff --git a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c
index ffe94de..948476d 100644
--- a/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c
+++ b/gcc/testsuite/gcc.target/arm/cmse/mainline/softfp/cmse-8.c
@@ -1,9 +1,9 @@ 
 /* { dg-do compile } */
+/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 /* { dg-require-effective-target arm_arch_v8m_main_ok } */
 /* { dg-add-options arm_arch_v8m_main } */
 /* { dg-skip-if "Do not combine float-abi= hard | soft | softfp" {*-*-*} {"-mfloat-abi=soft" -mfloat-abi=hard } {""} } */
 /* { dg-skip-if "Skip these if testing single precision" {*-*-*} {"-mfpu=*-sp-*"} {""} } */
-/* { dg-options "-mcmse -mfloat-abi=softfp -mfpu=fpv5-d16" }  */
 
 int __attribute__ ((cmse_nonsecure_call)) (*bar) (double);
 
diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c b/gcc/testsuite/gcc.target/arm/lp1189445.c
index 766748e..4866953 100644
--- a/gcc/testsuite/gcc.target/arm/lp1189445.c
+++ b/gcc/testsuite/gcc.target/arm/lp1189445.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
+/* { dg-options "-O3" } */
 /* { dg-require-effective-target arm_neon } */
 /* { dg-add-options arm_neon } */
-/* { dg-options "-O3" } */
 
 int id;
 int