Convert execute.exp to use the dg framework.

	* gcc.c-torture/execute/execute.exp: Replace with slightly adapted
	copy of compile/compile.exp.
	* gcc.c-torture/execute/20010122-1.c: Skip if -fomit-frame-pointer.
	* gcc.c-torture/execute/20010129-1.c: Add -mtune=i686 if compiling for
	i?86-*.
	* gcc.c-torture/execute/20020404-1.c: Require int32plus.  Skip if
	m32c-*-*.
	* gcc.c-torture/execute/20021024-1.c: Require int32plus.
	* gcc.c-torture/execute/20021127-1.c: Add -std=c99 option.
	* gcc.c-torture/execute/20030125-1.c: Require c99_runtime.
	* gcc.c-torture/execute/20030216-1.c: Skip if -O1.
	* gcc.c-torture/execute/20030222-1.c: Skip on spu-*-*.
	* gcc.c-torture/execute/20040629-1.c: Require int32plus.
	* gcc.c-torture/execute/20040703-1.c: Likewise.
	* gcc.c-torture/execute/20040705-1.c: Likewise.
	* gcc.c-torture/execute/20040705-2.c: Likewise.
	* gcc.c-torture/execute/20040709-1.c: Likewise.
	* gcc.c-torture/execute/20040709-2.c: Likewise.
	* gcc.c-torture/execute/20040811-1.c: Likewise.
	* gcc.c-torture/execute/20050316-1.c: Likewise.  Add -Wno-psabi.
	* gcc.c-torture/execute/20050316-2.c: Use -mno-mmx -Wno-psabi when
	compiling for x86_64-* or i?86-*.
	* gcc.c-torture/execute/20050604-1.c: Likewise.
	* gcc.c-torture/execute/20050316-3.c: Add -Wno-psabi option.
	* gcc.c-torture/execute/20050604-1.c: Use -mno-mmx when	compiling
	for x86_64-* or i?86-*.
	* gcc.c-torture/execute/20061101-1.c: Require int32plus.
	* gcc.c-torture/execute/20061220-1.c: Skip on rl78-*.
	* gcc.c-torture/execute/20081117-1.c: Require int32plus.
	* gcc.c-torture/execute/20101011-1.c: Add -fnon-call-exceptions
	option.
	* gcc.c-torture/execute/20111227-2.c: Moved to...
	* gcc.dg/20111227-2.c: ... here.  Add -free option.
	* gcc.c-torture/execute/20111227-3.c: Likewise move to...
	* gcc.dg/20111227-3.c: ... here.  Add -free option.
	* gcc.c-torture/execute/20120919-1.c: Require int32plus.
	* gcc.c-torture/execute/920612-1.c: Add -fwrapv option.  Add
	declarations for abort and exit.
	* gcc.c-torture/execute/920711-1.c: Likewise.
	* gcc.c-torture/execute/930529-1.c: Likewise.
	* gcc.c-torture/execute/980709-1.c: Xfail if on AIX with -msoft-float.
	* gcc.c-torture/execute/981130-1.c: Xfail on m32r-* with scheduling.
	* gcc.c-torture/execute/990127-1.c: Add delcarations for abort and
	exit.
	* gcc.c-torture/execute/990127-2.c: Add -mpc64 option if compiling
	for i?86-* or x86_64-*.  Add declarations for abort and exit.
	* gcc.c-torture/execute/990413-2.c: Skip if not compiling for
	i?86-* or x86_64-*.
	* gcc.c-torture/execute/990826-0.c: Xfail if on AIX with -msoft-float.
	* gcc.c-torture/execute/bf64-1.c: Xfail on mcore-*.
	* gcc.c-torture/execute/bitfld-4.c: Require int32plus.
	* gcc.c-torture/execute/cmpsi-2.c: Likewise.
	* gcc.c-torture/execute/eeprof-1.c: Add -finstrument-functions option.
	Xfail on powerpc-ibm-aix*.  Add declaration for abort.
	* gcc.c-torture/execute/ipa-sra-2.c: Require int32plus.
	* gcc.c-torture/execute/loop-2f.c: Require mmap.  Skip if on
	m68k-linux.
	* gcc.c-torture/execute/loop-2g.c: Likewise.
	* gcc.c-torture/execute/mode-dependent-address.c: Require stdint_types.
	* gcc.c-torture/execute/nest-align-1.c: Add -mno-eabi option for
	powerpc-*-eabi*.
	* gcc.c-torture/execute/pr19689.c: Require int32plus.
	* gcc.c-torture/execute/pr22493-1.c: Add -fwrapv option.
	* gcc.c-torture/execute/pr23047.c: Likewise.
	* gcc.c-torture/execute/pr23135.c: Add -Wno-psabi option.  Add
	declarations for abort and exit.
	* gcc.c-torture/execute/pr29797-1.c: Require int32plus.
	* gcc.c-torture/execute/pr31448.c: Likewise.
	* gcc.c-torture/execute/pr35456.c: Skip on vax.
	* gcc.c-torture/execute/pr37573.c: Require int32plus.
	* gcc.c-torture/execute/pr38151.c: Add -Wno-psabi option.
	* gcc.c-torture/execute/pr39228.c: Add -mieee for sh* and alpha*.
	Skip on spu-*.
	* gcc.c-torture/execute/pr39501.c: Add -ffast-math option.  Add
	declarations for abort and exit.
	* gcc.c-torture/execute/pr40386.c: Add declarations for abort and exit.
	* gcc.c-torture/execute/pr43220.c: Require int32plus.
	* gcc.c-torture/execute/pr44583.c: Add -mieee option for sh*.
	* gcc.c-torture/execute/pr45262.c: Require int32plus.
	* gcc.c-torture/execute/pr47237.c: Xfail on nios2-*.
	* gcc.c-torture/execute/pr51581-1.c: Require int32plus.
	* gcc.c-torture/execute/pr51582-2.c: Likewise.
	* gcc.c-torture/execute/pr52979-1.c: Likewise.
	* gcc.c-torture/execute/pr52979-2.c: Likewise.
	* gcc.c-torture/execute/pr56799.c: Likewise.
	* gcc.c-torture/execute/pr57124.c: Likewise.  Add -fno-strict-overflow
	option.  Add declarations for abort and exit.
	* gcc.c-torture/execute/pr57344-2.c: Require int32plus.
	* gcc.c-torture/execute/pr58570.c: Likewise.
	* gcc.c-torture/execute/pr60822.c: Likewise.
	* gcc.c-torture/execute/pr7284-1.c: Likewise.
	* gcc.c-torture/execute/shiftdi.c: Likewise.
	* gcc.c-torture/execute/simd-4.c: Require stdint_types.
	* gcc.c-torture/execute/strncmp-1.c: Xfail if vxworks_kernel.
	* gcc.c-torture/execute/usmul.c: Require int32plus.
	* gcc.c-torture/execute/vrp-5.c: Likewise.
	* gcc.c-torture/execute/vrp-6.c: Likewise.
	* gcc.c-torture/execute/zerolen-2.c: Skip on epiphany-*.
	* gcc.c-torture/execute/20010122-1.x: Delete.
	* gcc.c-torture/execute/20010129-1.x: Delete.
	* gcc.c-torture/execute/20020404-1.x: Delete.
	* gcc.c-torture/execute/20021024-1.x: Delete.
	* gcc.c-torture/execute/20021127-1.x: Delete.
	* gcc.c-torture/execute/20030125-1.x: Delete.
	* gcc.c-torture/execute/20030216-1.x: Delete.
	* gcc.c-torture/execute/20030222-1.x: Delete.
	* gcc.c-torture/execute/20040629-1.x: Delete.
	* gcc.c-torture/execute/20040703-1.x: Delete.
	* gcc.c-torture/execute/20040705-1.x: Delete.
	* gcc.c-torture/execute/20040705-2.x: Delete.
	* gcc.c-torture/execute/20040709-1.x: Delete.
	* gcc.c-torture/execute/20040709-2.x: Delete.
	* gcc.c-torture/execute/20040811-1.x: Delete.
	* gcc.c-torture/execute/20050316-1.x: Delete.
	* gcc.c-torture/execute/20050316-2.x: Delete.
	* gcc.c-torture/execute/20050316-3.x: Delete.
	* gcc.c-torture/execute/20050604-1.x: Delete.
	* gcc.c-torture/execute/20061101-1.x: Delete.
	* gcc.c-torture/execute/20061220-1.x: Delete.
	* gcc.c-torture/execute/20081117-1.x: Delete.
	* gcc.c-torture/execute/20101011-1.x: Delete.
	* gcc.c-torture/execute/20120919-1.x: Delete.
	* gcc.c-torture/execute/920612-1.x: Delete.
	* gcc.c-torture/execute/920710-1.x: Delete.
	* gcc.c-torture/execute/920711-1.x: Delete.
	* gcc.c-torture/execute/930529-1.x: Delete.
	* gcc.c-torture/execute/931004-12.x: Delete.
	* gcc.c-torture/execute/980709-1.x: Delete.
	* gcc.c-torture/execute/981130-1.x: Delete.
	* gcc.c-torture/execute/990127-2.x: Delete.
	* gcc.c-torture/execute/990413-2.x: Delete.
	* gcc.c-torture/execute/990826-0.x: Delete.
	* gcc.c-torture/execute/bf64-1.x: Delete.
	* gcc.c-torture/execute/bitfld-4.x: Delete.
	* gcc.c-torture/execute/cmpsi-2.x: Delete.
	* gcc.c-torture/execute/cvt-1.x: Delete.
	* gcc.c-torture/execute/eeprof-1.x: Delete.
	* gcc.c-torture/execute/ipa-sra-2.x: Delete.
	* gcc.c-torture/execute/loop-2f.x: Delete.
	* gcc.c-torture/execute/loop-2g.x: Delete.
	* gcc.c-torture/execute/mode-dependent-address.x: Delete.
	* gcc.c-torture/execute/nest-align-1.x: Delete.
	* gcc.c-torture/execute/pr19689.x: Delete.
	* gcc.c-torture/execute/pr22493-1.x: Delete.
	* gcc.c-torture/execute/pr23047.x: Delete.
	* gcc.c-torture/execute/pr23135.x: Delete.
	* gcc.c-torture/execute/pr29797-1.x: Delete.
	* gcc.c-torture/execute/pr31448.x: Delete.
	* gcc.c-torture/execute/pr35456.x: Delete.
	* gcc.c-torture/execute/pr37573.x: Delete.
	* gcc.c-torture/execute/pr38151.x: Delete.
	* gcc.c-torture/execute/pr39228.x: Delete.
	* gcc.c-torture/execute/pr39501.x: Delete.
	* gcc.c-torture/execute/pr40386.x: Delete.
	* gcc.c-torture/execute/pr43220.x: Delete.
	* gcc.c-torture/execute/pr44683.x: Delete.
	* gcc.c-torture/execute/pr45262.x: Delete.
	* gcc.c-torture/execute/pr47237.x: Delete.
	* gcc.c-torture/execute/pr51581-1.x: Delete.
	* gcc.c-torture/execute/pr51581-2.x: Delete.
	* gcc.c-torture/execute/pr52979-1.x: Delete.
	* gcc.c-torture/execute/pr52979-2.x: Delete.
	* gcc.c-torture/execute/pr53366-1.x: Delete.
	* gcc.c-torture/execute/pr56799.x: Delete.
	* gcc.c-torture/execute/pr57124.x: Delete.
	* gcc.c-torture/execute/pr57344-2.x: Delete.
	* gcc.c-torture/execute/pr58570.x: Delete.
	* gcc.c-torture/execute/pr60822.x: Delete.
	* gcc.c-torture/execute/pr7284-1.x: Delete.
	* gcc.c-torture/execute/shiftdi.x: Delete.
	* gcc.c-torture/execute/simd-4.x: Delete.
	* gcc.c-torture/execute/strncmp-1.x: Delete.
	* gcc.c-torture/execute/usmul.x: Delete.
	* gcc.c-torture/execute/vrp-5.x: Delete.
	* gcc.c-torture/execute/vrp-6.x: Delete.
	* gcc.c-torture/execute/zerolen-2.x: Delete.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214433 138bc75d-0d04-0410-961f-82ee72b054a4

157 files changed, 344 insertions, 611 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7ad06f0eaca..eaacb5079d6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,182 @@
+2014-08-25  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* gcc.c-torture/execute/execute.exp: Replace with slightly adapted
+	copy of compile/compile.exp.
+	* gcc.c-torture/execute/20010122-1.c: Skip if -fomit-frame-pointer.
+	* gcc.c-torture/execute/20010129-1.c: Add -mtune=i686 if compiling for
+	i?86-*.
+	* gcc.c-torture/execute/20020404-1.c: Require int32plus.  Skip if
+	m32c-*-*.
+	* gcc.c-torture/execute/20021024-1.c: Require int32plus.
+	* gcc.c-torture/execute/20021127-1.c: Add -std=c99 option.
+	* gcc.c-torture/execute/20030125-1.c: Require c99_runtime.
+	* gcc.c-torture/execute/20030216-1.c: Skip if -O1.
+	* gcc.c-torture/execute/20030222-1.c: Skip on spu-*-*.
+	* gcc.c-torture/execute/20040629-1.c: Require int32plus.
+	* gcc.c-torture/execute/20040703-1.c: Likewise.
+	* gcc.c-torture/execute/20040705-1.c: Likewise.
+	* gcc.c-torture/execute/20040705-2.c: Likewise.
+	* gcc.c-torture/execute/20040709-1.c: Likewise.
+	* gcc.c-torture/execute/20040709-2.c: Likewise.
+	* gcc.c-torture/execute/20040811-1.c: Likewise.
+	* gcc.c-torture/execute/20050316-1.c: Likewise.  Add -Wno-psabi.
+	* gcc.c-torture/execute/20050316-2.c: Use -mno-mmx -Wno-psabi when
+	compiling for x86_64-* or i?86-*.
+	* gcc.c-torture/execute/20050604-1.c: Likewise.
+	* gcc.c-torture/execute/20050316-3.c: Add -Wno-psabi option.
+	* gcc.c-torture/execute/20050604-1.c: Use -mno-mmx when	compiling
+	for x86_64-* or i?86-*.
+	* gcc.c-torture/execute/20061101-1.c: Require int32plus.
+	* gcc.c-torture/execute/20061220-1.c: Skip on rl78-*.
+	* gcc.c-torture/execute/20081117-1.c: Require int32plus.
+	* gcc.c-torture/execute/20101011-1.c: Add -fnon-call-exceptions
+	option.
+	* gcc.c-torture/execute/20111227-2.c: Moved to...
+	* gcc.dg/20111227-2.c: ... here.  Add -free option.
+	* gcc.c-torture/execute/20111227-3.c: Likewise move to...
+	* gcc.dg/20111227-3.c: ... here.  Add -free option.
+	* gcc.c-torture/execute/20120919-1.c: Require int32plus.
+	* gcc.c-torture/execute/920612-1.c: Add -fwrapv option.  Add
+	declarations for abort and exit.
+	* gcc.c-torture/execute/920711-1.c: Likewise.
+	* gcc.c-torture/execute/930529-1.c: Likewise.
+	* gcc.c-torture/execute/980709-1.c: Xfail if on AIX with -msoft-float.
+	* gcc.c-torture/execute/981130-1.c: Xfail on m32r-* with scheduling.
+	* gcc.c-torture/execute/990127-1.c: Add delcarations for abort and
+	exit.
+	* gcc.c-torture/execute/990127-2.c: Add -mpc64 option if compiling
+	for i?86-* or x86_64-*.  Add declarations for abort and exit.
+	* gcc.c-torture/execute/990413-2.c: Skip if not compiling for
+	i?86-* or x86_64-*.
+	* gcc.c-torture/execute/990826-0.c: Xfail if on AIX with -msoft-float.
+	* gcc.c-torture/execute/bf64-1.c: Xfail on mcore-*.
+	* gcc.c-torture/execute/bitfld-4.c: Require int32plus.
+	* gcc.c-torture/execute/cmpsi-2.c: Likewise.
+	* gcc.c-torture/execute/eeprof-1.c: Add -finstrument-functions option.
+	Xfail on powerpc-ibm-aix*.  Add declaration for abort.
+	* gcc.c-torture/execute/ipa-sra-2.c: Require int32plus.
+	* gcc.c-torture/execute/loop-2f.c: Require mmap.  Skip if on
+	m68k-linux.
+	* gcc.c-torture/execute/loop-2g.c: Likewise.
+	* gcc.c-torture/execute/mode-dependent-address.c: Require stdint_types.
+	* gcc.c-torture/execute/nest-align-1.c: Add -mno-eabi option for
+	powerpc-*-eabi*.
+	* gcc.c-torture/execute/pr19689.c: Require int32plus.
+	* gcc.c-torture/execute/pr22493-1.c: Add -fwrapv option.
+	* gcc.c-torture/execute/pr23047.c: Likewise.
+	* gcc.c-torture/execute/pr23135.c: Add -Wno-psabi option.  Add
+	declarations for abort and exit.
+	* gcc.c-torture/execute/pr29797-1.c: Require int32plus.
+	* gcc.c-torture/execute/pr31448.c: Likewise.
+	* gcc.c-torture/execute/pr35456.c: Skip on vax.
+	* gcc.c-torture/execute/pr37573.c: Require int32plus.
+	* gcc.c-torture/execute/pr38151.c: Add -Wno-psabi option.
+	* gcc.c-torture/execute/pr39228.c: Add -mieee for sh* and alpha*.
+	Skip on spu-*.
+	* gcc.c-torture/execute/pr39501.c: Add -ffast-math option.  Add
+	declarations for abort and exit.
+	* gcc.c-torture/execute/pr40386.c: Add declarations for abort and exit.
+	* gcc.c-torture/execute/pr43220.c: Require int32plus.
+	* gcc.c-torture/execute/pr44583.c: Add -mieee option for sh*.
+	* gcc.c-torture/execute/pr45262.c: Require int32plus.
+	* gcc.c-torture/execute/pr47237.c: Xfail on nios2-*.
+	* gcc.c-torture/execute/pr51581-1.c: Require int32plus.
+	* gcc.c-torture/execute/pr51582-2.c: Likewise.
+	* gcc.c-torture/execute/pr52979-1.c: Likewise.
+	* gcc.c-torture/execute/pr52979-2.c: Likewise.
+	* gcc.c-torture/execute/pr56799.c: Likewise.
+	* gcc.c-torture/execute/pr57124.c: Likewise.  Add -fno-strict-overflow
+	option.  Add declarations for abort and exit.
+	* gcc.c-torture/execute/pr57344-2.c: Require int32plus.
+	* gcc.c-torture/execute/pr58570.c: Likewise.
+	* gcc.c-torture/execute/pr60822.c: Likewise.
+	* gcc.c-torture/execute/pr7284-1.c: Likewise.
+	* gcc.c-torture/execute/shiftdi.c: Likewise.
+	* gcc.c-torture/execute/simd-4.c: Require stdint_types.
+	* gcc.c-torture/execute/strncmp-1.c: Xfail if vxworks_kernel.
+	* gcc.c-torture/execute/usmul.c: Require int32plus.
+	* gcc.c-torture/execute/vrp-5.c: Likewise.
+	* gcc.c-torture/execute/vrp-6.c: Likewise.
+	* gcc.c-torture/execute/zerolen-2.c: Skip on epiphany-*.
+	* gcc.c-torture/execute/20010122-1.x: Delete.
+	* gcc.c-torture/execute/20010129-1.x: Delete.
+	* gcc.c-torture/execute/20020404-1.x: Delete.
+	* gcc.c-torture/execute/20021024-1.x: Delete.
+	* gcc.c-torture/execute/20021127-1.x: Delete.
+	* gcc.c-torture/execute/20030125-1.x: Delete.
+	* gcc.c-torture/execute/20030216-1.x: Delete.
+	* gcc.c-torture/execute/20030222-1.x: Delete.
+	* gcc.c-torture/execute/20040629-1.x: Delete.
+	* gcc.c-torture/execute/20040703-1.x: Delete.
+	* gcc.c-torture/execute/20040705-1.x: Delete.
+	* gcc.c-torture/execute/20040705-2.x: Delete.
+	* gcc.c-torture/execute/20040709-1.x: Delete.
+	* gcc.c-torture/execute/20040709-2.x: Delete.
+	* gcc.c-torture/execute/20040811-1.x: Delete.
+	* gcc.c-torture/execute/20050316-1.x: Delete.
+	* gcc.c-torture/execute/20050316-2.x: Delete.
+	* gcc.c-torture/execute/20050316-3.x: Delete.
+	* gcc.c-torture/execute/20050604-1.x: Delete.
+	* gcc.c-torture/execute/20061101-1.x: Delete.
+	* gcc.c-torture/execute/20061220-1.x: Delete.
+	* gcc.c-torture/execute/20081117-1.x: Delete.
+	* gcc.c-torture/execute/20101011-1.x: Delete.
+	* gcc.c-torture/execute/20120919-1.x: Delete.
+	* gcc.c-torture/execute/920612-1.x: Delete.
+	* gcc.c-torture/execute/920710-1.x: Delete.
+	* gcc.c-torture/execute/920711-1.x: Delete.
+	* gcc.c-torture/execute/930529-1.x: Delete.
+	* gcc.c-torture/execute/931004-12.x: Delete.
+	* gcc.c-torture/execute/980709-1.x: Delete.
+	* gcc.c-torture/execute/981130-1.x: Delete.
+	* gcc.c-torture/execute/990127-2.x: Delete.
+	* gcc.c-torture/execute/990413-2.x: Delete.
+	* gcc.c-torture/execute/990826-0.x: Delete.
+	* gcc.c-torture/execute/bf64-1.x: Delete.
+	* gcc.c-torture/execute/bitfld-4.x: Delete.
+	* gcc.c-torture/execute/cmpsi-2.x: Delete.
+	* gcc.c-torture/execute/cvt-1.x: Delete.
+	* gcc.c-torture/execute/eeprof-1.x: Delete.
+	* gcc.c-torture/execute/ipa-sra-2.x: Delete.
+	* gcc.c-torture/execute/loop-2f.x: Delete.
+	* gcc.c-torture/execute/loop-2g.x: Delete.
+	* gcc.c-torture/execute/mode-dependent-address.x: Delete.
+	* gcc.c-torture/execute/nest-align-1.x: Delete.
+	* gcc.c-torture/execute/pr19689.x: Delete.
+	* gcc.c-torture/execute/pr22493-1.x: Delete.
+	* gcc.c-torture/execute/pr23047.x: Delete.
+	* gcc.c-torture/execute/pr23135.x: Delete.
+	* gcc.c-torture/execute/pr29797-1.x: Delete.
+	* gcc.c-torture/execute/pr31448.x: Delete.
+	* gcc.c-torture/execute/pr35456.x: Delete.
+	* gcc.c-torture/execute/pr37573.x: Delete.
+	* gcc.c-torture/execute/pr38151.x: Delete.
+	* gcc.c-torture/execute/pr39228.x: Delete.
+	* gcc.c-torture/execute/pr39501.x: Delete.
+	* gcc.c-torture/execute/pr40386.x: Delete.
+	* gcc.c-torture/execute/pr43220.x: Delete.
+	* gcc.c-torture/execute/pr44683.x: Delete.
+	* gcc.c-torture/execute/pr45262.x: Delete.
+	* gcc.c-torture/execute/pr47237.x: Delete.
+	* gcc.c-torture/execute/pr51581-1.x: Delete.
+	* gcc.c-torture/execute/pr51581-2.x: Delete.
+	* gcc.c-torture/execute/pr52979-1.x: Delete.
+	* gcc.c-torture/execute/pr52979-2.x: Delete.
+	* gcc.c-torture/execute/pr53366-1.x: Delete.
+	* gcc.c-torture/execute/pr56799.x: Delete.
+	* gcc.c-torture/execute/pr57124.x: Delete.
+	* gcc.c-torture/execute/pr57344-2.x: Delete.
+	* gcc.c-torture/execute/pr58570.x: Delete.
+	* gcc.c-torture/execute/pr60822.x: Delete.
+	* gcc.c-torture/execute/pr7284-1.x: Delete.
+	* gcc.c-torture/execute/shiftdi.x: Delete.
+	* gcc.c-torture/execute/simd-4.x: Delete.
+	* gcc.c-torture/execute/strncmp-1.x: Delete.
+	* gcc.c-torture/execute/usmul.x: Delete.
+	* gcc.c-torture/execute/vrp-5.x: Delete.
+	* gcc.c-torture/execute/vrp-6.x: Delete.
+	* gcc.c-torture/execute/zerolen-2.x: Delete.
+
 2014-08-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* g++.old-deja/g++.pt/var1.C: Use c++14, not c++1y, in dg-error.
diff --git a/gcc/testsuite/gcc.c-torture/execute/20010122-1.c b/gcc/testsuite/gcc.c-torture/execute/20010122-1.c
index 280e3d45c9e..14269fa7f0e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20010122-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20010122-1.c
@@ -1,3 +1,4 @@
+/* { dg-skip-if "requires frame pointers" { *-*-* } "-fomit-frame-pointer" "" } */
 
 extern void exit (int);
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/20010122-1.x b/gcc/testsuite/gcc.c-torture/execute/20010122-1.x
deleted file mode 100644
index 65582364431..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20010122-1.x
+++ /dev/null
@@ -1,11 +0,0 @@
-# This test relies on __builtin_return_address(1) returning something
-# useful or NULL.  This is not guaranteed to be be so, especially when 
-# -fomit-frame-pointer is used.  So do not test with it.
-
-set torture_eval_before_compile {
-  if {[string match {*-fomit-frame-pointer*} "$option"]} {
-    continue
-  }
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20010129-1.c b/gcc/testsuite/gcc.c-torture/execute/20010129-1.c
index a4ea5e4d97e..0586577ae61 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20010129-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20010129-1.c
@@ -1,3 +1,5 @@
+/* { dg-options "-mtune-i686" { target { { i?86*-*-* } && ilp32 } } } */
+
 long baz1 (void *a)
 {
   static long l;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20010129-1.x b/gcc/testsuite/gcc.c-torture/execute/20010129-1.x
deleted file mode 100644
index 7e474c45348..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20010129-1.x
+++ /dev/null
@@ -1,13 +0,0 @@
-# Use "-mtune=i686" on i?86-*-* unless "-m64" is specified.
-if { [istarget "i?86-*-*"] } {
-  set target_name [target_info name]
-  if {[board_info $target_name exists multilib_flags]} {
-    set multilib_flags [board_info $target_name multilib_flags]
-    if { ![regexp -- "-m64" $multilib_flags] } {
-      set additional_flags "-mtune=i686"
-    }
-  } else {
-    set additional_flags "-mtune=i686"
-  }
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20020404-1.c b/gcc/testsuite/gcc.c-torture/execute/20020404-1.c
index dc62b15bbdd..fe5ea14fad7 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20020404-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20020404-1.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target int32plus } */
+/* { dg-skip-if "pointers can be truncated" { m32c-*-* } "*" "" } */
 /* Extracted from GDB sources. */
 
 typedef long long bfd_signed_vma;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20020404-1.x b/gcc/testsuite/gcc.c-torture/execute/20020404-1.x
deleted file mode 100644
index e4fd61a44a0..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20020404-1.x
+++ /dev/null
@@ -1,15 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-# m32c pointers can be 24 bits in a 32 bit variable, so the test
-# patterns may get truncated.
-if { [istarget "m32c-*-*"] } {
-	return 1
-}
-
-
-return 0
-
diff --git a/gcc/testsuite/gcc.c-torture/execute/20021024-1.c b/gcc/testsuite/gcc.c-torture/execute/20021024-1.c
index f7d98e929a2..93504f2254a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20021024-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20021024-1.c
@@ -1,4 +1,5 @@
 /* Origin: PR target/6981 from Mattias Engdegaard <mattias@virtutech.se>.  */
+/* { dg-require-effective-target int32plus } */
 
 void exit (int);
 void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/20021024-1.x b/gcc/testsuite/gcc.c-torture/execute/20021024-1.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20021024-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20021127-1.c b/gcc/testsuite/gcc.c-torture/execute/20021127-1.c
index 0b3ff9ac850..204305be305 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20021127-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20021127-1.c
@@ -1,3 +1,5 @@
+/* { dg-options "-std=c99" } */
+
 long long a = -1;
 long long llabs (long long);
 void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/20021127-1.x b/gcc/testsuite/gcc.c-torture/execute/20021127-1.x
deleted file mode 100644
index efd854a050e..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20021127-1.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-std=c99"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030125-1.c b/gcc/testsuite/gcc.c-torture/execute/20030125-1.c
index 28cfbd10b4c..60ede34f5da 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20030125-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20030125-1.c
@@ -1,4 +1,5 @@
 /* Verify whether math functions are simplified.  */
+/* { dg-require-effective-target c99_runtime } */
 double sin(double);
 double floor(double);
 float 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030125-1.x b/gcc/testsuite/gcc.c-torture/execute/20030125-1.x
deleted file mode 100644
index 895cff7fef7..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20030125-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-# Only glibc includes all c99 functions at the moment.
-if { ! ([istarget "*-linux*"]
-	|| [istarget "*-gnu*"])} then {
-    return 1
-}
-if { [check_effective_target_uclibc] } { return 1 }
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030216-1.c b/gcc/testsuite/gcc.c-torture/execute/20030216-1.c
index 2153bfdd71f..0256ae39ebb 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20030216-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20030216-1.c
@@ -1,3 +1,8 @@
+/* This test requires constant propagation of loads and stores to be
+   enabled.  This is only guaranteed at -O2 and higher.  Do not run
+   at -O1.  */
+/* { dg-skip-if "requires higher optimization" { *-*-* } "-O1" "" } */
+
 void link_error (void);
 const double one=1.0;
 main ()
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030216-1.x b/gcc/testsuite/gcc.c-torture/execute/20030216-1.x
deleted file mode 100644
index a0e03e379df..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20030216-1.x
+++ /dev/null
@@ -1,12 +0,0 @@
-# This test requires constant propagation of loads and stores to be
-# enabled.  This is only guaranteed at -O2 and higher.  Do not run
-# at -O1.
-
-set torture_eval_before_compile {
-  if {[string match {*-O1*} "$option"]} {
-    continue
-  }
-}
-
-return 0
-
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030222-1.c b/gcc/testsuite/gcc.c-torture/execute/20030222-1.c
index 93d1e3c4e80..385ae686192 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20030222-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20030222-1.c
@@ -3,7 +3,7 @@
    succeeded at all.  We use volatile to make sure the long long is
    actually truncated to int, in case a single register is wide enough
    for a long long.  */
-
+/* { dg-skip-if "asm would require extra shift-left-4-byte" { spu-*-* } "*" "" } */
 #include <limits.h>
 
 void
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030222-1.x b/gcc/testsuite/gcc.c-torture/execute/20030222-1.x
deleted file mode 100644
index e195563ddd0..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20030222-1.x
+++ /dev/null
@@ -1,6 +0,0 @@
-if [istarget "spu-*-*"] {
-    # Using inline assembly to convert long long to int is not working quite
-    # right # on the SPU.  An extra shift-left-4-byte is needed.
-    return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040629-1.c b/gcc/testsuite/gcc.c-torture/execute/20040629-1.c
index 6b3e9069240..5e03222b0e1 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20040629-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20040629-1.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target int32plus } */
+
 /* Test arithmetics on bitfields.  */
 #ifndef T
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040629-1.x b/gcc/testsuite/gcc.c-torture/execute/20040629-1.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20040629-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040703-1.c b/gcc/testsuite/gcc.c-torture/execute/20040703-1.c
index eba358d35ae..a1b75d90bbc 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20040703-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20040703-1.c
@@ -1,4 +1,5 @@
 /* PR 16341 */
+/* { dg-require-effective-target int32plus } */
 
 #define PART_PRECISION (sizeof (cpp_num_part) * 8)
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040703-1.x b/gcc/testsuite/gcc.c-torture/execute/20040703-1.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20040703-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040705-1.c b/gcc/testsuite/gcc.c-torture/execute/20040705-1.c
index a9ba88ec2e9..fe14d0f24bf 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20040705-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20040705-1.c
@@ -1,2 +1,4 @@
+/* { dg-require-effective-target int32plus } */
+
 #define FIELDS1 long long l;
 #include "20040629-1.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040705-1.x b/gcc/testsuite/gcc.c-torture/execute/20040705-1.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20040705-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040705-2.c b/gcc/testsuite/gcc.c-torture/execute/20040705-2.c
index a36fb6a681e..1d695865451 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20040705-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20040705-2.c
@@ -1,2 +1,3 @@
+/* { dg-require-effective-target int32plus } */
 #define FIELDS2 long long l;
 #include "20040629-1.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040705-2.x b/gcc/testsuite/gcc.c-torture/execute/20040705-2.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20040705-2.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040709-1.c b/gcc/testsuite/gcc.c-torture/execute/20040709-1.c
index 455313ade18..52de67d4870 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20040709-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20040709-1.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target int32plus } */
+
 /* Test arithmetics on bitfields.  */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040709-1.x b/gcc/testsuite/gcc.c-torture/execute/20040709-1.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20040709-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040709-2.c b/gcc/testsuite/gcc.c-torture/execute/20040709-2.c
index 6ae1f2dadf4..925050d77bb 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20040709-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20040709-2.c
@@ -1,4 +1,5 @@
 /* Test arithmetics on bitfields.  */
+/* { dg-require-effective-target int32plus } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040709-2.x b/gcc/testsuite/gcc.c-torture/execute/20040709-2.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20040709-2.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040811-1.c b/gcc/testsuite/gcc.c-torture/execute/20040811-1.c
index 62f377a2f24..0122825323a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20040811-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20040811-1.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target int32plus } */
+
 /* Ensure that we deallocate X when branching back before its
    declaration.  */
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20040811-1.x b/gcc/testsuite/gcc.c-torture/execute/20040811-1.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20040811-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-1.c b/gcc/testsuite/gcc.c-torture/execute/20050316-1.c
index 2a1c6254dfa..0a285d73ec8 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20050316-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20050316-1.c
@@ -1,4 +1,6 @@
 /* PR rtl-optimization/16104 */
+/* { dg-require-effective-target int32plus } */
+/* { dg-options "-Wno-psabi" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-1.x b/gcc/testsuite/gcc.c-torture/execute/20050316-1.x
deleted file mode 100644
index cb2d28fd9fc..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20050316-1.x
+++ /dev/null
@@ -1,8 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-set additional_flags "-Wno-psabi"
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-2.c b/gcc/testsuite/gcc.c-torture/execute/20050316-2.c
index c6487774d37..920dfdb9fbf 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20050316-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20050316-2.c
@@ -1,3 +1,8 @@
+/* This testcase generates MMX instructions together with x87 instructions.
+   Currently, there is no "emms" generated to switch between register sets,
+   so the testcase fails for targets where MMX insns are enabled.  */
+/* { dg-options "-mno-mmx -Wno-psabi" { target { x86_64-*-* i?86-*-* } } } */
+
 extern void abort (void);
 
 typedef int V2SI __attribute__ ((vector_size (8)));
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-2.x b/gcc/testsuite/gcc.c-torture/execute/20050316-2.x
deleted file mode 100644
index f5b4aaae3d9..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20050316-2.x
+++ /dev/null
@@ -1,9 +0,0 @@
-# This testcase generates MMX instructions together with x87 instructions.
-# Currently, there is no "emms" generated to switch between register sets,
-# so the testcase fails for targets where MMX insns are enabled.
-
-if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } {
-	set additional_flags "-mno-mmx"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-3.c b/gcc/testsuite/gcc.c-torture/execute/20050316-3.c
index 773243f229f..9f35ece4281 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20050316-3.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20050316-3.c
@@ -1,3 +1,4 @@
+/* { dg-options "-Wno-psabi" } */
 extern void abort (void);
 
 typedef int V2SI __attribute__ ((vector_size (8)));
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-3.x b/gcc/testsuite/gcc.c-torture/execute/20050316-3.x
deleted file mode 100644
index cb7b119b8cb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20050316-3.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-Wno-psabi"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050604-1.c b/gcc/testsuite/gcc.c-torture/execute/20050604-1.c
index 70097aa14cb..6d633890761 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20050604-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20050604-1.c
@@ -1,4 +1,8 @@
 /* PR regression/21897 */
+/* This testcase generates MMX instructions together with x87 instructions.
+   Currently, there is no "emms" generated to switch between register sets,
+   so the testcase fails for targets where MMX insns are enabled.  */
+/* { dg-options "-mno-mmx" { target { x86_64-*-* i?86-*-* } } } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050604-1.x b/gcc/testsuite/gcc.c-torture/execute/20050604-1.x
deleted file mode 100644
index 756242d2345..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20050604-1.x
+++ /dev/null
@@ -1,10 +0,0 @@
-# This testcase generates MMX instructions together with x87 instructions.
-# Currently, there is no "emms" generated to switch between register sets,
-# so the testcase fails for targets where MMX insns are enabled.
-
-if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } {
-	set additional_flags "-mno-mmx"
-}
-
-set additional_flags "-Wno-psabi"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20061101-1.c b/gcc/testsuite/gcc.c-torture/execute/20061101-1.c
index 23517282d05..7bea079b783 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20061101-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20061101-1.c
@@ -1,5 +1,6 @@
 /* PR rtl-optimization/28970 */
 /* Origin: Peter Bergner <bergner@vnet.ibm.com> */
+/* { dg-require-effective-target int32plus } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20061101-1.x b/gcc/testsuite/gcc.c-torture/execute/20061101-1.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20061101-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20061220-1.c b/gcc/testsuite/gcc.c-torture/execute/20061220-1.c
index 188f92cfc8e..9a133e8c6e8 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20061220-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20061220-1.c
@@ -1,4 +1,5 @@
 /* PR middle-end/30262 */
+/* { dg-skip-if "asm statements do not work as expected" { rl78-*-* } "*" "" } */
 extern void abort (void);
 
 int
diff --git a/gcc/testsuite/gcc.c-torture/execute/20061220-1.x b/gcc/testsuite/gcc.c-torture/execute/20061220-1.x
deleted file mode 100644
index bfc4e964d63..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20061220-1.x
+++ /dev/null
@@ -1,6 +0,0 @@
-# asm statements for the RL78 do not work as expected
-if { [istarget "rl78-*-*"] } {
-        return 1;
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20081117-1.c b/gcc/testsuite/gcc.c-torture/execute/20081117-1.c
index bff7464cbae..8fa00d2f953 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20081117-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20081117-1.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 extern void abort (void);
 
 struct s
diff --git a/gcc/testsuite/gcc.c-torture/execute/20081117-1.x b/gcc/testsuite/gcc.c-torture/execute/20081117-1.x
deleted file mode 100644
index 7378270cdb0..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20081117-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-        return 1
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20101011-1.c b/gcc/testsuite/gcc.c-torture/execute/20101011-1.c
index 9299bb9205a..85b910df31c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20101011-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20101011-1.c
@@ -1,5 +1,5 @@
-/* With -fnon-call-exceptions 0 / 0 should not be eliminated.  The .x
-   file sets the option.  */
+/* { dg-options "-fnon-call-exceptions" } */
+/* With -fnon-call-exceptions 0 / 0 should not be eliminated.  */
 
 #ifdef SIGNAL_SUPPRESS
 # define DO_TEST 0
@@ -75,6 +75,9 @@ __aeabi_idiv0 (int return_value)
 # define DO_TEST 1
 #endif
 
+extern void abort (void);
+extern void exit (int);
+
 #if DO_TEST
 
 #include <signal.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/20101011-1.x b/gcc/testsuite/gcc.c-torture/execute/20101011-1.x
deleted file mode 100644
index b5c080dd371..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20101011-1.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-fnon-call-exceptions"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20120919-1.c b/gcc/testsuite/gcc.c-torture/execute/20120919-1.c
index e7f329538c0..afcde95e27b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20120919-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20120919-1.c
@@ -1,5 +1,6 @@
 /* PR rtl-optimization/54290 */
 /* Testcase by Eric Volk <eriksnga@gmail.com> */
+/* { dg-require-effective-target int32plus } */
 
 double vd[2] = {1., 0.};
 int vi[2] = {1234567890, 0};
diff --git a/gcc/testsuite/gcc.c-torture/execute/20120919-1.x b/gcc/testsuite/gcc.c-torture/execute/20120919-1.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/20120919-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/920612-1.c b/gcc/testsuite/gcc.c-torture/execute/920612-1.c
index a70c0d2e078..bc630035200 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920612-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/920612-1.c
@@ -1,2 +1,7 @@
+/* { dg-options "-fwrapv" } */
+
+extern void abort (void);
+extern void exit (int);
+
 f(j)int j;{return++j>0;}
 main(){if(f((~0U)>>1))abort();exit(0);}
diff --git a/gcc/testsuite/gcc.c-torture/execute/920612-1.x b/gcc/testsuite/gcc.c-torture/execute/920612-1.x
deleted file mode 100644
index 36a58395004..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/920612-1.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-fwrapv"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/920710-1.x b/gcc/testsuite/gcc.c-torture/execute/920710-1.x
deleted file mode 100644
index b7612f78787..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/920710-1.x
+++ /dev/null
@@ -1,6 +0,0 @@
-# h8300 does not have long long
-if { [istarget "h8300-*-*"] } {
-        return 1;
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/920711-1.c b/gcc/testsuite/gcc.c-torture/execute/920711-1.c
index aa83452dafe..f72ef7c5452 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920711-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/920711-1.c
@@ -1,2 +1,7 @@
+/* { dg-options "-fwrapv" } */
+
+extern void abort (void);
+extern void exit (int);
+
 f(long a){return (--a > 0);}
 main(){if(f(0x80000000L)==0)abort();exit(0);}
diff --git a/gcc/testsuite/gcc.c-torture/execute/920711-1.x b/gcc/testsuite/gcc.c-torture/execute/920711-1.x
deleted file mode 100644
index 36a58395004..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/920711-1.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-fwrapv"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/930529-1.c b/gcc/testsuite/gcc.c-torture/execute/930529-1.c
index 906338e6e9a..9c4085ce1a0 100644
--- a/gcc/testsuite/gcc.c-torture/execute/930529-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/930529-1.c
@@ -1,3 +1,8 @@
+/* { dg-options { "-fwrapv" } } */
+
+extern void abort (void);
+extern void exit (int);
+
 dd (x,d) { return x / d; }
 
 main ()
diff --git a/gcc/testsuite/gcc.c-torture/execute/930529-1.x b/gcc/testsuite/gcc.c-torture/execute/930529-1.x
deleted file mode 100644
index 25225f4f4d6..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/930529-1.x
+++ /dev/null
@@ -1,24 +0,0 @@
-# The problem on Alpha at -O3 is that when dd is inlined, we have
-# division by a constant, which gets converted to multiplication
-# by a large constant, which gets turned into an induction variable.
-# The problem is that the multiplication was unsigned SImode, and the
-# induction variable is DImode, and we lose the truncation that
-# should have happened.
-#
-# On tree-ssa branch, the loop problem is still extant, but the
-# gimple-level optimization makes it easy for the tree-rtl expanders
-# to see that the comparisons are always true, and so the loop code
-# is never exercized.
-
-# set torture_eval_before_execute {
-# 
-#     set compiler_conditional_xfail_data {
-#         "division by a constant conflicts with strength reduction" \
-#         "alpha*-*-*" \
-#         { "-O3" } \
-#         { "" }
-#     }
-# }
-
-set additional_flags "-fwrapv"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/931004-12.x b/gcc/testsuite/gcc.c-torture/execute/931004-12.x
deleted file mode 100644
index 591dc7ff2b0..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/931004-12.x
+++ /dev/null
@@ -1,6 +0,0 @@
-if { [istarget "powerpc-*-darwin*] } {
-    # xfail this on powerpc-*-darwin, see PR 15923
-    set torture_execute_xfail [istarget]
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/980709-1.c b/gcc/testsuite/gcc.c-torture/execute/980709-1.c
index cda80765a6f..54b3bbc7cf9 100644
--- a/gcc/testsuite/gcc.c-torture/execute/980709-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/980709-1.c
@@ -1,3 +1,4 @@
+/* { dg-xfail-if "Can not call system libm.a with -msoft-float" { powerpc-*-aix* rs6000-*-aix* } { "-msoft-float" } { "" } } */
 #include <math.h>
 
 main()
diff --git a/gcc/testsuite/gcc.c-torture/execute/980709-1.x b/gcc/testsuite/gcc.c-torture/execute/980709-1.x
deleted file mode 100644
index 307f568859c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/980709-1.x
+++ /dev/null
@@ -1,16 +0,0 @@
-# XFAIL this test for AIX using -msoft-float.
-# This test calls the system libm.a function pow.
-# A false failure is reported if -msoft-float is used.
-# AIX expects the parameters to be passed in fp regs. 
-if { [istarget powerpc-*-aix*] || [istarget rs6000-*-aix*] } {
-    set torture_eval_before_execute {
-	global compiler_conditional_xfail_data
-	set compiler_conditional_xfail_data {
-	    "Can not call system libm.a with -msoft-float" \
-		    "*-*-aix*" \
-		    { "-msoft-float" } \
-		    { "" }
-	}
-    }
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/981130-1.c b/gcc/testsuite/gcc.c-torture/execute/981130-1.c
index 72630b07ec8..c4ca227d1e8 100644
--- a/gcc/testsuite/gcc.c-torture/execute/981130-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/981130-1.c
@@ -1,3 +1,4 @@
+/* { dg-xfail-if "alias analysis conflicts with instruction scheduling" { m32r-*-* } { "-O2" "-O1" "-O0" "-Os"} { "" } } */
 struct s { int a; int b;};
 struct s s1;
 struct s s2 = { 1, 2, };
diff --git a/gcc/testsuite/gcc.c-torture/execute/981130-1.x b/gcc/testsuite/gcc.c-torture/execute/981130-1.x
deleted file mode 100644
index 1565c68adc7..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/981130-1.x
+++ /dev/null
@@ -1,22 +0,0 @@
-# This test is known to fail on targets that use the instruction scheduler
-# at optimisation levels of 2 or more because the alias analysis is confused
-# by the reassignment of a variable structure to a fixed structure.  The 
-# failure could be suppressed by preventing instruction scheduling:
-#
-# set additional_flags "-fno-schedule-insns2";
-#
-# but this would disguise the fact that there is a problem.  Instead we use
-# we generate an xfail result and explain that it is alias analysis that
-# is at fault.
-
-set torture_eval_before_execute {
-
-    set compiler_conditional_xfail_data {
-        "alias analysis conflicts with instruction scheduling" \
-	"m32r-*-*" \
-	{ "-O2" "-O1" "-O0" "-Os"} \
-	{ "" }
-	}    
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/990127-1.c b/gcc/testsuite/gcc.c-torture/execute/990127-1.c
index c49584820c2..8b572a7ce90 100644
--- a/gcc/testsuite/gcc.c-torture/execute/990127-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/990127-1.c
@@ -1,3 +1,6 @@
+extern void abort (void);
+extern void exit (int);
+
 main()
 {
     int a,b,c;
diff --git a/gcc/testsuite/gcc.c-torture/execute/990127-2.c b/gcc/testsuite/gcc.c-torture/execute/990127-2.c
index 0d0f495124a..e87d27a3450 100644
--- a/gcc/testsuite/gcc.c-torture/execute/990127-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/990127-2.c
@@ -1,3 +1,8 @@
+/* { dg-options "-mpc64"  { target { i?86-*-* x86_64-*-* } } } */
+
+extern void abort (void);
+extern void exit (int);
+
 void
 fpEq (double x, double y)
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/990127-2.x b/gcc/testsuite/gcc.c-torture/execute/990127-2.x
deleted file mode 100644
index 501e9314713..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/990127-2.x
+++ /dev/null
@@ -1,20 +0,0 @@
-# On x86 targets, two floating-point double values can't be reliably compared
-# for inequality due to excess precision of 80387 floating-point coprocessor.
-# Use -mpc64 to force 80387 floating-point precision to 64 bits.  This option
-# has no effect on SSE, but it is needed in case of -m32 on x86_64 targets.
-
-if { [istarget i?86-*-darwin*]
-     || [istarget i?86-*-linux*]
-     || [istarget i?86-*-gnu*]
-     || [istarget i?86-*-kfreebsd*-gnu]
-     || [istarget i?86-*-knetbsd*-gnu]
-     || [istarget i?86-*-solaris2*]
-     || [istarget x86_64-*-darwin*]
-     || [istarget x86_64-*-linux*]
-     || [istarget x86_64-*-kfreebsd*-gnu]
-     || [istarget x86_64-*-knetbsd*-gnu]
-     || [istarget x86_64-*-solaris2*] } {
-	set additional_flags "-mpc64"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/990413-2.c b/gcc/testsuite/gcc.c-torture/execute/990413-2.c
index 262140a3fe5..3beb5403b87 100644
--- a/gcc/testsuite/gcc.c-torture/execute/990413-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/990413-2.c
@@ -1,4 +1,5 @@
 /* This tests for a bug in regstack that was breaking glibc's math library. */
+/* { dg-skip-if "" { ! { i?86-*-* x86_64-*-* } } { "*" } { "" } } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/990413-2.x b/gcc/testsuite/gcc.c-torture/execute/990413-2.x
deleted file mode 100644
index 58be1c0e097..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/990413-2.x
+++ /dev/null
@@ -1,3 +0,0 @@
-# This test is x86 specific.
-if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } { return 0 }
-return 1
diff --git a/gcc/testsuite/gcc.c-torture/execute/990826-0.c b/gcc/testsuite/gcc.c-torture/execute/990826-0.c
index 2807ea348eb..c630da7d2bf 100644
--- a/gcc/testsuite/gcc.c-torture/execute/990826-0.c
+++ b/gcc/testsuite/gcc.c-torture/execute/990826-0.c
@@ -6,6 +6,8 @@ Date: Sun, 06 Jun 1999 23:37:23 -0400
 X-UIDL: 9c1e40c572e3b306464f703461764cd5
 */
 
+/* { dg-xfail-if "Can not call system libm.a with -msoft-float" { powerpc-*-aix* rs6000-*-aix* } { "-msoft-float" } { "" } } */
+
 #include <stdio.h>
 #include <math.h>
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/990826-0.x b/gcc/testsuite/gcc.c-torture/execute/990826-0.x
deleted file mode 100644
index 477c10bba5b..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/990826-0.x
+++ /dev/null
@@ -1,16 +0,0 @@
-# XFAIL this test for AIX using -msoft-float.
-# This test calls the system libm.a function floor.
-# A false failure is reported if -msoft-float is used.
-# AIX expects the parameters to be passed in fp regs. 
-if { [istarget powerpc-*-aix*] || [istarget rs6000-*-aix*] } {
-    set torture_eval_before_execute {
-	global compiler_conditional_xfail_data
-	set compiler_conditional_xfail_data {
-	    "Can not call system libm.a with -msoft-float" \
-		    "*-*-aix*" \
-		    { "-msoft-float" } \
-		    { "" }
-	}
-    }
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/bf64-1.c b/gcc/testsuite/gcc.c-torture/execute/bf64-1.c
index 60028fb1aa8..d69a7c401f8 100644
--- a/gcc/testsuite/gcc.c-torture/execute/bf64-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/bf64-1.c
@@ -1,3 +1,4 @@
+/* { dg-xfail-if "ABI specifies bitfields cannot exceed 32 bits" { mcore-*-* } "*" "" } */
 struct tmp
 {
   long long int pad : 12;
diff --git a/gcc/testsuite/gcc.c-torture/execute/bf64-1.x b/gcc/testsuite/gcc.c-torture/execute/bf64-1.x
deleted file mode 100644
index f3069f2844b..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/bf64-1.x
+++ /dev/null
@@ -1,8 +0,0 @@
-# The MCore ABI specifies that bitfields may not exceed 32 bits.
-# Hence this tes will fail.
-
-if { [istarget "mcore-*-*"] } {
-	set torture_execute_xfail "mcore-*-*"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/bitfld-4.c b/gcc/testsuite/gcc.c-torture/execute/bitfld-4.c
index 6f7d7e25c2f..13a5c691dd2 100644
--- a/gcc/testsuite/gcc.c-torture/execute/bitfld-4.c
+++ b/gcc/testsuite/gcc.c-torture/execute/bitfld-4.c
@@ -6,6 +6,8 @@
    32-bit systems.  */
 /* Origin: Joseph Myers <jsm@polyomino.org.uk> */
 
+/* { dg-require-effective-target int32plus } */
+
 extern void abort (void);
 
 struct s { int a:12, b:20; };
diff --git a/gcc/testsuite/gcc.c-torture/execute/bitfld-4.x b/gcc/testsuite/gcc.c-torture/execute/bitfld-4.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/bitfld-4.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c b/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c
index 62832a9bffc..52c8065dd1b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 #define F 140
 #define T 13
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x b/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/cmpsi-2.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/cvt-1.x b/gcc/testsuite/gcc.c-torture/execute/cvt-1.x
deleted file mode 100644
index 997c8650c00..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/cvt-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-# This doesn't work on d10v if ints are not 32 bits
-
-if { [istarget "d10v-*-*"] && ! [string-match "*-mint32*" $CFLAGS] } {
-	set torture_execute_xfail "d10v-*-*"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c b/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c
index 248b8ccbe01..96dab9a33e1 100644
--- a/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/eeprof-1.c
@@ -1,3 +1,8 @@
+/* { dg-options "-finstrument-functions" } */
+/* { dg-xfail-if "" { powerpc-ibm-aix* } "*" "" } */
+
+extern void abort (void);
+
 #define ASSERT(X)	if (!(X)) abort ();
 #define NOCHK __attribute__ ((no_instrument_function))
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/eeprof-1.x b/gcc/testsuite/gcc.c-torture/execute/eeprof-1.x
deleted file mode 100644
index d53f8c23ee2..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/eeprof-1.x
+++ /dev/null
@@ -1,5 +0,0 @@
-if { [istarget "powerpc-ibm-aix*"] } {
-        set torture_execute_xfail "powerpc-ibm-aix*"
-}
-set additional_flags "-finstrument-functions"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/execute.exp b/gcc/testsuite/gcc.c-torture/execute/execute.exp
index 9f29ef2dc45..886bd05dfda 100644
--- a/gcc/testsuite/gcc.c-torture/execute/execute.exp
+++ b/gcc/testsuite/gcc.c-torture/execute/execute.exp
@@ -22,28 +22,17 @@
 # C torture test suite.
 #
 
-if $tracelevel then {
-    strace $tracelevel
-}
+# Load support procs.
+load_lib gcc-dg.exp
 
-# load support procs
-load_lib torture-options.exp
-load_lib c-torture.exp
+# Initialize `dg'.
+dg-init
 
-torture-init
-set-torture-options $C_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS
+# Main loop.
+set saved-dg-do-what-default ${dg-do-what-default}
+set dg-do-what-default "run"
+gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" "-w"
+set dg-do-what-default ${saved-dg-do-what-default}
 
-#
-# main test loop
-#
-
-foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
-    # If we're only testing specific files and this isn't one of them, skip it.
-    if ![runtest_file_p $runtests $src] then {
-	continue
-    }
-
-    c-torture-execute $src
-}
-
-torture-finish
+# All done.
+dg-finish
diff --git a/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.c b/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.c
index 515d4162406..feb2a34e037 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 struct big
 {
   int data[1000000];
diff --git a/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.x b/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.x
deleted file mode 100644
index c65423ef6d9..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ipa-sra-2.x
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib target-supports.exp

-

-return  [expr [check_effective_target_int16 ]] 

diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2f.c b/gcc/testsuite/gcc.c-torture/execute/loop-2f.c
index 4803d64daa9..539db4b4d43 100644
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2f.c
+++ b/gcc/testsuite/gcc.c-torture/execute/loop-2f.c
@@ -1,3 +1,6 @@
+/* { dg-require-effective-target mmap } */
+/* { dg-skip-if "the executable is at the same position the test tries to remap" { m68k-*-linux* } { "*" } { "" } } */
+
 #include <limits.h>
 
 #include <sys/types.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2f.x b/gcc/testsuite/gcc.c-torture/execute/loop-2f.x
deleted file mode 100644
index ad024dd4938..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2f.x
+++ /dev/null
@@ -1,11 +0,0 @@
-load_lib target-supports.exp
-
-if { ! [check_effective_target_mmap] } {
-        return 1
-}
-
-if [istarget "m68k-*-linux*"] {
-    # the executable is at the same position the test tries to remap
-    return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2g.c b/gcc/testsuite/gcc.c-torture/execute/loop-2g.c
index 91af4132327..0840945c87a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2g.c
+++ b/gcc/testsuite/gcc.c-torture/execute/loop-2g.c
@@ -1,3 +1,6 @@
+/* { dg-require-effective-target mmap } */
+/* { dg-skip-if "the executable is at the same position the test tries to remap" { m68k-*-linux* } { "*" } { "" } } */
+
 #include <limits.h>
 
 #include <sys/types.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2g.x b/gcc/testsuite/gcc.c-torture/execute/loop-2g.x
deleted file mode 100644
index ad024dd4938..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2g.x
+++ /dev/null
@@ -1,11 +0,0 @@
-load_lib target-supports.exp
-
-if { ! [check_effective_target_mmap] } {
-        return 1
-}
-
-if [istarget "m68k-*-linux*"] {
-    # the executable is at the same position the test tries to remap
-    return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c b/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c
index 5bf840cf27c..49c8c093fd8 100644
--- a/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c
+++ b/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target stdint_types } */
+
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.x b/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.x
deleted file mode 100644
index 6622e71f35c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { ! [check_effective_target_stdint_types] } {
-	return 1
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/nest-align-1.c b/gcc/testsuite/gcc.c-torture/execute/nest-align-1.c
index 548c8878dab..73c0f6470db 100644
--- a/gcc/testsuite/gcc.c-torture/execute/nest-align-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/nest-align-1.c
@@ -2,6 +2,9 @@
    function.  */
 /* Origin: Joey Ye <joey.ye@intel.com> */
 
+/* Force bigger stack alignment for PowerPC EABI targets.  */
+/* { dg-options "-mno-eabi" { target powerpc-*-eabi* } } */
+
 #include <stddef.h>
 
 typedef int aligned __attribute__((aligned));
diff --git a/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x b/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x
deleted file mode 100644
index 392d9aaa898..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/nest-align-1.x
+++ /dev/null
@@ -1,5 +0,0 @@
-# Force bigger stack alignment for PowerPC EABI targets.
-if { [istarget "powerpc-*-eabi*"] } {
-    set additional_flags "-mno-eabi"
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr19689.c b/gcc/testsuite/gcc.c-torture/execute/pr19689.c
index 608415f3693..d950315f237 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr19689.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr19689.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 extern void abort (void);
 
 struct
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr19689.x b/gcc/testsuite/gcc.c-torture/execute/pr19689.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr19689.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr22493-1.c b/gcc/testsuite/gcc.c-torture/execute/pr22493-1.c
index bc0ff785ae3..dedcb657e19 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr22493-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr22493-1.c
@@ -1,3 +1,5 @@
+/* { dg-options "-fwrapv" } */
+
 #include <limits.h>
 extern void abort ();
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr22493-1.x b/gcc/testsuite/gcc.c-torture/execute/pr22493-1.x
deleted file mode 100644
index 36a58395004..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr22493-1.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-fwrapv"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23047.c b/gcc/testsuite/gcc.c-torture/execute/pr23047.c
index 7557fc2beca..2c963abc4c6 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr23047.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr23047.c
@@ -1,3 +1,4 @@
+/* { dg-options "-fwrapv" } */
 #include <limits.h>
 extern void abort ();
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23047.x b/gcc/testsuite/gcc.c-torture/execute/pr23047.x
deleted file mode 100644
index 36a58395004..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr23047.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-fwrapv"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23135.c b/gcc/testsuite/gcc.c-torture/execute/pr23135.c
index 57b5f7cfa6c..378ebe741d9 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr23135.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr23135.c
@@ -1,10 +1,15 @@
 /* Based on execute/simd-1.c, modified by joern.rennecke@st.com to
    trigger a reload bug.  Verified for gcc mainline from 20050722 13:00 UTC
    for sh-elf -m4 -O2.  */
+/* { dg-options "-Wno-psabi" } */
+
 #ifndef STACK_SIZE
 #define STACK_SIZE (256*1024)
 #endif
 
+extern void abort (void);
+extern void exit (int);
+
 typedef struct { char c[STACK_SIZE/2]; } big_t;
 
 typedef int __attribute__((mode(SI))) __attribute__((vector_size (8))) vecint;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23135.x b/gcc/testsuite/gcc.c-torture/execute/pr23135.x
deleted file mode 100644
index cb7b119b8cb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr23135.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-Wno-psabi"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr29797-1.c b/gcc/testsuite/gcc.c-torture/execute/pr29797-1.c
index 9bcc2a9c59b..40758c1d583 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr29797-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr29797-1.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 extern void abort(void);
 
 unsigned int bar(void) { return 32768; }
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr29797-1.x b/gcc/testsuite/gcc.c-torture/execute/pr29797-1.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr29797-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr31448.c b/gcc/testsuite/gcc.c-torture/execute/pr31448.c
index 720ba926eaa..fb8c2471a6d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr31448.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr31448.c
@@ -1,5 +1,6 @@
 /* PR middle-end/31448, this used to ICE during expand because
    reduce_to_bit_field_precision was not ready to handle constants. */
+/* { dg-require-effective-target int32plus } */
 
 typedef struct _st {
     int iIndex : 24;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr31448.x b/gcc/testsuite/gcc.c-torture/execute/pr31448.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr31448.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr35456.c b/gcc/testsuite/gcc.c-torture/execute/pr35456.c
index 175a0b2abfa..17c70bcc4d0 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr35456.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr35456.c
@@ -1,3 +1,4 @@
+/* { dg-skip-if "signed zero not supported" { "vax-*-*" } { "*" } { "" } } */
 extern void abort (void);
 
 double
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr35456.x b/gcc/testsuite/gcc.c-torture/execute/pr35456.x
deleted file mode 100644
index 73b18fb7495..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr35456.x
+++ /dev/null
@@ -1,3 +0,0 @@
-# VAX does not support signed zero.
-if [istarget "vax-*-*"] { return 1 }
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr37573.c b/gcc/testsuite/gcc.c-torture/execute/pr37573.c
index 589191035b9..173a8d47888 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr37573.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr37573.c
@@ -1,4 +1,5 @@
 /* PR tree-optimization/37573 */
+/* { dg-require-effective-target int32plus } */
 
 struct S
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr37573.x b/gcc/testsuite/gcc.c-torture/execute/pr37573.x
deleted file mode 100644
index 7378270cdb0..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr37573.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-        return 1
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr38151.c b/gcc/testsuite/gcc.c-torture/execute/pr38151.c
index 113a255b15e..5ee058ded82 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr38151.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr38151.c
@@ -1,3 +1,4 @@
+/* { dg-options "-Wno-psabi" } */
 void abort (void);
 
 struct S2848
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr38151.x b/gcc/testsuite/gcc.c-torture/execute/pr38151.x
deleted file mode 100644
index cb7b119b8cb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr38151.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-Wno-psabi"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr39228.c b/gcc/testsuite/gcc.c-torture/execute/pr39228.c
index 06d8efd1a5b..dcd8d53f7b5 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr39228.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr39228.c
@@ -1,3 +1,6 @@
+/* { dg-options "-mieee" { target sh*-*-* alpha*-*-* } } */
+/* { dg-skip-if "No Inf/NaN support" { spu-*-* } "*" "" } */
+
 extern void abort (void);
 
 static int __attribute__((always_inline)) testf (float b)
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr39228.x b/gcc/testsuite/gcc.c-torture/execute/pr39228.x
deleted file mode 100644
index a7d8a821e53..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr39228.x
+++ /dev/null
@@ -1,10 +0,0 @@
-if { [istarget "alpha*-*-*"] || [istarget "sh*-*-*"] } {
-	# alpha and SH require -mieee for this test.
-	set additional_flags "-mieee"
-}
-if [istarget "spu-*-*"] {
-	# No Inf/NaN support on SPU.
-	return 1
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr39501.c b/gcc/testsuite/gcc.c-torture/execute/pr39501.c
index 3749d6e7889..9c1868da313 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr39501.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr39501.c
@@ -1,4 +1,8 @@
 /* { dg-options "-ffast-math" } */
+
+extern void abort (void);
+extern void exit (int);
+
 #define min1(a,b) ((a) < (b) ? (a) : (b))
 #define max1(a,b) ((a) > (b) ? (a) : (b))
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr39501.x b/gcc/testsuite/gcc.c-torture/execute/pr39501.x
deleted file mode 100644
index 72527d7b4e9..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr39501.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-ffast-math"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr40386.c b/gcc/testsuite/gcc.c-torture/execute/pr40386.c
index ae0ac5a98f1..59cd6411fbb 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr40386.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr40386.c
@@ -1,4 +1,8 @@
 /* { dg-options "-fno-ira-share-spill-slots" } */
+
+extern void abort (void);
+extern void exit (int);
+
 #define CHAR_BIT 8
 
 #define ROR(a,b) (((a) >> (b)) | ((a) << ((sizeof (a) * CHAR_BIT) - (b))))
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr40386.x b/gcc/testsuite/gcc.c-torture/execute/pr40386.x
deleted file mode 100644
index 12192e203e7..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr40386.x
+++ /dev/null
@@ -1,2 +0,0 @@
-set additional_flags "-fno-ira-share-spill-slots"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr43220.c b/gcc/testsuite/gcc.c-torture/execute/pr43220.c
index 4709f17b5a0..0d6ebfb2734 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr43220.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr43220.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target int32plus } */
+
 void *volatile p;
 
 int
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr43220.x b/gcc/testsuite/gcc.c-torture/execute/pr43220.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr43220.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr44683.c b/gcc/testsuite/gcc.c-torture/execute/pr44683.c
index d0fd446f004..85eb016c544 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr44683.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr44683.c
@@ -1,3 +1,4 @@
+/* { dg-options "-mieee" { target sh*-*-* } } */
 int __attribute__((noinline,noclone))
 copysign_bug (double x)
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr44683.x b/gcc/testsuite/gcc.c-torture/execute/pr44683.x
deleted file mode 100644
index 20413409a20..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr44683.x
+++ /dev/null
@@ -1,6 +0,0 @@
-if { [istarget "sh*-*-*"] } {
-	# SH require -mieee for this test.
-	set additional_flags "-mieee"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr45262.c b/gcc/testsuite/gcc.c-torture/execute/pr45262.c
index 72e186bf287..45cc8de3c59 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr45262.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr45262.c
@@ -1,5 +1,7 @@
 /* PR middle-end/45262 */
 
+/* { dg-require-effective-target int32plus } */
+
 extern void abort (void);
 
 int
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr45262.x b/gcc/testsuite/gcc.c-torture/execute/pr45262.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr45262.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr47237.c b/gcc/testsuite/gcc.c-torture/execute/pr47237.c
index 2100e154099..470c8ee204c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr47237.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr47237.c
@@ -1,3 +1,4 @@
+/* { dg-xfail-if "can cause stack underflow" { nios2-*-* } "*" "" } */
 #define INTEGER_ARG  5
 
 extern void abort(void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr47237.x b/gcc/testsuite/gcc.c-torture/execute/pr47237.x
deleted file mode 100644
index d5d6988f93f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr47237.x
+++ /dev/null
@@ -1,6 +0,0 @@
-if { [istarget "nios2-*-*"] } {
-    # This test can cause the stack to underflow on Nios II.
-    set torture_execute_xfail [istarget]
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr51581-1.c b/gcc/testsuite/gcc.c-torture/execute/pr51581-1.c
index 396b7aab226..14e1e317f5c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr51581-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr51581-1.c
@@ -1,5 +1,7 @@
 /* PR tree-optimization/51581 */
 
+/* { dg-require-effective-target int32plus } */
+
 extern void abort (void);
 
 #define N 4096
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr51581-1.x b/gcc/testsuite/gcc.c-torture/execute/pr51581-1.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr51581-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr51581-2.c b/gcc/testsuite/gcc.c-torture/execute/pr51581-2.c
index dc111c42158..e4345b5fa7c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr51581-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr51581-2.c
@@ -1,4 +1,5 @@
 /* PR tree-optimization/51581 */
+/* { dg-require-effective-target int32plus } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr51581-2.x b/gcc/testsuite/gcc.c-torture/execute/pr51581-2.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr51581-2.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr52979-1.c b/gcc/testsuite/gcc.c-torture/execute/pr52979-1.c
index 246b1fd875d..13ecb793354 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr52979-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr52979-1.c
@@ -1,5 +1,7 @@
 /* PR middle-end/52979 */
 
+/* { dg-require-effective-target int32plus } */
+
 extern void abort (void);
 int c, d, e;
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr52979-1.x b/gcc/testsuite/gcc.c-torture/execute/pr52979-1.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr52979-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr52979-2.c b/gcc/testsuite/gcc.c-torture/execute/pr52979-2.c
index 52f5bb8bdb9..91d4fbca8ac 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr52979-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr52979-2.c
@@ -1,4 +1,5 @@
 /* PR middle-end/52979 */
+/* { dg-require-effective-target int32plus } */
 
 extern void abort (void);
 int c, d, e;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr52979-2.x b/gcc/testsuite/gcc.c-torture/execute/pr52979-2.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr52979-2.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr53366-1.x b/gcc/testsuite/gcc.c-torture/execute/pr53366-1.x
deleted file mode 100644
index eeb38466535..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr53366-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr56799.c b/gcc/testsuite/gcc.c-torture/execute/pr56799.c
index d9ee26bc27f..a8558ea3243 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr56799.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr56799.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 
 #include <stdio.h>
 typedef struct { int x; int y;} S;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr56799.x b/gcc/testsuite/gcc.c-torture/execute/pr56799.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr56799.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr57124.c b/gcc/testsuite/gcc.c-torture/execute/pr57124.c
index 835d249df6a..ca6015872ed 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr57124.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr57124.c
@@ -1,3 +1,9 @@
+/* { dg-require-effective-target int32plus } */
+/* { dg-options "-fno-strict-overflow" } */
+
+extern void abort (void);
+extern void exit (int);
+
 __attribute__ ((noinline))
 foo(short unsigned int *p1, short unsigned int *p2)
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr57124.x b/gcc/testsuite/gcc.c-torture/execute/pr57124.x
deleted file mode 100644
index da6cfd08332..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr57124.x
+++ /dev/null
@@ -1,9 +0,0 @@
-load_lib target-supports.exp
-
-set additional_flags "-fno-strict-overflow"
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr57344-2.c b/gcc/testsuite/gcc.c-torture/execute/pr57344-2.c
index 9bf60cab8f0..599071ba46c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr57344-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr57344-2.c
@@ -1,4 +1,5 @@
 /* PR middle-end/57344 */
+/* { dg-require-effective-target int32plus } */
 
 struct __attribute__((packed)) S
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr57344-2.x b/gcc/testsuite/gcc.c-torture/execute/pr57344-2.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr57344-2.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr58570.c b/gcc/testsuite/gcc.c-torture/execute/pr58570.c
index 6d5116d9ea5..28b6efe8f95 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr58570.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr58570.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 #pragma pack(1)
 struct S
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr58570.x b/gcc/testsuite/gcc.c-torture/execute/pr58570.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr58570.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr60822.c b/gcc/testsuite/gcc.c-torture/execute/pr60822.c
index d2253310e69..dcd24470f3e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr60822.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr60822.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 struct X {
     char fill0[800000];
     int a;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr60822.x b/gcc/testsuite/gcc.c-torture/execute/pr60822.x
deleted file mode 100644
index 4efed4c325f..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr60822.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int32plus] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr7284-1.c b/gcc/testsuite/gcc.c-torture/execute/pr7284-1.c
index de0057cebb0..067f3223bd6 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr7284-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr7284-1.c
@@ -2,6 +2,7 @@
    DR#081), not undefined.  Bug 7284 from Al Grant (AlGrant at
    myrealbox.com).  */
 
+/* { dg-require-effective-target int32plus } */
 /* { dg-options "-std=c89" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr7284-1.x b/gcc/testsuite/gcc.c-torture/execute/pr7284-1.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/pr7284-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/shiftdi.c b/gcc/testsuite/gcc.c-torture/execute/shiftdi.c
index 44f0dfc2bce..7e0409800c4 100644
--- a/gcc/testsuite/gcc.c-torture/execute/shiftdi.c
+++ b/gcc/testsuite/gcc.c-torture/execute/shiftdi.c
@@ -1,3 +1,5 @@
+/* { dg-require-effective-target int32plus } */
+
 /* Failed on sparc with -mv8plus because sparc.c:set_extends() thought
    erroneously that SImode ASHIFT chops the upper bits, it does not.  */
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/shiftdi.x b/gcc/testsuite/gcc.c-torture/execute/shiftdi.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/shiftdi.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/simd-4.c b/gcc/testsuite/gcc.c-torture/execute/simd-4.c
index 5b9c7858518..8a92cfe9073 100644
--- a/gcc/testsuite/gcc.c-torture/execute/simd-4.c
+++ b/gcc/testsuite/gcc.c-torture/execute/simd-4.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target stdint_types } */
 #include <stdint.h>
 typedef int32_t __attribute__((vector_size(8))) v2si;
 int64_t s64;
diff --git a/gcc/testsuite/gcc.c-torture/execute/simd-4.x b/gcc/testsuite/gcc.c-torture/execute/simd-4.x
deleted file mode 100644
index 2e7510c6ddb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/simd-4.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_stdint_types] } {
-	return 0
-}
-
-return 1;
diff --git a/gcc/testsuite/gcc.c-torture/execute/strncmp-1.c b/gcc/testsuite/gcc.c-torture/execute/strncmp-1.c
index dee904ff1e6..c5d39fd09ee 100644
--- a/gcc/testsuite/gcc.c-torture/execute/strncmp-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/strncmp-1.c
@@ -1,3 +1,4 @@
+/* { dg-xfail-if "kernel strncmp does not perform unsigned comparisons" { vxworks_kernel } "*" "" } */
 /* Copyright (C) 2002  Free Software Foundation.
 
    Test strncmp with various combinations of pointer alignments and lengths to
diff --git a/gcc/testsuite/gcc.c-torture/execute/strncmp-1.x b/gcc/testsuite/gcc.c-torture/execute/strncmp-1.x
deleted file mode 100644
index b555e0c8f2a..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/strncmp-1.x
+++ /dev/null
@@ -1,16 +0,0 @@
-if {[istarget i?86-*-vxworks*]
-    || [istarget mips*-*-vxworks*]
-    || [istarget sh*-*-vxworks*]
-    || [istarget sparc*-*-vxworks*]} {
-    # The kernel strncmp doesn't perform unsigned comparisons.
-    set torture_eval_before_execute {
-	global compiler_conditional_xfail_data
-	set compiler_conditional_xfail_data {
-	    "The kernel strncmp doesn't perform unsigned comparisons."
-	    { "*-*-*" }
-	    {}
-	    { "-mrtp" }
-	}
-    }
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/usmul.c b/gcc/testsuite/gcc.c-torture/execute/usmul.c
index 28501b53f5b..42b447a27fc 100644
--- a/gcc/testsuite/gcc.c-torture/execute/usmul.c
+++ b/gcc/testsuite/gcc.c-torture/execute/usmul.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 int __attribute__ ((noinline)) foo (short x, unsigned short y)
 {
   return x * y;
diff --git a/gcc/testsuite/gcc.c-torture/execute/usmul.x b/gcc/testsuite/gcc.c-torture/execute/usmul.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/usmul.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/vrp-5.c b/gcc/testsuite/gcc.c-torture/execute/vrp-5.c
index 8f3c7255a02..8df557cddaa 100644
--- a/gcc/testsuite/gcc.c-torture/execute/vrp-5.c
+++ b/gcc/testsuite/gcc.c-torture/execute/vrp-5.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 extern void exit (int);
 extern void abort ();
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/vrp-5.x b/gcc/testsuite/gcc.c-torture/execute/vrp-5.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/vrp-5.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/vrp-6.c b/gcc/testsuite/gcc.c-torture/execute/vrp-6.c
index 7c6a1750f7d..90ebd2d412c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/vrp-6.c
+++ b/gcc/testsuite/gcc.c-torture/execute/vrp-6.c
@@ -1,3 +1,4 @@
+/* { dg-require-effective-target int32plus } */
 #include <limits.h>
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/vrp-6.x b/gcc/testsuite/gcc.c-torture/execute/vrp-6.x
deleted file mode 100644
index 121fcfecc2c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/vrp-6.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { [check_effective_target_int16] } {
-	return 1
-}
-
-return 0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/zerolen-2.c b/gcc/testsuite/gcc.c-torture/execute/zerolen-2.c
index 446e5828362..4a55acd2a3e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/zerolen-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/zerolen-2.c
@@ -1,3 +1,4 @@
+/* { dg-skip-if "assumes absence of larger-than-word padding" { epiphany-*-* } "*" "" } */
 extern void abort(void);
 
 typedef int word __attribute__((mode(word)));
diff --git a/gcc/testsuite/gcc.c-torture/execute/zerolen-2.x b/gcc/testsuite/gcc.c-torture/execute/zerolen-2.x
deleted file mode 100644
index cee203d27bb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/zerolen-2.x
+++ /dev/null
@@ -1,7 +0,0 @@
-if [istarget "epiphany-*-*"] {
-    # This test assumes the absence of larger-than-word padding.
-    # to make this true for struct foo on epiphany would require
-    # __attribute__((packed,aligned(__alignof__(word)))) .
-    return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/20111227-2.c b/gcc/testsuite/gcc.dg/20111227-2.c
index 692c947e9a8..1266db3116d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20111227-2.c
+++ b/gcc/testsuite/gcc.dg/20111227-2.c
@@ -1,6 +1,6 @@
 /* Testcase derived from 20111227-1.c to ensure that REE is combining
    redundant zero extends with zero extend to wider mode.  */
-/* { dg-options "-fdump-rtl-ree -O" } */
+/* { dg-options "-fdump-rtl-ree -O -free" } */
 extern void abort (void);
 
 unsigned short s;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20111227-3.c b/gcc/testsuite/gcc.dg/20111227-3.c
index d6726c47355..a750db347fa 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20111227-3.c
+++ b/gcc/testsuite/gcc.dg/20111227-3.c
@@ -1,6 +1,6 @@
 /* Testcase derived from 20111227-1.c to ensure that REE is combining
    redundant sign extends with sign extend to wider mode.  */
-/* { dg-options "-fdump-rtl-ree -O" } */
+/* { dg-options "-fdump-rtl-ree -O -free" } */
 
 extern void abort (void);