Iain Sandoe <[email protected]> writes:
> To help support multiple platforms when using function body
> scans, there is support for adding target-specific options via
> "dg-add-options dg-add-options check_function_bodies".
>
> However this call has been ommitted from a number of the function body
> tests.
>
> Fixed by adding them.
Rather than have an extra step that (as this patch proves) is hard to
remember, could we instead make this automatic? The patch below seems
to work for me with a hacked-up check_function_bodies that adds a fake
option.
I tried to check that every test in the patch invokes the:
{ dg-final { check-function-bodies ... } }
after the final dg-options.
Thanks,
Richard
gcc/testsuite/
* lib/gcc-dg.exp (dg-final): Add check_function_bodies options
for check-function-bodies directives.
* gcc/testsuite/g++.target/i386/cf_check-3.C: Remove explicit
{ dg-add-options check_function_bodies }.
* gcc/testsuite/g++.target/i386/cf_check-4.C: Likewise.
* gcc/testsuite/g++.target/i386/memset-pr101366-1.C: Likewise.
* gcc/testsuite/g++.target/i386/memset-pr101366-2.C: Likewise.
* gcc/testsuite/g++.target/i386/memset-pr108585-1a.C: Likewise.
* gcc/testsuite/g++.target/i386/memset-pr108585-1b.C: Likewise.
* gcc/testsuite/g++.target/i386/memset-pr118276-1a.C: Likewise.
* gcc/testsuite/g++.target/i386/memset-pr118276-1b.C: Likewise.
* gcc/testsuite/g++.target/i386/memset-pr118276-1c.C: Likewise.
* gcc/testsuite/gcc.target/i386/20040112-1.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-2.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-3.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-4.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-5.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-6.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-7.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-8a.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-copysign-8b.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-fabs-1.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-10.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-11a.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-11b.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-11c.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-12.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-13.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-14.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-15.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-1a.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-1b.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-1c.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-1d.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-2a.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-2b.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-2c.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-2d.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-3a.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-3b.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-3c.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-4a.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-4b.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-4c.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-5a.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-5b.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-5c.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-6.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-7.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-8.c: Likewise.
* gcc/testsuite/gcc.target/i386/builtin-memmove-9.c: Likewise.
* gcc/testsuite/gcc.target/i386/cf_check-11.c: Likewise.
* gcc/testsuite/gcc.target/i386/cf_check-7.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-pr120683-1.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-pr120683-2.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-pr120683-3.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-pr120683-4.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-pr120683-5.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-pr120683-6.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-pr120683-7.c: Likewise.
* gcc/testsuite/gcc.target/i386/memcpy-strategy-12.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-1.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-10.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-11.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-12.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-13.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-14.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-15.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-16.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-17.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-18.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-19.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-2.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-20.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-21.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-22.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-23.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-3.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-4.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-5.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-6.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-7.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-8.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr120683-9.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr70308-1a.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-pr70308-1b.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-strategy-10.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-strategy-13.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-strategy-25.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-strategy-28.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-strategy-29.c: Likewise.
* gcc/testsuite/gcc.target/i386/memset-strategy-30.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr111673.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr120936-1.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr120936-11.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr120936-2.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr120936-4.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr120936-5.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr120936-9.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-1a.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-1b.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-2a.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-2b.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-3.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-4a.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-4b.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-5a.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-5b.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-6a.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-6b.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122343-7.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr122675-1.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr125100-4.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr125355-2.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr125355.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr82142a.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr82142b.c: Likewise.
* gcc/testsuite/gcc.target/i386/pr92080-17.c: Likewise.
---
gcc/testsuite/g++.target/i386/cf_check-3.C | 1 -
gcc/testsuite/g++.target/i386/cf_check-4.C | 1 -
gcc/testsuite/g++.target/i386/memset-pr101366-1.C | 1 -
gcc/testsuite/g++.target/i386/memset-pr101366-2.C | 1 -
gcc/testsuite/g++.target/i386/memset-pr108585-1a.C | 1 -
gcc/testsuite/g++.target/i386/memset-pr108585-1b.C | 1 -
gcc/testsuite/g++.target/i386/memset-pr118276-1a.C | 1 -
gcc/testsuite/g++.target/i386/memset-pr118276-1b.C | 1 -
gcc/testsuite/g++.target/i386/memset-pr118276-1c.C | 1 -
gcc/testsuite/gcc.target/i386/20040112-1.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-2.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-3.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-4.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-5.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-6.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-7.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-8a.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-copysign-8b.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-fabs-1.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-10.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-11a.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-11b.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-11c.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-12.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-13.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-14.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-15.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-1a.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-1b.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-1c.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-1d.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-2a.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-2b.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-2c.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-2d.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-3a.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-3b.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-3c.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-4a.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-4b.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-4c.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-5a.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-5b.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-5c.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-6.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-7.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-8.c | 1 -
gcc/testsuite/gcc.target/i386/builtin-memmove-9.c | 1 -
gcc/testsuite/gcc.target/i386/cf_check-11.c | 1 -
gcc/testsuite/gcc.target/i386/cf_check-7.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-pr120683-1.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-pr120683-2.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-pr120683-3.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-pr120683-4.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-pr120683-5.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-pr120683-6.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-pr120683-7.c | 1 -
gcc/testsuite/gcc.target/i386/memcpy-strategy-12.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-1.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-10.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-11.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-12.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-13.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-14.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-15.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-16.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-17.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-18.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-19.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-2.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-20.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-21.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-22.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-23.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-3.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-4.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-5.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-6.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-7.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-8.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr120683-9.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr70308-1a.c | 1 -
gcc/testsuite/gcc.target/i386/memset-pr70308-1b.c | 1 -
gcc/testsuite/gcc.target/i386/memset-strategy-10.c | 1 -
gcc/testsuite/gcc.target/i386/memset-strategy-13.c | 1 -
gcc/testsuite/gcc.target/i386/memset-strategy-25.c | 1 -
gcc/testsuite/gcc.target/i386/memset-strategy-28.c | 1 -
gcc/testsuite/gcc.target/i386/memset-strategy-29.c | 1 -
gcc/testsuite/gcc.target/i386/memset-strategy-30.c | 1 -
gcc/testsuite/gcc.target/i386/pr111673.c | 1 -
gcc/testsuite/gcc.target/i386/pr120936-1.c | 1 -
gcc/testsuite/gcc.target/i386/pr120936-11.c | 1 -
gcc/testsuite/gcc.target/i386/pr120936-2.c | 1 -
gcc/testsuite/gcc.target/i386/pr120936-4.c | 1 -
gcc/testsuite/gcc.target/i386/pr120936-5.c | 1 -
gcc/testsuite/gcc.target/i386/pr120936-9.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-1a.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-1b.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-2a.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-2b.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-3.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-4a.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-4b.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-5a.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-5b.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-6a.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-6b.c | 1 -
gcc/testsuite/gcc.target/i386/pr122343-7.c | 1 -
gcc/testsuite/gcc.target/i386/pr122675-1.c | 1 -
gcc/testsuite/gcc.target/i386/pr125100-4.c | 1 -
gcc/testsuite/gcc.target/i386/pr125355-2.c | 1 -
gcc/testsuite/gcc.target/i386/pr125355.c | 1 -
gcc/testsuite/gcc.target/i386/pr82142a.c | 1 -
gcc/testsuite/gcc.target/i386/pr82142b.c | 1 -
gcc/testsuite/gcc.target/i386/pr92080-17.c | 1 -
gcc/testsuite/lib/gcc-dg.exp | 3 +++
116 files changed, 3 insertions(+), 115 deletions(-)
diff --git a/gcc/testsuite/g++.target/i386/cf_check-3.C
b/gcc/testsuite/g++.target/i386/cf_check-3.C
index 56107dae76e..79d3a254fcc 100644
--- a/gcc/testsuite/g++.target/i386/cf_check-3.C
+++ b/gcc/testsuite/g++.target/i386/cf_check-3.C
@@ -1,6 +1,5 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-options "-O2 -fcf-protection" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/g++.target/i386/cf_check-4.C
b/gcc/testsuite/g++.target/i386/cf_check-4.C
index fc7eb733cd9..57c40a54860 100644
--- a/gcc/testsuite/g++.target/i386/cf_check-4.C
+++ b/gcc/testsuite/g++.target/i386/cf_check-4.C
@@ -1,7 +1,6 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-require-weak "" } */
/* { dg-options "-O2 -fcf-protection" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/g++.target/i386/memset-pr101366-1.C
b/gcc/testsuite/g++.target/i386/memset-pr101366-1.C
index 79767426a35..96d529b7c81 100644
--- a/gcc/testsuite/g++.target/i386/memset-pr101366-1.C
+++ b/gcc/testsuite/g++.target/i386/memset-pr101366-1.C
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O3 -march=x86-64-v2 -std=gnu++17" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/g++.target/i386/memset-pr101366-2.C
b/gcc/testsuite/g++.target/i386/memset-pr101366-2.C
index b087095a83e..b966d1f841d 100644
--- a/gcc/testsuite/g++.target/i386/memset-pr101366-2.C
+++ b/gcc/testsuite/g++.target/i386/memset-pr101366-2.C
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O3 -march=x86-64-v2 -std=gnu++17" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/g++.target/i386/memset-pr108585-1a.C
b/gcc/testsuite/g++.target/i386/memset-pr108585-1a.C
index f2abb025b8a..4f90c3a1b27 100644
--- a/gcc/testsuite/g++.target/i386/memset-pr108585-1a.C
+++ b/gcc/testsuite/g++.target/i386/memset-pr108585-1a.C
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O3 -march=x86-64 -std=c++20 -mno-stackrealign
-fomit-frame-pointer -DUSE_CHAR -fno-stack-protector -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/g++.target/i386/memset-pr108585-1b.C
b/gcc/testsuite/g++.target/i386/memset-pr108585-1b.C
index 24a72cddc65..a4f54ec925a 100644
--- a/gcc/testsuite/g++.target/i386/memset-pr108585-1b.C
+++ b/gcc/testsuite/g++.target/i386/memset-pr108585-1b.C
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O3 -march=x86-64 -std=c++20 -mno-stackrealign
-fomit-frame-pointer -fno-stack-protector -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/g++.target/i386/memset-pr118276-1a.C
b/gcc/testsuite/g++.target/i386/memset-pr118276-1a.C
index a51a1532d1d..1df6646957e 100644
--- a/gcc/testsuite/g++.target/i386/memset-pr118276-1a.C
+++ b/gcc/testsuite/g++.target/i386/memset-pr118276-1a.C
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O3 -march=x86-64 -std=c++17 -DMODE=0" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/g++.target/i386/memset-pr118276-1b.C
b/gcc/testsuite/g++.target/i386/memset-pr118276-1b.C
index 173e92aa504..9fd77df15fe 100644
--- a/gcc/testsuite/g++.target/i386/memset-pr118276-1b.C
+++ b/gcc/testsuite/g++.target/i386/memset-pr118276-1b.C
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O3 -march=x86-64 -std=c++17 -DMODE=1" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/g++.target/i386/memset-pr118276-1c.C
b/gcc/testsuite/g++.target/i386/memset-pr118276-1c.C
index c91c2964df7..624c785f49b 100644
--- a/gcc/testsuite/g++.target/i386/memset-pr118276-1c.C
+++ b/gcc/testsuite/g++.target/i386/memset-pr118276-1c.C
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O3 -march=x86-64 -std=c++17 -DMODE=2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/20040112-1.c
b/gcc/testsuite/gcc.target/i386/20040112-1.c
index c5ff83dc099..ab53292ac7e 100644
--- a/gcc/testsuite/gcc.target/i386/20040112-1.c
+++ b/gcc/testsuite/gcc.target/i386/20040112-1.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
/* { dg-additional-options "-mregparm=1" { target ia32 } } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-2.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-2.c
index e1c786bca56..d90c5a49a3a 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-2.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-2.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-3.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-3.c
index 3a30189eb52..d3b4dd5a4af 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-3.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-3.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-4.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-4.c
index f08fe35f69a..9886fdcc9ae 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-4.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-4.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-5.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-5.c
index 523faabb99a..3f4df5f779b 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-5.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-5.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-6.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-6.c
index 4c44055d7cf..5b6eb517f82 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-6.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-6.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-7.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-7.c
index a1f35f52bbb..012fb14a85e 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-7.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-7.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-8a.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-8a.c
index 5a0f7afe3cd..e390ee27aa3 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-8a.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-8a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-copysign-8b.c
b/gcc/testsuite/gcc.target/i386/builtin-copysign-8b.c
index 8b5619f4cff..dc9e46121de 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-copysign-8b.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-copysign-8b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx512f -mavx -mtune=generic" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-fabs-1.c
b/gcc/testsuite/gcc.target/i386/builtin-fabs-1.c
index ec0be877f77..a9a25f6bd4b 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-fabs-1.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-fabs-1.c
@@ -1,7 +1,6 @@
/* PR target/122323 */
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-10.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-10.c
index 76afef9d295..8bd65bbf67a 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-10.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-10.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-11a.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-11a.c
index bf5369cee8c..3f4e2cac1ce 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-11a.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-11a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-11b.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-11b.c
index f80881db196..031dd12658e 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-11b.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-11b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx512f -march=x86-64-v3 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-11c.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-11c.c
index 91b566c6d59..9c5e2c6f3e1 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-11c.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-11c.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4 -mmove-max=512 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-12.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-12.c
index 661f23e189c..1d1ec5285a5 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-12.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-12.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-13.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-13.c
index b4854a5f835..d25ebe74e11 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-13.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-13.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-14.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-14.c
index 651efa41294..009c61d8b14 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-14.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-14.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-15.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-15.c
index 339c07f9d70..98a29f660e1 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-15.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-15.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-1a.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-1a.c
index 6679c966a0e..34598753c0d 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-1a.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-1a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-1b.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-1b.c
index 356e9390eb5..25d008c5122 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-1b.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-1b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx512f -march=x86-64-v3 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-1c.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-1c.c
index b532b59f0f3..9eb9a39871d 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-1c.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-1c.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4 -mmove-max=512 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-1d.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-1d.c
index 8ccbb4e8752..ffa757584e0 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-1d.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-1d.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mgeneral-regs-only -march=x86-64 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-2a.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-2a.c
index b77cadfa063..fc8ce523ad1 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-2a.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-2a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-2b.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-2b.c
index 9076a0a9ff3..df8cd66b04c 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-2b.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-2b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx512f -march=x86-64-v3 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-2c.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-2c.c
index 946173a6f78..1ced866d305 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-2c.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-2c.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4 -mmove-max=512 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-2d.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-2d.c
index c7c0543b793..456a725534a 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-2d.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-2d.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mgeneral-regs-only -march=x86-64 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-3a.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-3a.c
index 23ab0fa9f98..cfa1ee12fff 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-3a.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-3a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-3b.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-3b.c
index d45adbcdf48..bb2206a249c 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-3b.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-3b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx512f -march=x86-64-v3 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-3c.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-3c.c
index 4b2f27fefa0..6888b618cb8 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-3c.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-3c.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4 -mmove-max=512 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-4a.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-4a.c
index 82c2367a1c3..766fdafdb7d 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-4a.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-4a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-4b.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-4b.c
index 4004f0d1845..e7db96d8682 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-4b.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-4b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx512f -march=x86-64-v3 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-4c.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-4c.c
index 1319fac0d50..e662518fac7 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-4c.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-4c.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4 -mmove-max=512 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-5a.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-5a.c
index bb53a471b51..c86defbabd5 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-5a.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-5a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-5b.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-5b.c
index cba000bd282..43551fa7f38 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-5b.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-5b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx512f -march=x86-64-v3 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-5c.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-5c.c
index 07f1e05e4f2..09798fd4d58 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-5c.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-5c.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4 -mmove-max=512 -mtune=generic
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-6.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-6.c
index 3911c7e77aa..6d159160135 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-6.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-6.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-7.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-7.c
index 6b4eca81ad9..4118b1328ff 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-7.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-7.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-8.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-8.c
index 70a09fbf688..aa57a109fbe 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-8.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-8.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/builtin-memmove-9.c
b/gcc/testsuite/gcc.target/i386/builtin-memmove-9.c
index 6832647b622..f84565ed96a 100644
--- a/gcc/testsuite/gcc.target/i386/builtin-memmove-9.c
+++ b/gcc/testsuite/gcc.target/i386/builtin-memmove-9.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-avx -msse2 -mtune=generic -minline-all-stringops" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { lp64 } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/cf_check-11.c
b/gcc/testsuite/gcc.target/i386/cf_check-11.c
index 2a85a5b4e70..9ed65ab0ad5 100644
--- a/gcc/testsuite/gcc.target/i386/cf_check-11.c
+++ b/gcc/testsuite/gcc.target/i386/cf_check-11.c
@@ -2,7 +2,6 @@
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-require-weak "" } */
/* { dg-options "-O2 -fcf-protection" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/cf_check-7.c
b/gcc/testsuite/gcc.target/i386/cf_check-7.c
index 548e16c2354..b9a3b395056 100644
--- a/gcc/testsuite/gcc.target/i386/cf_check-7.c
+++ b/gcc/testsuite/gcc.target/i386/cf_check-7.c
@@ -1,7 +1,6 @@
/* PR c/122427 */
/* { dg-do compile { target { "i?86-*-* x86_64-*-*" } } } */
/* { dg-options "-O2 -fcf-protection" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-1.c
b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-1.c
index 6d5ed4f805a..753238e35fc 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-1.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-sse
-mmemcpy-strategy=unrolled_loop:256:noalign,libcall:-1:noalign" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-2.c
b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-2.c
index 15f0e4b9e62..3112a841a65 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-2.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-2.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64
-mmemcpy-strategy=vector_loop:2048:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-3.c
b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-3.c
index 0f6c8f5afb7..d1bbce3ec5d 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-3.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-3.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64
-mmemcpy-strategy=vector_loop:2048:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-4.c
b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-4.c
index 963e966d771..d14f6d9bcc2 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-4.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-4.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64-v3
-mmemcpy-strategy=vector_loop:2048:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-5.c
b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-5.c
index cd24d6bd00b..03746e64ea4 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-5.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-5.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64-v3
-mmemcpy-strategy=vector_loop:2048:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-6.c
b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-6.c
index a2bf5cc8d95..c0dfd04855a 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-6.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-6.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64-v4
-mmemcpy-strategy=vector_loop:2048:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-7.c
b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-7.c
index b67166b42c5..7dc530b8bae 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-pr120683-7.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-pr120683-7.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64-v4
-mmemcpy-strategy=vector_loop:2048:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-12.c
b/gcc/testsuite/gcc.target/i386/memcpy-strategy-12.c
index b92f0f976ab..47160864ea7 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-12.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-12.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mtune=generic -mno-sse" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-1.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-1.c
index d8d3161cf25..90e544df7ab 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-1.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-1.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-10.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-10.c
index 040e2937aee..6d3d9e750e9 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-10.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-10.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-sse
-mmemset-strategy=unrolled_loop:256:noalign,libcall:-1:noalign" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-11.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-11.c
index df479c5ca2f..30b0cad04e6 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-11.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-11.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-sse
-mmemset-strategy=unrolled_loop:256:noalign,libcall:-1:noalign" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-12.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-12.c
index 9ea0951f5e7..15987a6451f 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-12.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-12.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mno-sse
-mmemset-strategy=unrolled_loop:256:noalign,libcall:-1:noalign" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-13.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-13.c
index 8663a78a92c..3b471dd80fa 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-13.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-13.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-14.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-14.c
index f3e8cd182e8..7ec9b3fe1bd 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-14.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-14.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-15.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-15.c
index 05c32b09b1f..e7544057994 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-15.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-15.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v3
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-16.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-16.c
index dc8f5246f72..c519bf36fb0 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-16.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-16.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-17.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-17.c
index 9657378e6a6..f97ad10751a 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-17.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-17.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-18.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-18.c
index dbead6ef585..e208abfc5c3 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-18.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-18.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-19.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-19.c
index f9777e57c54..2213b3c8c24 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-19.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-19.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-2.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-2.c
index fa5840baa3f..f7834c08097 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-2.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-2.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v3
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-20.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-20.c
index 0a79f6909df..273e84c358e 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-20.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-20.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-21.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-21.c
index c058a6572b0..3e473267fd6 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-21.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-21.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-22.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-22.c
index 475c1e2dd6f..542fd719063 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-22.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-22.c
@@ -1,7 +1,6 @@
/* { dg-do compile { target { ! ia32 } } } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=rep_8byte:8192:align,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-23.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-23.c
index 113ddd3c39d..33d414bd65d 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-23.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-23.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64 -minline-all-stringops
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign -fno-pie" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-3.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-3.c
index 781e6d56b05..621baf7b9fe 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-3.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-3.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-4.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-4.c
index 2569db46b4d..712404be416 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-4.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-4.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-5.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-5.c
index e2114b4f492..f597395b38b 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-5.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-5.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v3
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-6.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-6.c
index 33cea66bfc1..7ba1b742076 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-6.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-6.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-7.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-7.c
index 04043dfc4c7..62f61c54ed0 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-7.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-7.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-8.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-8.c
index 1e5e1024abf..d12ab157494 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-8.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-8.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v3
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr120683-9.c
b/gcc/testsuite/gcc.target/i386/memset-pr120683-9.c
index c6f0b776d08..1a0abe6614f 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr120683-9.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr120683-9.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v4
-mmemset-strategy=vector_loop:256:noalign,libcall:-1:noalign
-minline-all-stringops" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr70308-1a.c
b/gcc/testsuite/gcc.target/i386/memset-pr70308-1a.c
index 06a2665f4d4..4b50c3d081b 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr70308-1a.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr70308-1a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64 -fno-stack-protector" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-pr70308-1b.c
b/gcc/testsuite/gcc.target/i386/memset-pr70308-1b.c
index b951f6fe7a0..82d83e9b873 100644
--- a/gcc/testsuite/gcc.target/i386/memset-pr70308-1b.c
+++ b/gcc/testsuite/gcc.target/i386/memset-pr70308-1b.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-skip-if "64b Darwin does not support non-PIC" *-*-darwin* } */
/* { dg-options "-O2 -march=x86-64 -fomit-frame-pointer -DUSE_SCANF
-fno-stack-protector" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-strategy-10.c
b/gcc/testsuite/gcc.target/i386/memset-strategy-10.c
index 4a698752492..d6f2f4ed7ff 100644
--- a/gcc/testsuite/gcc.target/i386/memset-strategy-10.c
+++ b/gcc/testsuite/gcc.target/i386/memset-strategy-10.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-Os -march=x86-64 -mstringop-strategy=vector_loop" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/memset-strategy-13.c
b/gcc/testsuite/gcc.target/i386/memset-strategy-13.c
index 925874cdf9d..cc2129f60eb 100644
--- a/gcc/testsuite/gcc.target/i386/memset-strategy-13.c
+++ b/gcc/testsuite/gcc.target/i386/memset-strategy-13.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-Os -mno-sse -mstringop-strategy=unrolled_loop" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/gcc.target/i386/memset-strategy-25.c
b/gcc/testsuite/gcc.target/i386/memset-strategy-25.c
index 4e2c2df41c4..412d69327a1 100644
--- a/gcc/testsuite/gcc.target/i386/memset-strategy-25.c
+++ b/gcc/testsuite/gcc.target/i386/memset-strategy-25.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mtune=generic -mno-sse" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-strategy-28.c
b/gcc/testsuite/gcc.target/i386/memset-strategy-28.c
index 5621d32f042..1d173edf930 100644
--- a/gcc/testsuite/gcc.target/i386/memset-strategy-28.c
+++ b/gcc/testsuite/gcc.target/i386/memset-strategy-28.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mtune=generic -mno-sse" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-strategy-29.c
b/gcc/testsuite/gcc.target/i386/memset-strategy-29.c
index e8934f131d1..4c84d42438f 100644
--- a/gcc/testsuite/gcc.target/i386/memset-strategy-29.c
+++ b/gcc/testsuite/gcc.target/i386/memset-strategy-29.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mtune=generic -mno-sse" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/memset-strategy-30.c
b/gcc/testsuite/gcc.target/i386/memset-strategy-30.c
index 3a0e14a52b3..1648a87aea0 100644
--- a/gcc/testsuite/gcc.target/i386/memset-strategy-30.c
+++ b/gcc/testsuite/gcc.target/i386/memset-strategy-30.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mtune=generic -mno-sse" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr111673.c
b/gcc/testsuite/gcc.target/i386/pr111673.c
index 6b30d46ee07..b9ceacf7651 100644
--- a/gcc/testsuite/gcc.target/i386/pr111673.c
+++ b/gcc/testsuite/gcc.target/i386/pr111673.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { ! ia32 } } } */
/* { dg-options "-O2 -fdump-rtl-pro_and_epilogue" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/pr120936-1.c
b/gcc/testsuite/gcc.target/i386/pr120936-1.c
index 342487fcaf2..240ffad55c8 100644
--- a/gcc/testsuite/gcc.target/i386/pr120936-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr120936-1.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { *-*-linux* && fpic } } } */
/* { dg-options "-O2 -pg -mno-fentry -fno-pic -fno-shrink-wrap" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/pr120936-11.c
b/gcc/testsuite/gcc.target/i386/pr120936-11.c
index 90995f89bb3..2fd02be2da7 100644
--- a/gcc/testsuite/gcc.target/i386/pr120936-11.c
+++ b/gcc/testsuite/gcc.target/i386/pr120936-11.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { { *-*-linux* && lp64 } && fpic } } } */
/* { dg-options "-O2 -mrecord-mcount -mcmodel=large -pg -mno-fentry -fno-pic
-fno-shrink-wrap" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" }
{^(1|\t?\.)} } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr120936-2.c
b/gcc/testsuite/gcc.target/i386/pr120936-2.c
index 615cc05fbfc..92ffdb6491c 100644
--- a/gcc/testsuite/gcc.target/i386/pr120936-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr120936-2.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { *-*-linux* && fpic } } } */
/* { dg-options "-O2 -pg -mno-fentry -fpic -fno-shrink-wrap" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/pr120936-4.c
b/gcc/testsuite/gcc.target/i386/pr120936-4.c
index 8580ec4444d..76f8c4bd0ed 100644
--- a/gcc/testsuite/gcc.target/i386/pr120936-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr120936-4.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { *-*-linux* && fpic } } } */
/* { dg-options "-O2 -pg -mno-fentry -mrecord-mcount -fno-pic
-fno-shrink-wrap" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" }
{^(1|\t?\.)} } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr120936-5.c
b/gcc/testsuite/gcc.target/i386/pr120936-5.c
index 697e8d1801b..7d0c0b6a9ce 100644
--- a/gcc/testsuite/gcc.target/i386/pr120936-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr120936-5.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { *-*-linux* && fpic } } } */
/* { dg-options "-O2 -pg -mrecord-mcount -mno-fentry -fpic -fno-shrink-wrap" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" }
{^(1|\t?\.)} } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr120936-9.c
b/gcc/testsuite/gcc.target/i386/pr120936-9.c
index 6a9f4c14b6a..634c0b51d2b 100644
--- a/gcc/testsuite/gcc.target/i386/pr120936-9.c
+++ b/gcc/testsuite/gcc.target/i386/pr120936-9.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { { *-*-linux* && lp64 } && fpic } } } */
/* { dg-options "-O2 -mcmodel=large -pg -mno-fentry -fno-pic -fno-shrink-wrap"
} */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-1a.c
b/gcc/testsuite/gcc.target/i386/pr122343-1a.c
index 75dc2155ff4..7076d881174 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-1a.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-1a.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
/* { dg-additional-options "-mregparm=1" { target ia32 } } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-1b.c
b/gcc/testsuite/gcc.target/i386/pr122343-1b.c
index 56fbd2c7373..989d3b23a78 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-1b.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-1b.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer -fno-fuse-ops-with-volatile-access"
} */
/* { dg-additional-options "-mregparm=1" { target ia32 } } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-2a.c
b/gcc/testsuite/gcc.target/i386/pr122343-2a.c
index ed429d73557..f7ee02149ce 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-2a.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-2a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-2b.c
b/gcc/testsuite/gcc.target/i386/pr122343-2b.c
index 34014a11d18..d4a1151a586 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-2b.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-2b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer -fno-fuse-ops-with-volatile-access"
} */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-3.c
b/gcc/testsuite/gcc.target/i386/pr122343-3.c
index 7522159076d..335f777d2a9 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-3.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-4a.c
b/gcc/testsuite/gcc.target/i386/pr122343-4a.c
index 6c871627bcd..3ae07a27cf1 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-4a.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-4a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-4b.c
b/gcc/testsuite/gcc.target/i386/pr122343-4b.c
index 4f020371e06..31a990eb363 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-4b.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-4b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer -fno-fuse-ops-with-volatile-access"
} */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-5a.c
b/gcc/testsuite/gcc.target/i386/pr122343-5a.c
index 01ce2007c13..3d133b67157 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-5a.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-5a.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
/* { dg-additional-options "-mregparm=1" { target ia32 } } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-5b.c
b/gcc/testsuite/gcc.target/i386/pr122343-5b.c
index ecfbe3f1df2..5f64496d6f4 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-5b.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-5b.c
@@ -1,7 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer -fno-fuse-ops-with-volatile-access"
} */
/* { dg-additional-options "-mregparm=1" { target ia32 } } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-6a.c
b/gcc/testsuite/gcc.target/i386/pr122343-6a.c
index 843d053d77e..940182644c7 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-6a.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-6a.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { *-*-* } } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-6b.c
b/gcc/testsuite/gcc.target/i386/pr122343-6b.c
index dbc79fd8517..f741f5ca98c 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-6b.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-6b.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer -fno-fuse-ops-with-volatile-access"
} */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122343-7.c
b/gcc/testsuite/gcc.target/i386/pr122343-7.c
index 15c291801bb..0e4edd1e5e7 100644
--- a/gcc/testsuite/gcc.target/i386/pr122343-7.c
+++ b/gcc/testsuite/gcc.target/i386/pr122343-7.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fomit-frame-pointer" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target *-*-* } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr122675-1.c
b/gcc/testsuite/gcc.target/i386/pr122675-1.c
index 0da288a6584..9239a320855 100644
--- a/gcc/testsuite/gcc.target/i386/pr122675-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr122675-1.c
@@ -1,7 +1,6 @@
/* Verify that the most likely BB edges are optimized as fallthroughs. */
/* { dg-do compile } */
/* { dg-options "-O1 -fno-pic -march=x86-64 -mtune=generic -mgeneral-regs-only
-fomit-frame-pointer" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } {^\t?\.} } }
*/
diff --git a/gcc/testsuite/gcc.target/i386/pr125100-4.c
b/gcc/testsuite/gcc.target/i386/pr125100-4.c
index a36f24b8323..38c2fe46fff 100644
--- a/gcc/testsuite/gcc.target/i386/pr125100-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr125100-4.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { { ! ia32 } && fpic } } } */
/* { dg-options "-O2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/pr125355-2.c
b/gcc/testsuite/gcc.target/i386/pr125355-2.c
index b198c7debc8..2c0c396d896 100644
--- a/gcc/testsuite/gcc.target/i386/pr125355-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr125355-2.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mtune=generic" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/pr125355.c
b/gcc/testsuite/gcc.target/i386/pr125355.c
index 4290cfc56f9..8e56b5f5507 100644
--- a/gcc/testsuite/gcc.target/i386/pr125355.c
+++ b/gcc/testsuite/gcc.target/i386/pr125355.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-Os -mtune=generic" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.} }
} */
diff --git a/gcc/testsuite/gcc.target/i386/pr82142a.c
b/gcc/testsuite/gcc.target/i386/pr82142a.c
index d0d6e522b03..a40c038452c 100644
--- a/gcc/testsuite/gcc.target/i386/pr82142a.c
+++ b/gcc/testsuite/gcc.target/i386/pr82142a.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { ! ia32 } } } */
/* { dg-options "-O2 -mno-avx -msse2" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/pr82142b.c
b/gcc/testsuite/gcc.target/i386/pr82142b.c
index a54f0f2ff80..c9e9209aea8 100644
--- a/gcc/testsuite/gcc.target/i386/pr82142b.c
+++ b/gcc/testsuite/gcc.target/i386/pr82142b.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target ia32 } } */
/* { dg-options "-O2 -mno-avx -msse2 -mno-stackrealign -fomit-frame-pointer" }
*/
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target "*-*-*" } {^\t?\.}
} } */
diff --git a/gcc/testsuite/gcc.target/i386/pr92080-17.c
b/gcc/testsuite/gcc.target/i386/pr92080-17.c
index 5b2594bc179..f3d6b691754 100644
--- a/gcc/testsuite/gcc.target/i386/pr92080-17.c
+++ b/gcc/testsuite/gcc.target/i386/pr92080-17.c
@@ -1,6 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -march=x86-64-v3" } */
-/* { dg-add-options check_function_bodies } */
/* Keep labels and directives ('.cfi_startproc', '.cfi_endproc'). */
/* { dg-final { check-function-bodies "**" "" "" { target { ! ia32 } }
{^\t?\.} } } */
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index f2e5228fff5..9f183259257 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -122,6 +122,9 @@ proc dg-final { args } {
gdb-test {
set code [linsert $code 1 $line]
}
+ check-function-bodies {
+ uplevel 1 [list dg-add-options $line check_function_bodies]
+ }
}
append final-code "$code\n"
}
--
2.54.0