diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e091d641272116fe94546f1f34333c3794324d2b..619e17e75e68edfd3937a85317f49783591f063d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,22 @@
+2017-04-15 Uros Bizjak <ubizjak@gmail.com>
+
+ * gcc.dg/pr54669.c: Fix dg-do directive.
+ * gcc.dg/pr78582.c: Ditto.
+ * gcc.dg/pr80020.c: Ditto.
+ * gcc.dg/torture/pr57993-2.cpp: Ditto.
+ * gcc.dg/tree-ssa/builtin-sprintf-3.c: Ditto.
+ * gcc.dg/tree-ssa/builtin-sprintf-4.c: Ditto.
+ * gcc.dg/tree-ssa/builtin-sprintf-5.c: Ditto.
+ * gcc.dg/tree-ssa/builtin-sprintf-6.c: Ditto.
+ * gcc.dg/tree-ssa/builtin-sprintf-warn-5.c: Ditto.
+ * gcc.dg/tree-ssa/pr79327-2.c: Ditto.
+ * gcc.dg/tree-ssa/pr79352.c: Ditto.
+ * gcc.dg/tree-ssa/pr79376.c: Ditto.
+ * gcc.dg/tree-ssa/pr79691.c: Ditto.
+
2017-04-15 Dominique d'Humieres <dominiq@lps.ens.fr>
- * gfortran.dg/deferred_character_3.f90: Fix dg directive.
+ * gfortran.dg/deferred_character_3.f90: Fix dg-do directive.
* gfortran.dg/generic_29.f90: Likewise.
* gfortran.dg/goacc/multi-clause.f90: Likewise.
* gfortran.dg/pr41922.f90: Likewise.
diff --git a/gcc/testsuite/gcc.dg/pr54669.c b/gcc/testsuite/gcc.dg/pr54669.c
index 3868ae691dab4fbdedde4cb4256e63e57c8cc6bd..b68c0476a4953d20b07b5d8f21eda6aaee2269dd 100644
--- a/gcc/testsuite/gcc.dg/pr54669.c
+++ b/gcc/testsuite/gcc.dg/pr54669.c
@@ -1,7 +1,7 @@
/* PR tree-optimization/54669 */
/* Testcase by Zdenek Sojka <zsojka@seznam.cz> */
-/* { dg-compile } */
+/* { dg-do compile } */
/* { dg-options "-O2 -fexceptions -fnon-call-exceptions" } */
int a[10];
diff --git a/gcc/testsuite/gcc.dg/pr78582.c b/gcc/testsuite/gcc.dg/pr78582.c
index 5284e3ffbecb733c2c553d9b301b6a0d642667ad..51e3a1f09ed4007b748f3a48e2e6b7389bc641a1 100644
--- a/gcc/testsuite/gcc.dg/pr78582.c
+++ b/gcc/testsuite/gcc.dg/pr78582.c
@@ -1,6 +1,6 @@
/* PR target/78582. */
/* { dg-options "-fprofile-generate" } */
-/* { dg-compile } */
+/* { dg-do compile } */
#include <setjmp.h>
diff --git a/gcc/testsuite/gcc.dg/pr80020.c b/gcc/testsuite/gcc.dg/pr80020.c
index 5e79c375dc3133e991ee462ee3a764879ab6542d..4ab1aa8df2f5a8bebf6ac964d4bbdea53de6da94 100644
--- a/gcc/testsuite/gcc.dg/pr80020.c
+++ b/gcc/testsuite/gcc.dg/pr80020.c
@@ -1,5 +1,5 @@
/* PR middle-end/80020 - gcc confused about aligned_alloc argument order
- { dg-compile }
+ { dg-do compile }
{ dg-options "-O2 -Wall -fdump-tree-optimized" } */
void sink (void*);
diff --git a/gcc/testsuite/gcc.dg/torture/pr57993-2.cpp b/gcc/testsuite/gcc.dg/torture/pr57993-2.cpp
index d8fd371b0967f5728989afeb9443fb8a5adf8f54..b7bffa89e413195c4ecba83dbc921ffb8fc0d9f2 100644
--- a/gcc/testsuite/gcc.dg/torture/pr57993-2.cpp
+++ b/gcc/testsuite/gcc.dg/torture/pr57993-2.cpp
@@ -1,5 +1,5 @@
/* This ICEd due to an incomplete fix for PR57993. */
-/* { dg-compile } */
+/* { dg-do compile } */
extern "C"
{
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-3.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-3.c
index 207ee7ef3b914b7209d0232fa07d4653b73d394e..fae2a1b73ead288cc2dcb1eb759cfcfa13f0d35b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-3.c
@@ -2,7 +2,7 @@
Test case derived from the one submitted in the bug. It verifies
that the sprintf return value (or value range) optimization is not
performed for an unknown string. */
-/* { dg-compile } */
+/* { dg-do compile } */
/* { dg-options "-O2 -Wall -Werror -fdump-tree-optimized -fprintf-return-value" } */
#define INT_MAX __INT_MAX__
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-4.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-4.c
index 08993a24356e6bc4a953cbb429292c921b864ef3..a741550b44fdec154ba1c24ce10eba711edd9257 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-4.c
@@ -2,7 +2,7 @@
gimple-ssa-sprintf.c:214
Disable warnings to exercise code paths through the pass that may
not be exercised when the -Wformat-overflow option is in effect. */
-/* { dg-compile }
+/* { dg-do compile }
{ dg-options "-O2 -fdump-tree-optimized -w" } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-5.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-5.c
index e12aa2caa9a9ec7eb7452e4db9194817c71437a8..7870f555080a2b03c7b3ea35a0cd4a990e94db86 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-5.c
@@ -1,6 +1,6 @@
/* PR middle-end/78476 - snprintf(0, 0, ...) with known arguments not
optimized away
- { dg-compile }
+ { dg-do compile }
{ dg-options "-O2 -fdump-tree-optimized" }
{ dg-require-effective-target int32plus } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-6.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-6.c
index abd49dfcc0339ba4993fa1c253a8dc84b18c2b63..f9c8687efa2a51b0d82765f5706334e14c59977c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-6.c
@@ -4,7 +4,7 @@
A negative test complementing builtin-sprintf-5.c to verify that calls
to the function that do not return a constant are not optimized away.
Test also verifies that unknown directives prevent the optimization.
- { dg-compile }
+ { dg-do compile }
{ dg-options "-O2 -Wformat -fdump-tree-optimized" }
{ dg-require-effective-target int32plus } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-5.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-5.c
index f6f60ccc906d1d866c2034b3e5884450cbe24d41..2a6739ec2f330dbc8f6075145cec43310f04e01d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-5.c
@@ -1,8 +1,7 @@
/* PR bootstrap/77676 - powerpc64 and powerpc64le stage2 bootstrap fail
Test case from comment 6 on the bug. */
-/* { dg-compile } */
+/* { dg-do compile } */
/* { dg-options "-Wall -Werror" } */
-/* { dg-additional-options "-m32" { target { i?86-*-* x86_64-*-* } } } */
struct A
{
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr79327-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr79327-2.c
index f72e4cc353c95a077b7232194a28aa85fe79e33d..4c9d60625c02cb50e2937415e36dc4df16021bff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr79327-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr79327-2.c
@@ -1,5 +1,5 @@
/* PR tree-optimization/79327 - wrong code at -O2 and -fprintf-return-value
- { dg-compile }
+ { dg-do compile }
{ dg-options "-O2 -fdump-tree-optimized" } */
#define CAT(s, n) s ## n
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr79352.c b/gcc/testsuite/gcc.dg/tree-ssa/pr79352.c
index 4a153b71e431a180f3c50d06e5dbaf68ca59732c..485e2d64cb3e9299da6a9c1b21166376af65d4e5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr79352.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr79352.c
@@ -1,6 +1,6 @@
/* PR tree-optimization/79352 - -fprintf-return-value doesn't handle
flexible-like array members properly
- { dg-compile }
+ { dg-do compile }
{ dg-options "-O2 -fdump-tree-optimized" } */
struct A { int i; char a1[1]; };
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr79376.c b/gcc/testsuite/gcc.dg/tree-ssa/pr79376.c
index 838bfe0508e373f6da8708e7c5952277ec55d11f..01ecd1782119b6214e79dcf3380639888eb60c93 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr79376.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr79376.c
@@ -1,6 +1,6 @@
/* PR tree-optimization/79376 - wrong lower bound with %s and non-constant
strings in -Wformat-overflow
- { dg-compile }
+ { dg-do compile }
{ dg-options "-O2 -fdump-tree-optimized" } */
#define CAT(s, n) s ## n
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr79691.c b/gcc/testsuite/gcc.dg/tree-ssa/pr79691.c
index cef1ef192abdb606e3a3cb7ba216a2d03a08fffc..bf889318c063da46347e9c72e197d7f9caa1a849 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr79691.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr79691.c
@@ -1,7 +1,7 @@
/* PR tree-optimization/79691 - -Wformat-truncation suppressed by
(and only by) -Og
- { dg-compile }
+ { dg-do compile }
{ dg-options "-Og -Wall -fdump-tree-optimized" } */
char d[2];