Make the ieee directory use dg-* annotations instead of separate test setup
files
gcc/testsuite/ChangeLog:
* gcc.c-torture/execute/ieee/ieee.exp: Replace with slightly adapted
copy of
execute/execute.exp.
* gcc.c-torture/execute/ieee/20000320-1.c: Port to the new format.
* gcc.c-torture/execute/ieee/20001122-1.c: Likewise.
* gcc.c-torture/execute/ieee/20010114-2.c: Likewise.
* gcc.c-torture/execute/ieee/20010226-1.c: Likewise.
* gcc.c-torture/execute/ieee/20011123-1.c: Likewise.
* gcc.c-torture/execute/ieee/20030331-1.c: Likewise.
* gcc.c-torture/execute/ieee/20041213-1.c: Likewise.
* gcc.c-torture/execute/ieee/920518-1.c: Likewise.
* gcc.c-torture/execute/ieee/920810-1.c: Likewise.
* gcc.c-torture/execute/ieee/930529-1.c: Likewise.
* gcc.c-torture/execute/ieee/980619-1.c: Likewise.
* gcc.c-torture/execute/ieee/acc1.c: Likewise.
* gcc.c-torture/execute/ieee/acc2.c: Likewise.
* gcc.c-torture/execute/ieee/builtin-nan-1.c: Likewise.
* gcc.c-torture/execute/ieee/cdivchkd.c: Likewise.
* gcc.c-torture/execute/ieee/cdivchkf.c: Likewise.
* gcc.c-torture/execute/ieee/cdivchkld.c: Likewise.
* gcc.c-torture/execute/ieee/compare-fp-1.c: Likewise.
* gcc.c-torture/execute/ieee/compare-fp-2.c: Likewise.
* gcc.c-torture/execute/ieee/compare-fp-3.c: Likewise.
* gcc.c-torture/execute/ieee/compare-fp-4.c: Likewise.
* gcc.c-torture/execute/ieee/copysign1.c: Likewise.
* gcc.c-torture/execute/ieee/copysign2.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-1.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-2.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-3.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-4.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-4e.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-4f.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-4l.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-5.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-6.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-7.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-8.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-8e.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-8f.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-8l.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-9.c: Likewise.
* gcc.c-torture/execute/ieee/fp-cmp-cond-1.c: Likewise.
* gcc.c-torture/execute/ieee/hugeval.c: Likewise.
* gcc.c-torture/execute/ieee/inf-1.c: Likewise.
* gcc.c-torture/execute/ieee/inf-2.c: Likewise.
* gcc.c-torture/execute/ieee/inf-3.c: Likewise.
* gcc.c-torture/execute/ieee/inf-4.c: Likewise.
* gcc.c-torture/execute/ieee/minuszero.c: Likewise.
* gcc.c-torture/execute/ieee/mul-subnormal-single-1.c: Likewise.
* gcc.c-torture/execute/ieee/mzero2.c: Likewise.
* gcc.c-torture/execute/ieee/mzero3.c: Likewise.
* gcc.c-torture/execute/ieee/mzero4.c: Likewise.
* gcc.c-torture/execute/ieee/mzero5.c: Likewise.
* gcc.c-torture/execute/ieee/mzero6.c: Likewise.
* gcc.c-torture/execute/ieee/pr108540-1.c: Likewise.
* gcc.c-torture/execute/ieee/pr108540-2.c: Likewise.
* gcc.c-torture/execute/ieee/pr109008.c: Likewise.
* gcc.c-torture/execute/ieee/pr109386.c: Likewise.
* gcc.c-torture/execute/ieee/pr119002.c: Likewise.
* gcc.c-torture/execute/ieee/pr28634.c: Likewise.
* gcc.c-torture/execute/ieee/pr29302-1.c: Likewise.
* gcc.c-torture/execute/ieee/pr30704.c: Likewise.
* gcc.c-torture/execute/ieee/pr36332.c: Likewise.
* gcc.c-torture/execute/ieee/pr38016.c: Likewise.
* gcc.c-torture/execute/ieee/pr50310.c: Likewise.
* gcc.c-torture/execute/ieee/pr67218.c: Likewise.
* gcc.c-torture/execute/ieee/pr72824-2.c: Likewise.
* gcc.c-torture/execute/ieee/pr72824.c: Likewise.
* gcc.c-torture/execute/ieee/pr84235.c: Likewise.
* gcc.c-torture/execute/ieee/rbug.c: Likewise.
* gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.c: Likewise.
* gcc.c-torture/execute/ieee/unsafe-fp-assoc.c: Likewise.
* gcc.c-torture/execute/ieee/20000320-1.x: Removed.
* gcc.c-torture/execute/ieee/920810-1.x: Removed.
* gcc.c-torture/execute/ieee/980619-1.x: Removed.
* gcc.c-torture/execute/ieee/cdivchkd.x: Removed.
* gcc.c-torture/execute/ieee/cdivchkf.x: Removed.
* gcc.c-torture/execute/ieee/cdivchkld.x: Removed.
* gcc.c-torture/execute/ieee/compare-fp-3.x: Removed.
* gcc.c-torture/execute/ieee/compare-fp-4.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-1.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-2.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-3.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-4.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-4f.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-4l.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-6.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-7.x: Removed.
* gcc.c-torture/execute/ieee/fp-cmp-9.x: Removed.
* gcc.c-torture/execute/ieee/hugeval.x: Removed.
* gcc.c-torture/execute/ieee/mul-subnormal-single-1.x: Removed.
* gcc.c-torture/execute/ieee/mzero2.x: Removed.
* gcc.c-torture/execute/ieee/pr108540-1.x: Removed.
* gcc.c-torture/execute/ieee/pr29302-1.x: Removed.
* gcc.c-torture/execute/ieee/pr30704.x: Removed.
* gcc.c-torture/execute/ieee/pr38016.x: Removed.
* gcc.c-torture/execute/ieee/rbug.x: Removed.
* gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.x: Removed.
---
.../gcc.c-torture/execute/ieee/20000320-1.c | 12 +++++++
.../gcc.c-torture/execute/ieee/20000320-1.x | 15 --------
.../gcc.c-torture/execute/ieee/20001122-1.c | 1 +
.../gcc.c-torture/execute/ieee/20010114-2.c | 1 +
.../gcc.c-torture/execute/ieee/20010226-1.c | 1 +
.../gcc.c-torture/execute/ieee/20011123-1.c | 1 +
.../gcc.c-torture/execute/ieee/20030331-1.c | 1 +
.../gcc.c-torture/execute/ieee/20041213-1.c | 1 +
.../gcc.c-torture/execute/ieee/920518-1.c | 1 +
.../gcc.c-torture/execute/ieee/920810-1.c | 2 ++
.../gcc.c-torture/execute/ieee/920810-1.x | 4 ---
.../gcc.c-torture/execute/ieee/930529-1.c | 1 +
.../gcc.c-torture/execute/ieee/980619-1.c | 1 +
.../gcc.c-torture/execute/ieee/980619-1.x | 15 --------
.../gcc.c-torture/execute/ieee/acc1.c | 1 +
.../gcc.c-torture/execute/ieee/acc2.c | 1 +
.../execute/ieee/builtin-nan-1.c | 1 +
.../gcc.c-torture/execute/ieee/cdivchkd.c | 5 +++
.../gcc.c-torture/execute/ieee/cdivchkd.x | 5 ---
.../gcc.c-torture/execute/ieee/cdivchkf.c | 5 +++
.../gcc.c-torture/execute/ieee/cdivchkf.x | 5 ---
.../gcc.c-torture/execute/ieee/cdivchkld.c | 3 ++
.../gcc.c-torture/execute/ieee/cdivchkld.x | 4 ---
.../gcc.c-torture/execute/ieee/compare-fp-1.c | 1 +
.../gcc.c-torture/execute/ieee/compare-fp-2.c | 1 +
.../gcc.c-torture/execute/ieee/compare-fp-3.c | 3 ++
.../gcc.c-torture/execute/ieee/compare-fp-3.x | 2 --
.../gcc.c-torture/execute/ieee/compare-fp-4.c | 8 +++++
.../gcc.c-torture/execute/ieee/compare-fp-4.x | 17 ----------
.../gcc.c-torture/execute/ieee/copysign1.c | 1 +
.../gcc.c-torture/execute/ieee/copysign2.c | 1 +
.../gcc.c-torture/execute/ieee/fp-cmp-1.c | 8 +++++
.../gcc.c-torture/execute/ieee/fp-cmp-1.x | 18 ----------
.../gcc.c-torture/execute/ieee/fp-cmp-2.c | 8 +++++
.../gcc.c-torture/execute/ieee/fp-cmp-2.x | 18 ----------
.../gcc.c-torture/execute/ieee/fp-cmp-3.c | 8 +++++
.../gcc.c-torture/execute/ieee/fp-cmp-3.x | 18 ----------
.../gcc.c-torture/execute/ieee/fp-cmp-4.c | 3 ++
.../gcc.c-torture/execute/ieee/fp-cmp-4.x | 2 --
.../gcc.c-torture/execute/ieee/fp-cmp-4e.c | 1 +
.../gcc.c-torture/execute/ieee/fp-cmp-4f.c | 2 ++
.../gcc.c-torture/execute/ieee/fp-cmp-4f.x | 2 --
.../gcc.c-torture/execute/ieee/fp-cmp-4l.c | 3 ++
.../gcc.c-torture/execute/ieee/fp-cmp-4l.x | 2 --
.../gcc.c-torture/execute/ieee/fp-cmp-5.c | 1 +
.../gcc.c-torture/execute/ieee/fp-cmp-6.c | 6 ++++
.../gcc.c-torture/execute/ieee/fp-cmp-6.x | 17 ----------
.../gcc.c-torture/execute/ieee/fp-cmp-7.c | 3 ++
.../gcc.c-torture/execute/ieee/fp-cmp-7.x | 2 --
.../gcc.c-torture/execute/ieee/fp-cmp-8.c | 1 +
.../gcc.c-torture/execute/ieee/fp-cmp-8e.c | 1 +
.../gcc.c-torture/execute/ieee/fp-cmp-8f.c | 1 +
.../gcc.c-torture/execute/ieee/fp-cmp-8l.c | 1 +
.../gcc.c-torture/execute/ieee/fp-cmp-9.c | 5 +++
.../gcc.c-torture/execute/ieee/fp-cmp-9.x | 16 ---------
.../execute/ieee/fp-cmp-cond-1.c | 1 +
.../gcc.c-torture/execute/ieee/hugeval.c | 3 ++
.../gcc.c-torture/execute/ieee/hugeval.x | 26 --------------
.../gcc.c-torture/execute/ieee/ieee.exp | 34 ++++---------------
.../gcc.c-torture/execute/ieee/inf-1.c | 1 +
.../gcc.c-torture/execute/ieee/inf-2.c | 1 +
.../gcc.c-torture/execute/ieee/inf-3.c | 1 +
.../gcc.c-torture/execute/ieee/inf-4.c | 1 +
.../gcc.c-torture/execute/ieee/minuszero.c | 1 +
.../execute/ieee/mul-subnormal-single-1.c | 15 ++++++++
.../execute/ieee/mul-subnormal-single-1.x | 21 ------------
.../gcc.c-torture/execute/ieee/mzero2.c | 2 ++
.../gcc.c-torture/execute/ieee/mzero2.x | 6 ----
.../gcc.c-torture/execute/ieee/mzero3.c | 1 +
.../gcc.c-torture/execute/ieee/mzero4.c | 1 +
.../gcc.c-torture/execute/ieee/mzero5.c | 1 +
.../gcc.c-torture/execute/ieee/mzero6.c | 1 +
.../gcc.c-torture/execute/ieee/pr108540-1.c | 2 ++
.../gcc.c-torture/execute/ieee/pr108540-1.x | 7 ----
.../gcc.c-torture/execute/ieee/pr108540-2.c | 1 +
.../gcc.c-torture/execute/ieee/pr109008.c | 1 +
.../gcc.c-torture/execute/ieee/pr109386.c | 1 +
.../gcc.c-torture/execute/ieee/pr119002.c | 1 +
.../gcc.c-torture/execute/ieee/pr28634.c | 1 +
.../gcc.c-torture/execute/ieee/pr29302-1.c | 2 ++
.../gcc.c-torture/execute/ieee/pr29302-1.x | 6 ----
.../gcc.c-torture/execute/ieee/pr30704.c | 4 +++
.../gcc.c-torture/execute/ieee/pr30704.x | 5 ---
.../gcc.c-torture/execute/ieee/pr36332.c | 1 +
.../gcc.c-torture/execute/ieee/pr38016.c | 2 ++
.../gcc.c-torture/execute/ieee/pr38016.x | 2 --
.../gcc.c-torture/execute/ieee/pr50310.c | 1 +
.../gcc.c-torture/execute/ieee/pr67218.c | 1 +
.../gcc.c-torture/execute/ieee/pr72824-2.c | 1 +
.../gcc.c-torture/execute/ieee/pr72824.c | 1 +
.../gcc.c-torture/execute/ieee/pr84235.c | 1 +
.../gcc.c-torture/execute/ieee/rbug.c | 5 +++
.../gcc.c-torture/execute/ieee/rbug.x | 10 ------
.../execute/ieee/unsafe-fp-assoc-1.c | 4 +++
.../execute/ieee/unsafe-fp-assoc-1.x | 5 ---
.../execute/ieee/unsafe-fp-assoc.c | 1 +
96 files changed, 174 insertions(+), 277 deletions(-)
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x
delete mode 100644
gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/rbug.x
delete mode 100644 gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.x
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.c
index 600352ef770..9970f5262ac 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.c
@@ -1,3 +1,15 @@
+/* { dg-do run }
+
+ # AVR doubles are floats
+ { dg-skip-if "AVR doubles are floats" { avr-*-* } }
+
+ # ColdFire FPUs require software handling of subnormals. We are
+ # not aware of any system that has this.
+ { dg-xfail-if "" { m68k-*-* && coldfire_fpu } }
+
+ # C6X floating point hardware turns denormals to zero in FP conversions.
+ { dg-xfail-if "" { tic6x-*-* && ti_c67x } } */
+
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.x
deleted file mode 100644
index e05e854846e..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20000320-1.x
+++ /dev/null
@@ -1,15 +0,0 @@
-if {[istarget "m68k-*-*"] && [check_effective_target_coldfire_fpu]} {
- # ColdFire FPUs require software handling of subnormals. We are
- # not aware of any system that has this.
- set torture_execute_xfail "m68k-*-*"
-}
-if [istarget "avr-*-*"] {
- # AVR doubles are floats
- return 1
-}
-if { [istarget "tic6x-*-*"] && [check_effective_target_ti_c67x] } {
- # C6X floating point hardware turns denormals to zero in FP conversions.
- set torture_execute_xfail "tic6x-*-*"
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20001122-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/20001122-1.c
index 422d2b39250..f1e2004660d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20001122-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20001122-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20010114-2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/20010114-2.c
index e5ab9485ffe..4569a30983e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20010114-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20010114-2.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
extern void exit (int);
extern void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20010226-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/20010226-1.c
index 6a862209759..5e067721a98 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20010226-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20010226-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
#include <float.h>
void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20011123-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/20011123-1.c
index c4a15242156..bf1dc260f2b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20011123-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20011123-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20030331-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/20030331-1.c
index 64d87e13b68..dbab4808755 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20030331-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20030331-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
extern void exit (int);
extern void abort (void);
float x = -1.5f;
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c
index 6830359e1f9..477250a2a93 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
#if defined (__AVR__) && (__SIZEOF_DOUBLE__ == __SIZEOF_FLOAT__)
extern double sqrt (double) __asm ("sqrtf");
#else
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/920518-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/920518-1.c
index cea13971bd1..ba57e2751b2 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/920518-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/920518-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.c
index 00dbc5ef771..0dcf03c938d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.c
@@ -1,3 +1,5 @@
+/* { dg-do run }
+ { dg-additional-options "-Wl,-u,_printf_float" { target newlib_nano_io } }
*/
#include <stdio.h>
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.x
deleted file mode 100644
index 8edec730dce..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/920810-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-if { [check_effective_target_newlib_nano_io] } {
- lappend additional_flags "-Wl,-u,_printf_float"
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/930529-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/930529-1.c
index 24b057ec9cd..3abd3b110cf 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/930529-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/930529-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.c
index 53065475bda..8c25fc2639b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.x
deleted file mode 100644
index 4e65f3abda8..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/980619-1.x
+++ /dev/null
@@ -1,15 +0,0 @@
-# This used to fail on ia32, with or without -ffloat-store.
-# It works now, but some people think that's a fluke, so I'm
-# keeping this around just in case.
-
-#set torture_eval_before_execute {
-#
-# set compiler_conditional_xfail_data {
-# "ia32 fp rounding isn't pedantic" \
-# "i?86-*-*" \
-# { "-O3" "-O2" "-O1" "-Os"} \
-# { "" }
-# }
-#}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/acc1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/acc1.c
index 99e78ee79bf..c75c7cda543 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/acc1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/acc1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Tail call optimizations would reverse the order of additions in func(). */
void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/acc2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/acc2.c
index 128f11e9000..0a8b35b9ca2 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/acc2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/acc2.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Tail call optimizations would reverse the order of multiplications
in func(). */
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/builtin-nan-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/builtin-nan-1.c
index a487dd4afd9..24348de13d1 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/builtin-nan-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/builtin-nan-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR middle-end/19983 */
typedef __SIZE_TYPE__ size_t;
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.c
index 3ef5fadcf2a..3ee44ca48ae 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.c
@@ -1,3 +1,8 @@
+/* { dg-do run }
+
+ # Floating-point support is incomplete.
+ { dg-skip-if "AVR doubles are floats" { avr-*-* } } */
+
/*
Program to test complex divide for correct results on selected values.
Checking known failure points.
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.x
deleted file mode 100644
index 7c575fceae8..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkd.x
+++ /dev/null
@@ -1,5 +0,0 @@
-if [istarget "avr-*-*"] {
- # Floating-point support is incomplete.
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.c
index 86ef69f8771..24b439e3905 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.c
@@ -1,3 +1,8 @@
+/* { dg-do run }
+
+ # Floating-point support is incomplete.
+ { dg-skip-if "AVR doubles are floats" { avr-*-* } } */
+
/*
Program to test complex divide for correct results on selected values.
Checking known failure points.
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.x
deleted file mode 100644
index 7c575fceae8..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkf.x
+++ /dev/null
@@ -1,5 +0,0 @@
-if [istarget "avr-*-*"] {
- # Floating-point support is incomplete.
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.c
index ffe9c346ad3..fd0b3dbe1c5 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.c
@@ -1,3 +1,6 @@
+/* { dg-do run }
+ { dg-require-effective-target c99_runtime } */
+
/*
Program to test complex divide for correct results on selected values.
Checking known failure points.
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.x
deleted file mode 100644
index f798152c280..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/cdivchkld.x
+++ /dev/null
@@ -1,4 +0,0 @@
-if { [check_effective_target_c99_runtime] } {
- return 0
-}
-return 1
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-1.c
index 81642534cc3..30dbb20e746 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Copyright (C) 2004 Free Software Foundation.
Test for correctness of composite floating-point comparisons.
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-2.c
index 1f78a435a92..3979f2853c1 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-2.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Copyright (C) 2004 Free Software Foundation.
Ensure that the composite comparison optimization doesn't misfire
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.c
index 03e6ff2c506..4758699ed28 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.c
@@ -1,3 +1,6 @@
+/* { dg-do run }
+ { dg-additional-options "-fno-trapping-math" } */
+
/* Copyright (C) 2004 Free Software Foundation.
Test for composite comparison always true/false optimization.
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.x
deleted file mode 100644
index 35f7a0a7d99..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-3.x
+++ /dev/null
@@ -1,2 +0,0 @@
-lappend additional_flags "-fno-trapping-math"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.c
index 40fc9c0c394..070fd67dff6 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.c
@@ -1,3 +1,11 @@
+/* { dg-do run }
+ { dg-additional-options "-fno-trapping-math" }
+
+ # The ARM VxWorks kernel uses an external floating-point library in
+ # which routines like __ledf2 are just aliases for __cmpdf2. These
+ # routines therefore don't handle NaNs correctly.
+ { dg-xfail-if "" { arm*-*-vxworks* } } */
+
/* Copyright (C) 2004 Free Software Foundation.
Test for correctness of composite floating-point comparisons.
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.x
deleted file mode 100644
index 510a30909ea..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/compare-fp-4.x
+++ /dev/null
@@ -1,17 +0,0 @@
-# The ARM VxWorks kernel uses an external floating-point library in
-# which routines like __ledf2 are just aliases for __cmpdf2. These
-# routines therefore don't handle NaNs correctly.
-if [istarget "arm*-*-vxworks*"] {
- set torture_eval_before_execute {
- global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data {
- "The ARM kernel uses a flawed floating-point library."
- { "*-*-*" }
- {}
- { "-mrtp" }
- }
- }
-}
-
-lappend additional_flags "-fno-trapping-math"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/copysign1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/copysign1.c
index 034645a1192..9350b4f6824 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/copysign1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/copysign1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
#include <string.h>
#include <stdlib.h>
#include <float.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/copysign2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/copysign2.c
index 8e176661e1d..949b6afb33e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/copysign2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/copysign2.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
#include <string.h>
#include <stdlib.h>
#include <float.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.c
index 7780b8c152f..99dda8876da 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.c
@@ -1,3 +1,11 @@
+/* { dg-do run }
+ { dg-additional-options "-std=gnu17" }
+
+ # The ARM VxWorks kernel uses an external floating-point library in
+ # which routines like __ledf2 are just aliases for __cmpdf2. These
+ # routines therefore don't handle NaNs correctly.
+ { dg-xfail-if "" { arm*-*-vxworks* } } */
+
#ifndef SIGNAL_SUPPRESS
#include <signal.h>
#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.x
deleted file mode 100644
index ec107bc50c3..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-1.x
+++ /dev/null
@@ -1,18 +0,0 @@
-# The ARM VxWorks kernel uses an external floating-point library in
-# which routines like __ledf2 are just aliases for __cmpdf2. These
-# routines therefore don't handle NaNs correctly.
-if [istarget "arm*-*-vxworks*"] {
- set torture_eval_before_execute {
- global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data {
- "The ARM kernel uses a flawed floating-point library."
- { "*-*-*" }
- {}
- { "-mrtp" }
- }
- }
-}
-
-lappend additional_flags "-std=gnu17"
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.c
index b1b5c7dc765..aa015ce6884 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.c
@@ -1,3 +1,11 @@
+/* { dg-do run }
+ { dg-additional-options "-std=gnu17" }
+
+ # The ARM VxWorks kernel uses an external floating-point library in
+ # which routines like __ledf2 are just aliases for __cmpdf2. These
+ # routines therefore don't handle NaNs correctly.
+ { dg-xfail-if "" { arm*-*-vxworks* } } */
+
#ifndef SIGNAL_SUPPRESS
#include <signal.h>
#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.x
deleted file mode 100644
index ec107bc50c3..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-2.x
+++ /dev/null
@@ -1,18 +0,0 @@
-# The ARM VxWorks kernel uses an external floating-point library in
-# which routines like __ledf2 are just aliases for __cmpdf2. These
-# routines therefore don't handle NaNs correctly.
-if [istarget "arm*-*-vxworks*"] {
- set torture_eval_before_execute {
- global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data {
- "The ARM kernel uses a flawed floating-point library."
- { "*-*-*" }
- {}
- { "-mrtp" }
- }
- }
-}
-
-lappend additional_flags "-std=gnu17"
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.c
index e6b77345098..68923f12cf9 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.c
@@ -1,3 +1,11 @@
+/* { dg-do run }
+ { dg-additional-options "-std=gnu17" }
+
+ # The ARM VxWorks kernel uses an external floating-point library in
+ # which routines like __ledf2 are just aliases for __cmpdf2. These
+ # routines therefore don't handle NaNs correctly.
+ { dg-xfail-if "" { arm*-*-vxworks* } } */
+
#ifndef SIGNAL_SUPPRESS
#include <signal.h>
#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.x
deleted file mode 100644
index ec107bc50c3..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-3.x
+++ /dev/null
@@ -1,18 +0,0 @@
-# The ARM VxWorks kernel uses an external floating-point library in
-# which routines like __ledf2 are just aliases for __cmpdf2. These
-# routines therefore don't handle NaNs correctly.
-if [istarget "arm*-*-vxworks*"] {
- set torture_eval_before_execute {
- global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data {
- "The ARM kernel uses a flawed floating-point library."
- { "*-*-*" }
- {}
- { "-mrtp" }
- }
- }
-}
-
-lappend additional_flags "-std=gnu17"
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.c
index fd002735400..17de25fda56 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.c
@@ -1,3 +1,6 @@
+/* { dg-do run }
+ { dg-additional-options "-std=gnu17" } */
+
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.x
deleted file mode 100644
index 9baf8e1cbbb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4.x
+++ /dev/null
@@ -1,2 +0,0 @@
-lappend additional_flags "-std=gnu17"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4e.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4e.c
index c8cacb27a55..c1cdb94e97b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4e.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4e.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
#if defined (__ia64__) && defined (__hpux__)
#define FLOAT __float80
#include "fp-cmp-4.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.c
index 6221b250dff..4420c6e73f3 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.c
@@ -1,2 +1,4 @@
+/* { dg-do run }
+ { dg-additional-options "-std=gnu17" } */
#define FLOAT float
#include "fp-cmp-4.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.x
deleted file mode 100644
index 9baf8e1cbbb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4f.x
+++ /dev/null
@@ -1,2 +0,0 @@
-lappend additional_flags "-std=gnu17"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.c
index 5ac8b7565b5..7d2c6c535dd 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.c
@@ -1,2 +1,5 @@
+/* { dg-do run }
+ { dg-additional-options "-std=gnu17" } */
+
#define FLOAT long double
#include "fp-cmp-4.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.x
deleted file mode 100644
index 9baf8e1cbbb..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-4l.x
+++ /dev/null
@@ -1,2 +0,0 @@
-lappend additional_flags "-std=gnu17"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-5.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-5.c
index 129abf90000..ad8275a49cb 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-5.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-5.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Like fp-cmp-4.c, but test that the setcc patterns are correct. */
void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.c
index 0c5f67aea57..54aa997f436 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.c
@@ -1,3 +1,9 @@
+/* { dg-do run }
+
+ # The ARM VxWorks kernel uses an external floating-point library in
+ # which routines like __ledf2 are just aliases for __cmpdf2. These
+ # routines therefore don't handle NaNs correctly.
+ { dg-xfail-if "" { arm*-*-vxworks* } } */
const double dnan = 1.0/0.0 - 1.0/0.0;
double x = 1.0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.x
deleted file mode 100644
index 6655a07ab3c..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-6.x
+++ /dev/null
@@ -1,17 +0,0 @@
-lappend additional_flags "-fno-trapping-math"
-# The ARM VxWorks kernel uses an external floating-point library in
-# which routines like __ledf2 are just aliases for __cmpdf2. These
-# routines therefore don't handle NaNs correctly.
-if [istarget "arm*-*-vxworks*"] {
- set torture_eval_before_execute {
- global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data {
- "The ARM kernel uses a flawed floating-point library."
- { "*-*-*" }
- { "-O0" }
- { "-mrtp" }
- }
- }
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.c
index 385acafc204..6b058b333bc 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.c
@@ -1,3 +1,6 @@
+/* { dg-do run }
+ { dg-additional-options "-fno-trapping-math" } */
+
extern void link_error ();
void foo(double x)
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.x
deleted file mode 100644
index 35f7a0a7d99..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-7.x
+++ /dev/null
@@ -1,2 +0,0 @@
-lappend additional_flags "-fno-trapping-math"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8.c
index f351415dce3..4576eff151b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8e.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8e.c
index acb83f67fda..63baa6e55c5 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8e.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8e.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
#if defined (__ia64__) && defined (__hpux__)
#define FLOAT __float80
#include "fp-cmp-8.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8f.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8f.c
index 9826ec916d2..384d01ca0bb 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8f.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8f.c
@@ -1,2 +1,3 @@
+/* { dg-do run } */
#define FLOAT float
#include "fp-cmp-8.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8l.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8l.c
index 528eeb0ab7b..c0b0ed9c16f 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8l.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-8l.c
@@ -1,2 +1,3 @@
+/* { dg-do run } */
#define FLOAT long double
#include "fp-cmp-8.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.c
index 6352dddec61..fcfb8cb8eca 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.c
@@ -1,4 +1,9 @@
+/* { dg-do run }
+ # The ARM VxWorks kernel uses an external floating-point library in
+ # which routines like __ledf2 are just aliases for __cmpdf2. These
+ # routines therefore don't handle NaNs correctly.
+ { dg-xfail-if "" { arm*-*-vxworks* } } */
const double dnan = 1.0/0.0 - 1.0/0.0;
double x = 1.0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.x
deleted file mode 100644
index e7c051d8fe0..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-9.x
+++ /dev/null
@@ -1,16 +0,0 @@
-# The ARM VxWorks kernel uses an external floating-point library in
-# which routines like __ledf2 are just aliases for __cmpdf2. These
-# routines therefore don't handle NaNs correctly.
-if [istarget "arm*-*-vxworks*"] {
- set torture_eval_before_execute {
- global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data {
- "The ARM kernel uses a flawed floating-point library."
- { "*-*-*" }
- { "-O0" }
- { "-mrtp" }
- }
- }
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-cond-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-cond-1.c
index 4a3c4b0eee2..0e8f0a8d804 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-cond-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/fp-cmp-cond-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR tree-optimization/111109 */
/*
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.c
index 8e1eafec7c9..89784c4def7 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.c
@@ -1,3 +1,6 @@
+/* { dg-do run }
+ { dg-xfail-if "" { *-*-vxworks* } }
+ { dg-xfail-if "" { tic6x-*-* && ti_c67x } } */
#include <math.h>
void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x
deleted file mode 100644
index a6dad81f78a..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/hugeval.x
+++ /dev/null
@@ -1,26 +0,0 @@
-# This test fails under hpux 9.X and 10.X because HUGE_VAL is DBL_MAX
-# instead of +Infinity.
-
-global target_triplet
-
-# VxWorks kernel mode has the same problem.
-if {[istarget "*-*-vxworks*"]} {
- set torture_eval_before_execute {
- global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data {
- "The kernel HUGE_VAL is defined to DBL_MAX instead of +Inf."
- { "*-*-*" }
- {}
- { "-mrtp" }
- }
- }
-}
-
-if { [istarget "tic6x-*-*"] && [check_effective_target_ti_c67x] } {
- # C6X uses -freciprocal-math by default.
- set torture_execute_xfail "$target_triplet"
- return 1
-}
-
-return 0
-
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp
b/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp
index 297d92d9045..8bb74d3ccb0 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp
@@ -21,8 +21,6 @@
# Load support procs.
load_lib gcc-dg.exp
-load_lib torture-options.exp
-load_lib c-torture.exp
# These tests come from Torbjorn Granlund's ([email protected])
# C torture test suite, and other contributors.
@@ -30,13 +28,6 @@ load_lib c-torture.exp
# Disable tests on machines with no hardware support for IEEE arithmetic.
if { [istarget "vax-*-*"] || [ istarget "powerpc-*-*spe"] || [istarget
"pdp11-*-*"] } { return }
-if $tracelevel then {
- strace $tracelevel
-}
-
-torture-init
-set-torture-options $C_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS
-
set additional_flags "-fno-inline"
# We must use -ffloat-store/-mieee to ensure that excess precision on some
@@ -48,7 +39,7 @@ if { ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"])
if [istarget "m68k-*-*"] then {
lappend additional_flags "-ffloat-store"
}
-if { [istarget "alpha*-*-*"]
+if { [istarget "alpha*-*-*"]
|| [istarget "sh*-*-*"] } then {
lappend additional_flags "-mieee"
}
@@ -60,25 +51,14 @@ if { ![check_effective_target_signal] } {
lappend additional_flags "-DSIGNAL_SUPPRESS"
}
-# load support procs
-load_lib c-torture.exp
-
# initialize harness
-gcc_init
+dg-init
-#
# 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 $additional_flags
-}
+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}
# All done.
-torture-finish
-gcc_finish
+dg-finish
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-1.c
index 34f60f3f1c0..3ffb0a2400e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-1.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
extern void abort (void);
int main()
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-2.c
index 50124b28736..06e9ad8cf9b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-2.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
extern void abort (void);
void test(double f, double i)
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-3.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-3.c
index f2ee4806265..399e855170f 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-3.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-3.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
extern void abort (void);
void test(double f, double i)
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-4.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-4.c
index 119775d7b89..c0dae590df1 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/inf-4.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/inf-4.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
__attribute__((noipa)) int
foo (double a, double b)
{
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/minuszero.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/minuszero.c
index 9fd549d07e9..3259ebb23c6 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/minuszero.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/minuszero.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
void abort (void);
void exit (int);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.c
index 31b3cbbf599..f57c8903cf6 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.c
@@ -1,3 +1,18 @@
+/* { dg-do run }
+ # C6X floating point hardware turns denormals to zero in multiplications.
+ { dg-xfail-if "" { tic6x-*-* && ti_c67x } }
+
+ # ColdFire FPUs require software handling of subnormals. We are
+ # not aware of any system that has this.
+ { dg-xfail-if "" { m68k-*-* && coldfire_fpu } }
+
+ # The C-SKY hardware FPU only supports flush-to-zero mode.
+ { dg-xfail-if "" { csky-*-* && hard_float } }
+
+ # The Epiphany single-precision floating point format does not
+ # support subnormals.
+ { dg-skip-if "" { epiphany-*-* } } */
+
/* Check that certain subnormal numbers (formerly known as denormalized
numbers) are rounded to within 0.5 ulp. PR other/14354. */
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.x
deleted file mode 100644
index bf170819920..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mul-subnormal-single-1.x
+++ /dev/null
@@ -1,21 +0,0 @@
-if {[istarget "csky-*-*"] && [check_effective_target_hard_float]} {
- # The C-SKY hardware FPU only supports flush-to-zero mode.
- set torture_execute_xfail "csky-*-*"
- return 1
-}
-if [istarget "epiphany-*-*"] {
- # The Epiphany single-precision floating point format does not
- # support subnormals.
- return 1
-}
-if {[istarget "m68k-*-*"] && [check_effective_target_coldfire_fpu]} {
- # ColdFire FPUs require software handling of subnormals. We are
- # not aware of any system that has this.
- set torture_execute_xfail "m68k-*-*"
-}
-if { [istarget "tic6x-*-*"] && [check_effective_target_ti_c67x] } {
- # C6X floating point hardware turns denormals to zero in multiplications.
- set torture_execute_xfail "tic6x-*-*"
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.c
index 65facaff51f..a39c0a4f5dd 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.c
@@ -1,3 +1,5 @@
+/* { dg-do run }
+ { dg-xfail-if "" { "i?86-*-freebsd*\[123\]\.*" } } */
/* Test IEEE +0/-0 rules */
void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.x
deleted file mode 100644
index 0b3ec4c00d7..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero2.x
+++ /dev/null
@@ -1,6 +0,0 @@
-# freebsd sets up the fpu with a different precision control which causes
-# this test to "fail".
-if { [istarget "i?86-*-freebsd*\[123\]\.*"] } {
- set torture_execute_xfail "i?86-*-freebsd*"
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero3.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero3.c
index 46cab4664d5..aa0e422d23d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero3.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero3.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Copyright (C) 2002 Free Software Foundation.
by Hans-Peter Nilsson <[email protected]>, derived from mzero2.c
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero4.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero4.c
index 0ede7ec9598..cb9f9c06520 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero4.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero4.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Copyright (C) 2003 Free Software Foundation.
by Roger Sayle <[email protected]>, derived from mzero3.c
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero5.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero5.c
index 6c236394975..7145faab138 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero5.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero5.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Test gcse handling of IEEE 0/-0 rules. */
void abort (void);
static double zero = 0.0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero6.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero6.c
index 7a2616a2017..6c832482b67 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/mzero6.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/mzero6.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* Tail call optimizations would convert func() into the moral equivalent of:
double acc = 0.0;
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.c
index db094418a79..dadae01e1f0 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.c
@@ -1,3 +1,5 @@
+/* { dg-do run }
+ { dg-require-effective-target double64 } */
/* PR tree-optimization/108540 */
__attribute__((noipa)) void
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.x
deleted file mode 100644
index 06d93efeb99..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-1.x
+++ /dev/null
@@ -1,7 +0,0 @@
-load_lib target-supports.exp
-
-if { ! [check_effective_target_double64] } {
- return 1
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-2.c
index f1b13c9060a..a3cd034227b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr108540-2.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR tree-optimization/108540 */
__attribute__((noipa)) int
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr109008.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr109008.c
index 610aed4cac0..3940b0e226d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr109008.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr109008.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR tree-optimization/109008 */
__attribute__((noipa)) double
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr109386.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr109386.c
index 98895d1e8ae..bf2a78e3a07 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr109386.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr109386.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR tree-optimization/109386 */
static inline float
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr119002.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr119002.c
index af1a705f170..5cf63954e1e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr119002.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr119002.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR rtl-optimization/119002 */
__attribute__((noipa)) unsigned int
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr28634.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr28634.c
index eaf13b0f860..f00cfd46840 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr28634.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr28634.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR rtl-optimization/28634. On targets with delayed branches,
dbr_schedule could do the next iteration's addition in the
branch delay slot, then subtract the value again if the branch
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.c
index f6f3dd2cd53..73b1a8a803f 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.c
@@ -1,3 +1,5 @@
+/* { dg-do run }
+ { dg-xfail-if "" { tic6x-*-* && ti_c67x } } */
extern void abort (void);
int main (void)
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.x
deleted file mode 100644
index 3ae2096f703..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr29302-1.x
+++ /dev/null
@@ -1,6 +0,0 @@
-if { [istarget "tic6x-*-*"] && [check_effective_target_ti_c67x] } {
- # C6X uses -freciprocal-math by default.
- set torture_execute_xfail "tic6x-*-*"
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.c
index 2b63e67a0bd..925a79d06de 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.c
@@ -1,3 +1,7 @@
+/* { dg-do run }
+
+ # Floating-point support is incomplete.
+ { dg-skip-if "AVR doubles are floats" { avr-*-* } } */
/* PR middle-end/30704 */
typedef __SIZE_TYPE__ size_t;
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.x
deleted file mode 100644
index 1e111fc2c83..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr30704.x
+++ /dev/null
@@ -1,5 +0,0 @@
-if [istarget "avr-*-*"] {
- # AVR doubles are floats
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr36332.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr36332.c
index 325ac88b800..75418326a1c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr36332.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr36332.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR target/36332 */
int
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.c
index 1fc0834885d..56b63bdced8 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.c
@@ -1 +1,3 @@
+/* { dg-do run }
+ { dg-additional-options "-fno-ivopts -fno-gcse" } */
#include "fp-cmp-8.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.x
deleted file mode 100644
index b70c87439a0..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr38016.x
+++ /dev/null
@@ -1,2 +0,0 @@
-lappend additional_flags "-fno-ivopts" "-fno-gcse"
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr50310.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr50310.c
index 8d323ca78f6..9ff0c2c51cd 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr50310.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr50310.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR target/50310 */
extern void abort (void);
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr67218.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr67218.c
index 2a1260a7aa0..a9fb3c1748b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr67218.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr67218.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
extern void abort (void) __attribute__ ((noreturn));
double __attribute__ ((noinline, noclone))
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824-2.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824-2.c
index 0622d01d21b..117c2585cbd 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824-2.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR tree-optimization/72824 */
typedef float V __attribute__((vector_size (4 * sizeof (float))));
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824.c
index 1c213733ca1..5092c463b7d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr72824.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR tree-optimization/72824 */
static inline void
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/pr84235.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/pr84235.c
index 479b2b0f6ab..f01760a75da 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/pr84235.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/pr84235.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
/* PR tree-optimization/84235 */
int
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.c
index b568097a45e..bc58d4ad6fe 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.c
@@ -1,3 +1,8 @@
+/* { dg-do run }
+
+ # AVR doubles are floats
+ { dg-skip-if "AVR doubles are floats" { avr-*-* } }
+ { dg-skip-if "AVR doubles are floats" { d10v-*-* } { "*" } { "*-mdouble64*"
} } */
#if defined(__i386__) && defined(__FreeBSD__)
#include <ieeefp.h>
#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.x
deleted file mode 100644
index 2664174e05a..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.x
+++ /dev/null
@@ -1,10 +0,0 @@
-# This doesn't work on d10v if doubles are not 64 bits
-
-if { [istarget "d10v-*-*"] && ! [string-match "*-mdouble64*" $CFLAGS] } {
- set torture_execute_xfail "d10v-*-*"
-}
-if [istarget "avr-*-*"] {
- # AVR doubles are floats
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.c
index 7021b99ad7f..b034ec3287e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.c
@@ -1,3 +1,7 @@
+/* { dg-do run }
+
+ # AVR doubles are floats
+ { dg-skip-if "AVR doubles are floats" { avr-*-* } } */
extern void abort();
typedef union {
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.x
b/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.x
deleted file mode 100644
index 1e111fc2c83..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc-1.x
+++ /dev/null
@@ -1,5 +0,0 @@
-if [istarget "avr-*-*"] {
- # AVR doubles are floats
- return 1
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc.c
b/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc.c
index d67fef02321..fa33dc41b94 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/unsafe-fp-assoc.c
@@ -1,3 +1,4 @@
+/* { dg-do run } */
#include <float.h>
extern void abort(void);
--
2.53.0
