https://gcc.gnu.org/g:4280cb5cb3847155350c62616bdc63d649903a65

commit r17-1407-g4280cb5cb3847155350c62616bdc63d649903a65
Author: Richard Sandiford <[email protected]>
Date:   Sun Jun 7 10:03:09 2026 +0100

    testsuite: Automatically add check_function_bodies options
    
    It's easy to forget that i386 check-function-bodies tests require:
    
      { dg-add-options check_function_bodies }
    
    This patch makes:
    
      { dg-final { check-function-bodies ... } }
    
    add the options automatically.
    
    This means that the dg-final must come after the final dg-options (like
    the dg-add-options must).  That already seemed to be the case for every
    test in the patch.
    
    gcc/
            * doc/sourcebuild.texi: Document that check-function-bodies
            automatically adds the check_function_bodies options.
    
    gcc/testsuite/
            * lib/gcc-dg.exp (dg-final): Add check_function_bodies options
            for check-function-bodies directives.
            * g++.target/i386/cf_check-3.C: Remove explicit
            { dg-add-options check_function_bodies }.
            * g++.target/i386/cf_check-4.C: Likewise.
            * g++.target/i386/memset-pr101366-1.C: Likewise.
            * g++.target/i386/memset-pr101366-2.C: Likewise.
            * g++.target/i386/memset-pr108585-1a.C: Likewise.
            * g++.target/i386/memset-pr108585-1b.C: Likewise.
            * g++.target/i386/memset-pr118276-1a.C: Likewise.
            * g++.target/i386/memset-pr118276-1b.C: Likewise.
            * g++.target/i386/memset-pr118276-1c.C: Likewise.
            * gcc.target/i386/20040112-1.c: Likewise.
            * gcc.target/i386/builtin-copysign-2.c: Likewise.
            * gcc.target/i386/builtin-copysign-3.c: Likewise.
            * gcc.target/i386/builtin-copysign-4.c: Likewise.
            * gcc.target/i386/builtin-copysign-5.c: Likewise.
            * gcc.target/i386/builtin-copysign-6.c: Likewise.
            * gcc.target/i386/builtin-copysign-7.c: Likewise.
            * gcc.target/i386/builtin-copysign-8a.c: Likewise.
            * gcc.target/i386/builtin-copysign-8b.c: Likewise.
            * gcc.target/i386/builtin-fabs-1.c: Likewise.
            * gcc.target/i386/builtin-memmove-10.c: Likewise.
            * gcc.target/i386/builtin-memmove-11a.c: Likewise.
            * gcc.target/i386/builtin-memmove-11b.c: Likewise.
            * gcc.target/i386/builtin-memmove-11c.c: Likewise.
            * gcc.target/i386/builtin-memmove-12.c: Likewise.
            * gcc.target/i386/builtin-memmove-13.c: Likewise.
            * gcc.target/i386/builtin-memmove-14.c: Likewise.
            * gcc.target/i386/builtin-memmove-15.c: Likewise.
            * gcc.target/i386/builtin-memmove-1a.c: Likewise.
            * gcc.target/i386/builtin-memmove-1b.c: Likewise.
            * gcc.target/i386/builtin-memmove-1c.c: Likewise.
            * gcc.target/i386/builtin-memmove-1d.c: Likewise.
            * gcc.target/i386/builtin-memmove-2a.c: Likewise.
            * gcc.target/i386/builtin-memmove-2b.c: Likewise.
            * gcc.target/i386/builtin-memmove-2c.c: Likewise.
            * gcc.target/i386/builtin-memmove-2d.c: Likewise.
            * gcc.target/i386/builtin-memmove-3a.c: Likewise.
            * gcc.target/i386/builtin-memmove-3b.c: Likewise.
            * gcc.target/i386/builtin-memmove-3c.c: Likewise.
            * gcc.target/i386/builtin-memmove-4a.c: Likewise.
            * gcc.target/i386/builtin-memmove-4b.c: Likewise.
            * gcc.target/i386/builtin-memmove-4c.c: Likewise.
            * gcc.target/i386/builtin-memmove-5a.c: Likewise.
            * gcc.target/i386/builtin-memmove-5b.c: Likewise.
            * gcc.target/i386/builtin-memmove-5c.c: Likewise.
            * gcc.target/i386/builtin-memmove-6.c: Likewise.
            * gcc.target/i386/builtin-memmove-7.c: Likewise.
            * gcc.target/i386/builtin-memmove-8.c: Likewise.
            * gcc.target/i386/builtin-memmove-9.c: Likewise.
            * gcc.target/i386/cf_check-11.c: Likewise.
            * gcc.target/i386/cf_check-7.c: Likewise.
            * gcc.target/i386/memcpy-pr120683-1.c: Likewise.
            * gcc.target/i386/memcpy-pr120683-2.c: Likewise.
            * gcc.target/i386/memcpy-pr120683-3.c: Likewise.
            * gcc.target/i386/memcpy-pr120683-4.c: Likewise.
            * gcc.target/i386/memcpy-pr120683-5.c: Likewise.
            * gcc.target/i386/memcpy-pr120683-6.c: Likewise.
            * gcc.target/i386/memcpy-pr120683-7.c: Likewise.
            * gcc.target/i386/memcpy-strategy-12.c: Likewise.
            * gcc.target/i386/memset-pr120683-1.c: Likewise.
            * gcc.target/i386/memset-pr120683-10.c: Likewise.
            * gcc.target/i386/memset-pr120683-11.c: Likewise.
            * gcc.target/i386/memset-pr120683-12.c: Likewise.
            * gcc.target/i386/memset-pr120683-13.c: Likewise.
            * gcc.target/i386/memset-pr120683-14.c: Likewise.
            * gcc.target/i386/memset-pr120683-15.c: Likewise.
            * gcc.target/i386/memset-pr120683-16.c: Likewise.
            * gcc.target/i386/memset-pr120683-17.c: Likewise.
            * gcc.target/i386/memset-pr120683-18.c: Likewise.
            * gcc.target/i386/memset-pr120683-19.c: Likewise.
            * gcc.target/i386/memset-pr120683-2.c: Likewise.
            * gcc.target/i386/memset-pr120683-20.c: Likewise.
            * gcc.target/i386/memset-pr120683-21.c: Likewise.
            * gcc.target/i386/memset-pr120683-22.c: Likewise.
            * gcc.target/i386/memset-pr120683-23.c: Likewise.
            * gcc.target/i386/memset-pr120683-3.c: Likewise.
            * gcc.target/i386/memset-pr120683-4.c: Likewise.
            * gcc.target/i386/memset-pr120683-5.c: Likewise.
            * gcc.target/i386/memset-pr120683-6.c: Likewise.
            * gcc.target/i386/memset-pr120683-7.c: Likewise.
            * gcc.target/i386/memset-pr120683-8.c: Likewise.
            * gcc.target/i386/memset-pr120683-9.c: Likewise.
            * gcc.target/i386/memset-pr70308-1a.c: Likewise.
            * gcc.target/i386/memset-pr70308-1b.c: Likewise.
            * gcc.target/i386/memset-strategy-10.c: Likewise.
            * gcc.target/i386/memset-strategy-13.c: Likewise.
            * gcc.target/i386/memset-strategy-25.c: Likewise.
            * gcc.target/i386/memset-strategy-28.c: Likewise.
            * gcc.target/i386/memset-strategy-29.c: Likewise.
            * gcc.target/i386/memset-strategy-30.c: Likewise.
            * gcc.target/i386/pr111673.c: Likewise.
            * gcc.target/i386/pr120936-1.c: Likewise.
            * gcc.target/i386/pr120936-11.c: Likewise.
            * gcc.target/i386/pr120936-2.c: Likewise.
            * gcc.target/i386/pr120936-4.c: Likewise.
            * gcc.target/i386/pr120936-5.c: Likewise.
            * gcc.target/i386/pr120936-9.c: Likewise.
            * gcc.target/i386/pr122343-1a.c: Likewise.
            * gcc.target/i386/pr122343-1b.c: Likewise.
            * gcc.target/i386/pr122343-2a.c: Likewise.
            * gcc.target/i386/pr122343-2b.c: Likewise.
            * gcc.target/i386/pr122343-3.c: Likewise.
            * gcc.target/i386/pr122343-4a.c: Likewise.
            * gcc.target/i386/pr122343-4b.c: Likewise.
            * gcc.target/i386/pr122343-5a.c: Likewise.
            * gcc.target/i386/pr122343-5b.c: Likewise.
            * gcc.target/i386/pr122343-6a.c: Likewise.
            * gcc.target/i386/pr122343-6b.c: Likewise.
            * gcc.target/i386/pr122343-7.c: Likewise.
            * gcc.target/i386/pr122675-1.c: Likewise.
            * gcc.target/i386/pr125100-4.c: Likewise.
            * gcc.target/i386/pr125355-2.c: Likewise.
            * gcc.target/i386/pr125355.c: Likewise.
            * gcc.target/i386/pr82142a.c: Likewise.
            * gcc.target/i386/pr82142b.c: Likewise.
            * gcc.target/i386/pr92080-17.c: Likewise.

Diff:
---
 gcc/doc/sourcebuild.texi                            | 15 +++++++++++++++
 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 +++
 117 files changed, 18 insertions(+), 115 deletions(-)

diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index c12771acd2bc..1143271424b2 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -3389,6 +3389,12 @@ locally when using pic/PIC passes in the testsuite.
 Add the target-specific flags needed to use
 @code{check-function-bodies} from @code{dg-final}.
 
+These options are also added automatically by:
+
+@smallexample
+/* @{ dg-final @{ check-function-bodies @dots{} @} @dots{} @} */
+@end smallexample
+
 @item float@var{n}
 Add the target-specific flags needed to use the @code{_Float@var{n}} type.
 
@@ -3730,6 +3736,15 @@ A line containing just:
 stands for zero or more unmatched lines; the whitespace after
 @var{prefix} is again not significant.
 
+@code{check-function-bodies} automatically adds the same options as:
+
+@smallexample
+/* @{ dg-add-options check_function_bodies @} */
+@end smallexample
+
+For this reason, @code{check-function-bodies} must come after the final
+@code{dg-options} directive.
+
 @end table
 
 @subsubsection Scan object metadata with readelf
diff --git a/gcc/testsuite/g++.target/i386/cf_check-3.C 
b/gcc/testsuite/g++.target/i386/cf_check-3.C
index 56107dae76ea..79d3a254fcc5 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 fc7eb733cd96..57c40a548606 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 79767426a350..96d529b7c819 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 b087095a83e4..b966d1f841dd 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 f2abb025b8a2..4f90c3a1b279 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 24a72cddc65d..a4f54ec925a9 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 a51a1532d1d6..1df6646957e6 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 173e92aa5046..9fd77df15fe3 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 c91c2964df7f..624c785f49b6 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 c5ff83dc099e..ab53292ac7e8 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 e1c786bca568..d90c5a49a3a7 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 3a30189eb526..d3b4dd5a4af0 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 f08fe35f69a3..9886fdcc9aee 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 523faabb99ab..3f4df5f779b0 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 4c44055d7cf6..5b6eb517f823 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 a1f35f52bbb4..012fb14a85e3 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 5a0f7afe3cdf..e390ee27aa3c 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 8b5619f4cff4..dc9e46121de0 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 ec0be877f77c..a9a25f6bd4be 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 76afef9d2954..8bd65bbf67ab 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 bf5369cee8c8..3f4e2cac1cee 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 f80881db196b..031dd12658ed 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 91b566c6d59a..9c5e2c6f3e1a 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 661f23e189ce..1d1ec5285a5b 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 b4854a5f835f..d25ebe74e116 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 651efa412946..009c61d8b140 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 339c07f9d701..98a29f660e12 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 6679c966a0e9..34598753c0dc 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 356e9390eb5f..25d008c51228 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 b532b59f0f3e..9eb9a39871db 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 8ccbb4e8752e..ffa757584e08 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 b77cadfa063e..fc8ce523ad15 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 9076a0a9ff3d..df8cd66b04ca 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 946173a6f789..1ced866d3050 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 c7c0543b793c..456a725534a4 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 23ab0fa9f982..cfa1ee12fff3 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 d45adbcdf481..bb2206a249c0 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 4b2f27fefa08..6888b618cb8b 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 82c2367a1c3d..766fdafdb7d9 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 4004f0d18456..e7db96d86821 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 1319fac0d50f..e662518fac70 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 bb53a471b51f..c86defbabd5a 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 cba000bd282a..43551fa7f385 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 07f1e05e4f27..09798fd4d584 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 3911c7e77aa3..6d159160135a 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 6b4eca81ad9b..4118b1328ff6 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 70a09fbf6882..aa57a109fbeb 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 6832647b6221..f84565ed96a6 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 2a85a5b4e705..9ed65ab0ad5d 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 548e16c2354c..b9a3b3950562 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 6d5ed4f805a3..753238e35fce 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 15f0e4b9e626..3112a841a655 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 0f6c8f5afb72..d1bbce3ec5de 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 963e966d7718..d14f6d9bcc2a 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 cd24d6bd00bd..03746e64ea41 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 a2bf5cc8d95b..c0dfd04855a5 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 b67166b42c5d..7dc530b8bae0 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 b92f0f976abb..47160864ea76 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 d8d3161cf251..90e544df7abf 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 040e2937aee6..6d3d9e750e92 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 df479c5ca2f9..30b0cad04e61 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 9ea0951f5e75..15987a6451f8 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 8663a78a92ce..3b471dd80fad 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 f3e8cd182e89..7ec9b3fe1bd0 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 05c32b09b1f0..e75440579948 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 dc8f5246f728..c519bf36fb0b 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 9657378e6a6f..f97ad10751a8 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 dbead6ef5859..e208abfc5c37 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 f9777e57c54f..2213b3c8c243 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 fa5840baa3f2..f7834c080974 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 0a79f6909df7..273e84c358e9 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 c058a6572b01..3e473267fd66 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 475c1e2dd6fd..542fd7190630 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 113ddd3c39df..33d414bd65da 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 781e6d56b059..621baf7b9fea 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 2569db46b4de..712404be416a 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 e2114b4f4928..f597395b38b2 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 33cea66bfc18..7ba1b7420760 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 04043dfc4c78..62f61c54ed06 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 1e5e1024abf1..d12ab157494b 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 c6f0b776d088..1a0abe6614f8 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 06a2665f4d40..4b50c3d081b7 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 b951f6fe7a05..82d83e9b8733 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 4a6987524924..d6f2f4ed7ff2 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 925874cdf9d4..cc2129f60eb4 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 4e2c2df41c4b..412d69327a1f 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 5621d32f0427..1d173edf9306 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 e8934f131d1c..4c84d42438fc 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 3a0e14a52b3b..1648a87aea01 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 6b30d46ee076..b9ceacf76512 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 342487fcaf21..240ffad55c81 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 90995f89bb35..2fd02be2da73 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 615cc05fbfca..92ffdb6491c6 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 8580ec4444dd..76f8c4bd0ed4 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 697e8d1801b2..7d0c0b6a9cee 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 6a9f4c14b6a9..634c0b51d2bb 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 75dc2155ff45..7076d8811747 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 56fbd2c7373b..989d3b23a78f 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 ed429d73557c..f7ee02149ce6 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 34014a11d18e..d4a1151a5862 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 7522159076da..335f777d2a9a 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 6c871627bcd6..3ae07a27cf1c 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 4f020371e062..31a990eb3630 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 01ce2007c13d..3d133b671577 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 ecfbe3f1df20..5f64496d6f45 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 843d053d77ed..940182644c7e 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 dbc79fd8517c..f741f5ca98c7 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 15c291801bb7..0e4edd1e5e71 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 0da288a6584f..9239a3208556 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 a36f24b8323c..38c2fe46fff0 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 b198c7debc81..2c0c396d8967 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 4290cfc56f9b..8e56b5f5507b 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 d0d6e522b033..a40c038452cf 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 a54f0f2ff808..c9e9209aea84 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 5b2594bc179b..f3d6b6917546 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 f2e5228fff58..9f1832592574 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"
 }

Reply via email to