This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [Patch][Fortran] OpenMP – libgomp/testsuite – use 'stop' and 'dg-do run'


Hi,

thanks for the review.

On 10/30/19 10:31 AM, Jakub Jelinek wrote:
+++ b/libgomp/testsuite/libgomp.fortran/omp_orphan.f
+++ b/libgomp/testsuite/libgomp.fortran/omp_reduction.f
+++ b/libgomp/testsuite/libgomp.fortran/omp_workshare1.f
--- a/libgomp/testsuite/libgomp.fortran/omp_workshare2.f
+++ b/libgomp/testsuite/libgomp.fortran/omp_workshare2.f
Dunno, maybe, though not clear advantages of doing so.

I didn't added 'dg-do run' for those.
Otherwise as suggested – and committed as Rev. 277606.

I'm not really happy about the uppercase STOP in all the libgomp.fortran tests that are written completely in lowercase except these stops, but didn't get around to changing it yet.

How about the following patch? Created by
sed -i -e 's/STOP /stop /' in testsuite/libgomp.fortran/
and glanced over. (Seemingly, no all-capital-letters file exists.)

?

Tobias

Commit log:

	libgomp/
	* testsuite/libgomp.fortran/: Replace 'STOP' by 'stop'.

ChangeLog:

	* testsuite/libgomp.fortran/aligned1.f03: Replace 'STOP' by 'stop'.
	* testsuite/libgomp.fortran/alloc-comp-1.f90: Ditto.
	* testsuite/libgomp.fortran/alloc-comp-2.f90: Ditto.
	* testsuite/libgomp.fortran/alloc-comp-3.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable1.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable10.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable11.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable12.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable2.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable3.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable4.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable5.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable6.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable7.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable8.f90: Ditto.
	* testsuite/libgomp.fortran/allocatable9.f90: Ditto.
	* testsuite/libgomp.fortran/appendix-a/a.18.1.f90: Ditto.
	* testsuite/libgomp.fortran/appendix-a/a.19.1.f90: Ditto.
	* testsuite/libgomp.fortran/associate1.f90: Ditto.
	* testsuite/libgomp.fortran/associate2.f90: Ditto.
	* testsuite/libgomp.fortran/associate3.f90: Ditto.
	* testsuite/libgomp.fortran/async_io_4.f90: Ditto.
	* testsuite/libgomp.fortran/async_io_5.f90: Ditto.
	* testsuite/libgomp.fortran/async_io_6.f90: Ditto.
	* testsuite/libgomp.fortran/async_io_7.f90: Ditto.
	* testsuite/libgomp.fortran/cancel-do-1.f90: Ditto.
	* testsuite/libgomp.fortran/cancel-do-2.f90: Ditto.
	* testsuite/libgomp.fortran/cancel-parallel-1.f90: Ditto.
	* testsuite/libgomp.fortran/cancel-sections-1.f90: Ditto.
	* testsuite/libgomp.fortran/cancel-taskgroup-2.f90: Ditto.
	* testsuite/libgomp.fortran/character1.f90: Ditto.
	* testsuite/libgomp.fortran/character2.f90: Ditto.
	* testsuite/libgomp.fortran/collapse1.f90: Ditto.
	* testsuite/libgomp.fortran/collapse2.f90: Ditto.
	* testsuite/libgomp.fortran/collapse3.f90: Ditto.
	* testsuite/libgomp.fortran/collapse4.f90: Ditto.
	* testsuite/libgomp.fortran/crayptr1.f90: Ditto.
	* testsuite/libgomp.fortran/crayptr2.f90: Ditto.
	* testsuite/libgomp.fortran/crayptr3.f90: Ditto.
	* testsuite/libgomp.fortran/declare-simd-1.f90: Ditto.
	* testsuite/libgomp.fortran/declare-simd-3.f90: Ditto.
	* testsuite/libgomp.fortran/declare-target-2.f90: Ditto.
	* testsuite/libgomp.fortran/depend-1.f90: Ditto.
	* testsuite/libgomp.fortran/depend-2.f90: Ditto.
	* testsuite/libgomp.fortran/depend-3.f90: Ditto.
	* testsuite/libgomp.fortran/do1.f90: Ditto.
	* testsuite/libgomp.fortran/do2.f90: Ditto.
	* testsuite/libgomp.fortran/do_concurrent_5.f90: Ditto.
	* testsuite/libgomp.fortran/doacross1.f90: Ditto.
	* testsuite/libgomp.fortran/doacross2.f90: Ditto.
	* testsuite/libgomp.fortran/doacross3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/array_sections-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/array_sections-4.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/async_target-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/async_target-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/declare_target-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/declare_target-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/declare_target-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/declare_target-4.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/declare_target-5.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/device-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/device-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/device-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-4.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-5.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-6.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-7.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/simd-8.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target-4.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target-5.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_data-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_data-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_data-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_data-4.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_data-5.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_data-6.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_data-7.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_update-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/target_update-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/task_dep-1.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/task_dep-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/task_dep-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/task_dep-4.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/task_dep-5.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/teams-2.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/teams-3.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/teams-4.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/teams-5.f90: Ditto.
	* testsuite/libgomp.fortran/examples-4/teams-6.f90: Ditto.
	* testsuite/libgomp.fortran/lastprivate1.f90: Ditto.
	* testsuite/libgomp.fortran/lastprivate2.f90: Ditto.
	* testsuite/libgomp.fortran/lib1.f90: Ditto.
	* testsuite/libgomp.fortran/lib2.f: Ditto.
	* testsuite/libgomp.fortran/lib3.f: Ditto.
	* testsuite/libgomp.fortran/lib4.f90: Ditto.
	* testsuite/libgomp.fortran/lock-1.f90: Ditto.
	* testsuite/libgomp.fortran/lock-2.f90: Ditto.
	* testsuite/libgomp.fortran/nested1.f90: Ditto.
	* testsuite/libgomp.fortran/nestedfn1.f90: Ditto.
	* testsuite/libgomp.fortran/nestedfn2.f90: Ditto.
	* testsuite/libgomp.fortran/nestedfn3.f90: Ditto.
	* testsuite/libgomp.fortran/nestedfn4.f90: Ditto.
	* testsuite/libgomp.fortran/nestedfn5.f90: Ditto.
	* testsuite/libgomp.fortran/omp_atomic1.f90: Ditto.
	* testsuite/libgomp.fortran/omp_atomic2.f90: Ditto.
	* testsuite/libgomp.fortran/omp_atomic3.f90: Ditto.
	* testsuite/libgomp.fortran/omp_atomic4.f90: Ditto.
	* testsuite/libgomp.fortran/omp_atomic5.f90: Ditto.
	* testsuite/libgomp.fortran/omp_cond1.f: Ditto.
	* testsuite/libgomp.fortran/omp_cond2.f: Ditto.
	* testsuite/libgomp.fortran/omp_cond3.F90: Ditto.
	* testsuite/libgomp.fortran/omp_cond4.F90: Ditto.
	* testsuite/libgomp.fortran/omp_parse1.f90: Ditto.
	* testsuite/libgomp.fortran/omp_parse2.f90: Ditto.
	* testsuite/libgomp.fortran/omp_parse3.f90: Ditto.
	* testsuite/libgomp.fortran/omp_parse4.f90: Ditto.
	* testsuite/libgomp.fortran/openmp_version-1.f: Ditto.
	* testsuite/libgomp.fortran/openmp_version-2.f90: Ditto.
	* testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95: Ditto.
	* testsuite/libgomp.fortran/parloops-exit-first-loop-alt.f95: Ditto.
	* testsuite/libgomp.fortran/pointer1.f90: Ditto.
	* testsuite/libgomp.fortran/pointer2.f90: Ditto.
	* testsuite/libgomp.fortran/pr25162.f: Ditto.
	* testsuite/libgomp.fortran/pr25219.f90: Ditto.
	* testsuite/libgomp.fortran/pr27395-1.f90: Ditto.
	* testsuite/libgomp.fortran/pr27395-2.f90: Ditto.
	* testsuite/libgomp.fortran/pr27416-1.f90: Ditto.
	* testsuite/libgomp.fortran/pr27916-1.f90: Ditto.
	* testsuite/libgomp.fortran/pr27916-2.f90: Ditto.
	* testsuite/libgomp.fortran/pr28390.f: Ditto.
	* testsuite/libgomp.fortran/pr29629.f90: Ditto.
	* testsuite/libgomp.fortran/pr32550.f90: Ditto.
	* testsuite/libgomp.fortran/pr33880.f90: Ditto.
	* testsuite/libgomp.fortran/pr34020.f90: Ditto.
	* testsuite/libgomp.fortran/pr35130.f90: Ditto.
	* testsuite/libgomp.fortran/pr42162.f90: Ditto.
	* testsuite/libgomp.fortran/pr46753.f90: Ditto.
	* testsuite/libgomp.fortran/pr48894.f90: Ditto.
	* testsuite/libgomp.fortran/pr49792-1.f90: Ditto.
	* testsuite/libgomp.fortran/pr49792-2.f90: Ditto.
	* testsuite/libgomp.fortran/pr63938-1.f90: Ditto.
	* testsuite/libgomp.fortran/pr63938-2.f90: Ditto.
	* testsuite/libgomp.fortran/pr65597.f90: Ditto.
	* testsuite/libgomp.fortran/pr66199-1.f90: Ditto.
	* testsuite/libgomp.fortran/pr71014.f90: Ditto.
	* testsuite/libgomp.fortran/pr81304.f90: Ditto.
	* testsuite/libgomp.fortran/pr81841.f90: Ditto.
	* testsuite/libgomp.fortran/pr84418-1.f90: Ditto.
	* testsuite/libgomp.fortran/pr84418-2.f90: Ditto.
	* testsuite/libgomp.fortran/pr90779.f90: Ditto.
	* testsuite/libgomp.fortran/procptr1.f90: Ditto.
	* testsuite/libgomp.fortran/recursion1.f90: Ditto.
	* testsuite/libgomp.fortran/reduction1.f90: Ditto.
	* testsuite/libgomp.fortran/reduction2.f90: Ditto.
	* testsuite/libgomp.fortran/reduction3.f90: Ditto.
	* testsuite/libgomp.fortran/reduction4.f90: Ditto.
	* testsuite/libgomp.fortran/reduction5.f90: Ditto.
	* testsuite/libgomp.fortran/reduction6.f90: Ditto.
	* testsuite/libgomp.fortran/reference1.f90: Ditto.
	* testsuite/libgomp.fortran/reference2.f90: Ditto.
	* testsuite/libgomp.fortran/retval1.f90: Ditto.
	* testsuite/libgomp.fortran/retval2.f90: Ditto.
	* testsuite/libgomp.fortran/sharing1.f90: Ditto.
	* testsuite/libgomp.fortran/sharing2.f90: Ditto.
	* testsuite/libgomp.fortran/simd1.f90: Ditto.
	* testsuite/libgomp.fortran/simd2.f90: Ditto.
	* testsuite/libgomp.fortran/simd3.f90: Ditto.
	* testsuite/libgomp.fortran/simd4.f90: Ditto.
	* testsuite/libgomp.fortran/simd5.f90: Ditto.
	* testsuite/libgomp.fortran/simd6.f90: Ditto.
	* testsuite/libgomp.fortran/simd7.f90: Ditto.
	* testsuite/libgomp.fortran/stack.f90: Ditto.
	* testsuite/libgomp.fortran/strassen.f90: Ditto.
	* testsuite/libgomp.fortran/tabs1.f90: Ditto.
	* testsuite/libgomp.fortran/tabs2.f: Ditto.
	* testsuite/libgomp.fortran/target-simd.f90: Ditto.
	* testsuite/libgomp.fortran/target1.f90: Ditto.
	* testsuite/libgomp.fortran/target2.f90: Ditto.
	* testsuite/libgomp.fortran/target3.f90: Ditto.
	* testsuite/libgomp.fortran/target4.f90: Ditto.
	* testsuite/libgomp.fortran/target5.f90: Ditto.
	* testsuite/libgomp.fortran/target6.f90: Ditto.
	* testsuite/libgomp.fortran/target7.f90: Ditto.
	* testsuite/libgomp.fortran/target8.f90: Ditto.
	* testsuite/libgomp.fortran/task1.f90: Ditto.
	* testsuite/libgomp.fortran/task2.f90: Ditto.
	* testsuite/libgomp.fortran/task3.f90: Ditto.
	* testsuite/libgomp.fortran/task4.f90: Ditto.
	* testsuite/libgomp.fortran/taskgroup1.f90: Ditto.
	* testsuite/libgomp.fortran/taskloop1.f90: Ditto.
	* testsuite/libgomp.fortran/taskloop2.f90: Ditto.
	* testsuite/libgomp.fortran/taskloop3.f90: Ditto.
	* testsuite/libgomp.fortran/taskloop4.f90: Ditto.
	* testsuite/libgomp.fortran/threadprivate1.f90: Ditto.
	* testsuite/libgomp.fortran/threadprivate2.f90: Ditto.
	* testsuite/libgomp.fortran/threadprivate3.f90: Ditto.
	* testsuite/libgomp.fortran/threadprivate4.f90: Ditto.
	* testsuite/libgomp.fortran/udr1.f90: Ditto.
	* testsuite/libgomp.fortran/udr10.f90: Ditto.
	* testsuite/libgomp.fortran/udr11.f90: Ditto.
	* testsuite/libgomp.fortran/udr12.f90: Ditto.
	* testsuite/libgomp.fortran/udr13.f90: Ditto.
	* testsuite/libgomp.fortran/udr14.f90: Ditto.
	* testsuite/libgomp.fortran/udr15.f90: Ditto.
	* testsuite/libgomp.fortran/udr2.f90: Ditto.
	* testsuite/libgomp.fortran/udr3.f90: Ditto.
	* testsuite/libgomp.fortran/udr4.f90: Ditto.
	* testsuite/libgomp.fortran/udr5.f90: Ditto.
	* testsuite/libgomp.fortran/udr6.f90: Ditto.
	* testsuite/libgomp.fortran/udr7.f90: Ditto.
	* testsuite/libgomp.fortran/udr8.f90: Ditto.
	* testsuite/libgomp.fortran/udr9.f90: Ditto.
	* testsuite/libgomp.fortran/use_device_addr-1.f90: Ditto.
	* testsuite/libgomp.fortran/use_device_addr-2.f90: Ditto.
	* testsuite/libgomp.fortran/use_device_ptr-optional-1.f90: Ditto.
	* testsuite/libgomp.fortran/vla1.f90: Ditto.
	* testsuite/libgomp.fortran/vla2.f90: Ditto.
	* testsuite/libgomp.fortran/vla3.f90: Ditto.
	* testsuite/libgomp.fortran/vla4.f90: Ditto.
	* testsuite/libgomp.fortran/vla5.f90: Ditto.
	* testsuite/libgomp.fortran/vla6.f90: Ditto.
	* testsuite/libgomp.fortran/vla7.f90: Ditto.
	* testsuite/libgomp.fortran/vla8.f90: Ditto.
	* testsuite/libgomp.fortran/workshare1.f90: Ditto.
	* testsuite/libgomp.fortran/workshare2.f90: Ditto.

diff --git a/libgomp/testsuite/libgomp.fortran/aligned1.f03 b/libgomp/testsuite/libgomp.fortran/aligned1.f03
index 19daed80f02..a0b80d4555f 100644
--- a/libgomp/testsuite/libgomp.fortran/aligned1.f03
+++ b/libgomp/testsuite/libgomp.fortran/aligned1.f03
@@ -45 +45 @@
-    if (p(i) /= i * i + 3 * i + 2) STOP 1
+    if (p(i) /= i * i + 3 * i + 2) stop 1
@@ -50 +50 @@
-    if (p(i) /= i * i + 3 * i + 2) STOP 2
+    if (p(i) /= i * i + 3 * i + 2) stop 2
@@ -68 +68 @@
-      if (p(i) /= i * i + 5 * i + 2) STOP 3
+      if (p(i) /= i * i + 5 * i + 2) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/alloc-comp-1.f90 b/libgomp/testsuite/libgomp.fortran/alloc-comp-1.f90
index fac03653da0..ea76bc1e7e8 100644
--- a/libgomp/testsuite/libgomp.fortran/alloc-comp-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/alloc-comp-1.f90
@@ -25 +25 @@ contains
-    if ((c .neqv. allocated (obj%c)) .or. (f .neqv. allocated (obj%f))) STOP 1
+    if ((c .neqv. allocated (obj%c)) .or. (f .neqv. allocated (obj%f))) stop 1
@@ -27,2 +27,2 @@ contains
-      if (lbound (obj%c, 1) /= cl1 .or. ubound (obj%c, 1) /= cu1) STOP 2
-      if (lbound (obj%c, 2) /= cl2 .or. ubound (obj%c, 2) /= cu2) STOP 3
+      if (lbound (obj%c, 1) /= cl1 .or. ubound (obj%c, 1) /= cu1) stop 2
+      if (lbound (obj%c, 2) /= cl2 .or. ubound (obj%c, 2) /= cu2) stop 3
@@ -31,2 +31,2 @@ contains
-      if (obj%a /= val .or. obj%b /= val) STOP 4
-      if (obj%d /= val .or. obj%e /= val) STOP 5
+      if (obj%a /= val .or. obj%b /= val) stop 4
+      if (obj%d /= val .or. obj%e /= val) stop 5
@@ -34 +34 @@ contains
-        if (any (obj%c /= val)) STOP 6
+        if (any (obj%c /= val)) stop 6
@@ -37 +37 @@ contains
-        if (obj%f /= val) STOP 7
+        if (obj%f /= val) stop 7
@@ -46 +46 @@ contains
-    if ((h .neqv. allocated (obj%h)) .or. (k .neqv. allocated (obj%k))) STOP 8
+    if ((h .neqv. allocated (obj%h)) .or. (k .neqv. allocated (obj%k))) stop 8
@@ -48 +48 @@ contains
-      if (lbound (obj%h, 1) /= hl .or. ubound (obj%h, 1) /= hu) STOP 9
+      if (lbound (obj%h, 1) /= hl .or. ubound (obj%h, 1) /= hu) stop 9
@@ -60 +60 @@ contains
-      if (obj%g /= val .or. obj%i /= val) STOP 10
+      if (obj%g /= val .or. obj%i /= val) stop 10
diff --git a/libgomp/testsuite/libgomp.fortran/alloc-comp-2.f90 b/libgomp/testsuite/libgomp.fortran/alloc-comp-2.f90
index 7d035387a3e..111005e1879 100644
--- a/libgomp/testsuite/libgomp.fortran/alloc-comp-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/alloc-comp-2.f90
@@ -25 +25 @@ contains
-    if ((c .neqv. allocated (obj%c)) .or. (f .neqv. allocated (obj%f))) STOP 1
+    if ((c .neqv. allocated (obj%c)) .or. (f .neqv. allocated (obj%f))) stop 1
@@ -27,2 +27,2 @@ contains
-      if (lbound (obj%c, 1) /= cl1 .or. ubound (obj%c, 1) /= cu1) STOP 2
-      if (lbound (obj%c, 2) /= cl2 .or. ubound (obj%c, 2) /= cu2) STOP 3
+      if (lbound (obj%c, 1) /= cl1 .or. ubound (obj%c, 1) /= cu1) stop 2
+      if (lbound (obj%c, 2) /= cl2 .or. ubound (obj%c, 2) /= cu2) stop 3
@@ -31,2 +31,2 @@ contains
-      if (obj%a /= val .or. obj%b /= val) STOP 4
-      if (obj%d /= val .or. obj%e /= val) STOP 5
+      if (obj%a /= val .or. obj%b /= val) stop 4
+      if (obj%d /= val .or. obj%e /= val) stop 5
@@ -34 +34 @@ contains
-        if (any (obj%c /= val)) STOP 6
+        if (any (obj%c /= val)) stop 6
@@ -37 +37 @@ contains
-        if (obj%f /= val) STOP 7
+        if (obj%f /= val) stop 7
@@ -46 +46 @@ contains
-    if ((h .neqv. allocated (obj%h)) .or. (k .neqv. allocated (obj%k))) STOP 8
+    if ((h .neqv. allocated (obj%h)) .or. (k .neqv. allocated (obj%k))) stop 8
@@ -48 +48 @@ contains
-      if (lbound (obj%h, 1) /= hl .or. ubound (obj%h, 1) /= hu) STOP 9
+      if (lbound (obj%h, 1) /= hl .or. ubound (obj%h, 1) /= hu) stop 9
@@ -60 +60 @@ contains
-      if (obj%g /= val .or. obj%i /= val) STOP 10
+      if (obj%g /= val .or. obj%i /= val) stop 10
@@ -125 +125 @@ contains
-    if (allocated (x) .or. allocated (y) .or. allocated (z)) STOP 11
+    if (allocated (x) .or. allocated (y) .or. allocated (z)) stop 11
@@ -128 +128 @@ contains
-    if (allocated (x) .or. allocated (y) .or. allocated (z)) STOP 12
+    if (allocated (x) .or. allocated (y) .or. allocated (z)) stop 12
@@ -134 +134 @@ contains
-      if (allocated (x) .or. allocated (y) .or. allocated (z)) STOP 13
+      if (allocated (x) .or. allocated (y) .or. allocated (z)) stop 13
@@ -138 +138 @@ contains
-      if (allocated (x) .or. allocated (y) .or. allocated (z)) STOP 14
+      if (allocated (x) .or. allocated (y) .or. allocated (z)) stop 14
@@ -151,4 +151,4 @@ contains
-    if (.not.allocated (x) .or. .not.allocated (y)) STOP 15
-    if (.not.allocated (z)) STOP 16
-    if (lbound (z, 1) /= -3 .or. ubound (z, 1) /= -3) STOP 17
-    if (lbound (z, 2) /= 2 .or. ubound (z, 2) /= 3) STOP 18
+    if (.not.allocated (x) .or. .not.allocated (y)) stop 15
+    if (.not.allocated (z)) stop 16
+    if (lbound (z, 1) /= -3 .or. ubound (z, 1) /= -3) stop 17
+    if (lbound (z, 2) /= 2 .or. ubound (z, 2) /= 3) stop 18
diff --git a/libgomp/testsuite/libgomp.fortran/alloc-comp-3.f90 b/libgomp/testsuite/libgomp.fortran/alloc-comp-3.f90
index 42ba7b4b7e2..0185859cb26 100644
--- a/libgomp/testsuite/libgomp.fortran/alloc-comp-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/alloc-comp-3.f90
@@ -25 +25 @@ contains
-    if ((c .neqv. allocated (obj%c)) .or. (f .neqv. allocated (obj%f))) STOP 1
+    if ((c .neqv. allocated (obj%c)) .or. (f .neqv. allocated (obj%f))) stop 1
@@ -27,2 +27,2 @@ contains
-      if (lbound (obj%c, 1) /= cl1 .or. ubound (obj%c, 1) /= cu1) STOP 2
-      if (lbound (obj%c, 2) /= cl2 .or. ubound (obj%c, 2) /= cu2) STOP 3
+      if (lbound (obj%c, 1) /= cl1 .or. ubound (obj%c, 1) /= cu1) stop 2
+      if (lbound (obj%c, 2) /= cl2 .or. ubound (obj%c, 2) /= cu2) stop 3
@@ -31,2 +31,2 @@ contains
-      if (obj%a /= val .or. obj%b /= val) STOP 4
-      if (obj%d /= val .or. obj%e /= val) STOP 5
+      if (obj%a /= val .or. obj%b /= val) stop 4
+      if (obj%d /= val .or. obj%e /= val) stop 5
@@ -34 +34 @@ contains
-        if (any (obj%c /= val)) STOP 6
+        if (any (obj%c /= val)) stop 6
@@ -37 +37 @@ contains
-        if (obj%f /= val) STOP 7
+        if (obj%f /= val) stop 7
@@ -46 +46 @@ contains
-    if ((h .neqv. allocated (obj%h)) .or. (k .neqv. allocated (obj%k))) STOP 8
+    if ((h .neqv. allocated (obj%h)) .or. (k .neqv. allocated (obj%k))) stop 8
@@ -48 +48 @@ contains
-      if (lbound (obj%h, 1) /= hl .or. ubound (obj%h, 1) /= hu) STOP 9
+      if (lbound (obj%h, 1) /= hl .or. ubound (obj%h, 1) /= hu) stop 9
@@ -60 +60 @@ contains
-      if (obj%g /= val .or. obj%i /= val) STOP 10
+      if (obj%g /= val .or. obj%i /= val) stop 10
@@ -127,2 +127,2 @@ contains
-    if (lbound (x, 1) /= 2 .or. ubound (x, 1) /= 4) STOP 11
-    if (lbound (y, 1) /= 3 .or. ubound (y, 1) /= 4) STOP 12
+    if (lbound (x, 1) /= 2 .or. ubound (x, 1) /= 4) stop 11
+    if (lbound (y, 1) /= 3 .or. ubound (y, 1) /= 4) stop 12
@@ -134 +134 @@ contains
-    if (allocated (z)) STOP 13
+    if (allocated (z)) stop 13
@@ -137 +137 @@ contains
-    if (allocated (z)) STOP 14
+    if (allocated (z)) stop 14
@@ -143 +143 @@ contains
-      if (allocated (z)) STOP 15
+      if (allocated (z)) stop 15
@@ -147 +147 @@ contains
-      if (allocated (z)) STOP 16
+      if (allocated (z)) stop 16
@@ -156,3 +156,3 @@ contains
-    if (.not.allocated (z)) STOP 17
-    if (lbound (z, 1) /= -3 .or. ubound (z, 1) /= -3) STOP 18
-    if (lbound (z, 2) /= 2 .or. ubound (z, 2) /= 3) STOP 19
+    if (.not.allocated (z)) stop 17
+    if (lbound (z, 1) /= -3 .or. ubound (z, 1) /= -3) stop 18
+    if (lbound (z, 2) /= 2 .or. ubound (z, 2) /= 3) stop 19
@@ -206,2 +206,2 @@ contains
-    if (lbound (x, 1) /= 2 .or. ubound (x, 1) /= 4) STOP 20
-    if (lbound (y, 1) /= 3 .or. ubound (y, 1) /= 4) STOP 21
+    if (lbound (x, 1) /= 2 .or. ubound (x, 1) /= 4) stop 20
+    if (lbound (y, 1) /= 3 .or. ubound (y, 1) /= 4) stop 21
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable1.f90 b/libgomp/testsuite/libgomp.fortran/allocatable1.f90
index b9fd2ee6dbc..59e14406082 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable1.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable1.f90
@@ -10 +10 @@
-  if (allocated (a)) STOP 1
+  if (allocated (a)) stop 1
@@ -21 +21 @@
-  if (allocated (a).or.l) STOP 2
+  if (allocated (a).or.l) stop 2
@@ -24 +24 @@
-  if (.not.allocated (a)) STOP 3
+  if (.not.allocated (a)) stop 3
@@ -26 +26 @@
-  if (l) STOP 4
+  if (l) stop 4
@@ -32 +32 @@
-  if (l.or..not.allocated (a)) STOP 5
+  if (l.or..not.allocated (a)) stop 5
@@ -44 +44 @@
-  if (any (a.ne.3).or.any (b.ne.16).or.l) STOP 6
+  if (any (a.ne.3).or.any (b.ne.16).or.l) stop 6
@@ -62 +62 @@
-  if (any (a.ne.38).or.any (b.ne.36).or.l) STOP 7
+  if (any (a.ne.38).or.any (b.ne.36).or.l) stop 7
@@ -64 +64 @@
-  if (allocated (a)) STOP 8
+  if (allocated (a)) stop 8
@@ -75 +75 @@
-  if (l) STOP 9
+  if (l) stop 9
@@ -78 +78 @@
-      if (a(i, j) .ne. (5*i + 3*j)) STOP 10
+      if (a(i, j) .ne. (5*i + 3*j)) stop 10
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable10.f90 b/libgomp/testsuite/libgomp.fortran/allocatable10.f90
index 9b05dc74143..9ebceb814da 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable10.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable10.f90
@@ -7 +7 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 1
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 1
@@ -12,7 +12,7 @@
-  if (.not.allocated (a)) STOP 2
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 3
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 4
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 5
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 6
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 7
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 8
+  if (.not.allocated (a)) stop 2
+  if (.not.allocated (b) .or. size (b) /= 4) stop 3
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 4
+  if (.not.allocated (c) .or. size (c) /= 6) stop 5
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 6
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 7
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 8
@@ -21,7 +21,7 @@
-    if (.not.allocated (a)) STOP 9
-    if (.not.allocated (b) .or. size (b) /= 4) STOP 10
-    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 11
-    if (.not.allocated (c) .or. size (c) /= 6) STOP 12
-    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 13
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 14
-    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 15
+    if (.not.allocated (a)) stop 9
+    if (.not.allocated (b) .or. size (b) /= 4) stop 10
+    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 11
+    if (.not.allocated (c) .or. size (c) /= 6) stop 12
+    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 13
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 14
+    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 15
@@ -32,8 +32,8 @@
-  if (.not.allocated (a)) STOP 16
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 17
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 18
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 19
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 20
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 21
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 22
-  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) STOP 23
+  if (.not.allocated (a)) stop 16
+  if (.not.allocated (b) .or. size (b) /= 4) stop 17
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 18
+  if (.not.allocated (c) .or. size (c) /= 6) stop 19
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 20
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 21
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 22
+  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) stop 23
@@ -45,7 +45,7 @@
-    if (.not.allocated (a)) STOP 24
-    if (.not.allocated (b) .or. size (b) /= 4) STOP 25
-    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 26
-    if (.not.allocated (c) .or. size (c) /= 6) STOP 27
-    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 28
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 29
-    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 30
+    if (.not.allocated (a)) stop 24
+    if (.not.allocated (b) .or. size (b) /= 4) stop 25
+    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 26
+    if (.not.allocated (c) .or. size (c) /= 6) stop 27
+    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 28
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 29
+    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 30
@@ -56,8 +56,8 @@
-  if (.not.allocated (a)) STOP 31
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 32
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 33
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 34
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 35
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 36
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 37
-  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) STOP 38
+  if (.not.allocated (a)) stop 31
+  if (.not.allocated (b) .or. size (b) /= 4) stop 32
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 33
+  if (.not.allocated (c) .or. size (c) /= 6) stop 34
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 35
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 36
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 37
+  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) stop 38
@@ -69,7 +69,7 @@
-    if (.not.allocated (a)) STOP 39
-    if (.not.allocated (b) .or. size (b) /= 4) STOP 40
-    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 41
-    if (.not.allocated (c) .or. size (c) /= 6) STOP 42
-    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 43
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 44
-    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 45
+    if (.not.allocated (a)) stop 39
+    if (.not.allocated (b) .or. size (b) /= 4) stop 40
+    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 41
+    if (.not.allocated (c) .or. size (c) /= 6) stop 42
+    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 43
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 44
+    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 45
@@ -80,8 +80,8 @@
-  if (.not.allocated (a)) STOP 46
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 47
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 48
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 49
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 50
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 51
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 52
-  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) STOP 53
+  if (.not.allocated (a)) stop 46
+  if (.not.allocated (b) .or. size (b) /= 4) stop 47
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 48
+  if (.not.allocated (c) .or. size (c) /= 6) stop 49
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 50
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 51
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 52
+  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) stop 53
@@ -93,7 +93,7 @@
-    if (.not.allocated (a)) STOP 54
-    if (.not.allocated (b) .or. size (b) /= 4) STOP 55
-    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 56
-    if (.not.allocated (c) .or. size (c) /= 6) STOP 57
-    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 58
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 59
-    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 60
+    if (.not.allocated (a)) stop 54
+    if (.not.allocated (b) .or. size (b) /= 4) stop 55
+    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 56
+    if (.not.allocated (c) .or. size (c) /= 6) stop 57
+    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 58
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 59
+    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 60
@@ -104,8 +104,8 @@
-  if (.not.allocated (a)) STOP 61
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 62
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 63
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 64
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 65
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 66
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 67
-  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) STOP 68
+  if (.not.allocated (a)) stop 61
+  if (.not.allocated (b) .or. size (b) /= 4) stop 62
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 63
+  if (.not.allocated (c) .or. size (c) /= 6) stop 64
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 65
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 66
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 67
+  if (a /= 55 .or. any (b /= 110) .or. any (c /= 165)) stop 68
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable11.f90 b/libgomp/testsuite/libgomp.fortran/allocatable11.f90
index 916dc6e596e..c3b82942f30 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable11.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable11.f90
@@ -8 +8 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 1
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 1
@@ -14 +14 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 2
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 2
@@ -21,7 +21,7 @@
-  if (.not.allocated (a)) STOP 3
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 4
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 5
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 6
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 7
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 8
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 9
+  if (.not.allocated (a)) stop 3
+  if (.not.allocated (b) .or. size (b) /= 4) stop 4
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 5
+  if (.not.allocated (c) .or. size (c) /= 6) stop 6
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 7
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 8
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 9
@@ -31,8 +31,8 @@
-  if (.not.allocated (a)) STOP 10
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 11
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 12
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 13
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 14
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 15
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 16
-  if (a /= 4 .or. any (b /= 5) .or. any (c /= 6)) STOP 17
+  if (.not.allocated (a)) stop 10
+  if (.not.allocated (b) .or. size (b) /= 4) stop 11
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 12
+  if (.not.allocated (c) .or. size (c) /= 6) stop 13
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 14
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 15
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 16
+  if (a /= 4 .or. any (b /= 5) .or. any (c /= 6)) stop 17
@@ -40 +40 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 18
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 18
@@ -45,8 +45,8 @@
-  if (.not.allocated (a)) STOP 19
-  if (.not.allocated (b) .or. size (b) /= (10 - p)) STOP 20
-  if (lbound (b, 1) /= p .or. ubound (b, 1) /= 9) STOP 21
-  if (.not.allocated (c) .or. size (c) /= (3 * (8 - p))) STOP 22
-  if (size (c, 1) /= 3 .or. size (c, 2) /= (8 - p)) STOP 23
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 24
-  if (lbound (c, 2) /= p .or. ubound (c, 2) /= 7) STOP 25
-  if (a /= p .or. any (b /= p) .or. any (c /= p)) STOP 26
+  if (.not.allocated (a)) stop 19
+  if (.not.allocated (b) .or. size (b) /= (10 - p)) stop 20
+  if (lbound (b, 1) /= p .or. ubound (b, 1) /= 9) stop 21
+  if (.not.allocated (c) .or. size (c) /= (3 * (8 - p))) stop 22
+  if (size (c, 1) /= 3 .or. size (c, 2) /= (8 - p)) stop 23
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 24
+  if (lbound (c, 2) /= p .or. ubound (c, 2) /= 7) stop 25
+  if (a /= p .or. any (b /= p) .or. any (c /= p)) stop 26
@@ -56,8 +56,8 @@
-  if (.not.allocated (a)) STOP 27
-  if (.not.allocated (b) .or. size (b) /= 10) STOP 28
-  if (lbound (b, 1) /= 0 .or. ubound (b, 1) /= 9) STOP 29
-  if (.not.allocated (c) .or. size (c) /= 24) STOP 30
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 8) STOP 31
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 32
-  if (lbound (c, 2) /= 0 .or. ubound (c, 2) /= 7) STOP 33
-  if (a /= 0 .or. any (b /= 0) .or. any (c /= 0)) STOP 34
+  if (.not.allocated (a)) stop 27
+  if (.not.allocated (b) .or. size (b) /= 10) stop 28
+  if (lbound (b, 1) /= 0 .or. ubound (b, 1) /= 9) stop 29
+  if (.not.allocated (c) .or. size (c) /= 24) stop 30
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 8) stop 31
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 32
+  if (lbound (c, 2) /= 0 .or. ubound (c, 2) /= 7) stop 33
+  if (a /= 0 .or. any (b /= 0) .or. any (c /= 0)) stop 34
@@ -67 +67 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 35
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 35
@@ -70 +70 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 36
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 36
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable12.f90 b/libgomp/testsuite/libgomp.fortran/allocatable12.f90
index 6ccf1c0323c..8ce4dd2f3fe 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable12.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable12.f90
@@ -5 +5 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 1
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 1
@@ -9 +9 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 2
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 2
@@ -18,8 +18,8 @@
-  if (.not.allocated (a)) STOP 3
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 4
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 5
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 6
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 7
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 8
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 9
-  if (a /= 4 .or. any (b /= 5) .or. any (c /= 6)) STOP 10
+  if (.not.allocated (a)) stop 3
+  if (.not.allocated (b) .or. size (b) /= 4) stop 4
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 5
+  if (.not.allocated (c) .or. size (c) /= 6) stop 6
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 7
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 8
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 9
+  if (a /= 4 .or. any (b /= 5) .or. any (c /= 6)) stop 10
@@ -29 +29 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 11
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 11
@@ -36,8 +36,8 @@
-  if (.not.allocated (a)) STOP 12
-  if (.not.allocated (b) .or. size (b) /= 5) STOP 13
-  if (lbound (b, 1) /= 0 .or. ubound (b, 1) /= 4) STOP 14
-  if (.not.allocated (c) .or. size (c) /= 18) STOP 15
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 6) STOP 16
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 17
-  if (lbound (c, 2) /= 2 .or. ubound (c, 2) /= 7) STOP 18
-  if (a /= 1 .or. any (b /= 2) .or. any (c /= 3)) STOP 19
+  if (.not.allocated (a)) stop 12
+  if (.not.allocated (b) .or. size (b) /= 5) stop 13
+  if (lbound (b, 1) /= 0 .or. ubound (b, 1) /= 4) stop 14
+  if (.not.allocated (c) .or. size (c) /= 18) stop 15
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 6) stop 16
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 17
+  if (lbound (c, 2) /= 2 .or. ubound (c, 2) /= 7) stop 18
+  if (a /= 1 .or. any (b /= 2) .or. any (c /= 3)) stop 19
@@ -48 +48 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 20
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 20
@@ -55,2 +55,2 @@
-  if (.not.allocated (a)) STOP 21
-  if (.not.allocated (b) .or. size (b) /= 5) STOP 22
+  if (.not.allocated (a)) stop 21
+  if (.not.allocated (b) .or. size (b) /= 5) stop 22
@@ -58 +58 @@
-    if (lbound (b, 1) /= 2 .or. ubound (b, 1) /= 6) STOP 23
+    if (lbound (b, 1) /= 2 .or. ubound (b, 1) /= 6) stop 23
@@ -60 +60 @@
-    if (lbound (b, 1) /= 0 .or. ubound (b, 1) /= 4) STOP 24
+    if (lbound (b, 1) /= 0 .or. ubound (b, 1) /= 4) stop 24
@@ -62,2 +62,2 @@
-  if (.not.allocated (c) .or. size (c) /= 18) STOP 25
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 6) STOP 26
+  if (.not.allocated (c) .or. size (c) /= 18) stop 25
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 6) stop 26
@@ -65,2 +65,2 @@
-    if (lbound (c, 1) /= 3 .or. ubound (c, 1) /= 5) STOP 27
-    if (lbound (c, 2) /= 3 .or. ubound (c, 2) /= 8) STOP 28
+    if (lbound (c, 1) /= 3 .or. ubound (c, 1) /= 5) stop 27
+    if (lbound (c, 2) /= 3 .or. ubound (c, 2) /= 8) stop 28
@@ -68,2 +68,2 @@
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 29
-    if (lbound (c, 2) /= 2 .or. ubound (c, 2) /= 7) STOP 30
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 29
+    if (lbound (c, 2) /= 2 .or. ubound (c, 2) /= 7) stop 30
@@ -71 +71 @@
-  if (a /= 7 .or. any (b /= 8) .or. any (c /= 9)) STOP 31
+  if (a /= 7 .or. any (b /= 8) .or. any (c /= 9)) stop 31
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable2.f90 b/libgomp/testsuite/libgomp.fortran/allocatable2.f90
index 1361e6d1a91..fa2e774f6ed 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable2.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable2.f90
@@ -10 +10 @@
-  if (allocated (a)) STOP 1
+  if (allocated (a)) stop 1
@@ -19 +19 @@
-  if (l.or.any(a.ne.6)) STOP 1
+  if (l.or.any(a.ne.6)) stop 1
@@ -40,2 +40,2 @@
-  if (n.lt.0 .or. n.ge.4) STOP 2
-  if (l.or.any(a.ne.(n + 36))) STOP 3
+  if (n.lt.0 .or. n.ge.4) stop 2
+  if (l.or.any(a.ne.(n + 36))) stop 3
@@ -46 +46 @@
-  if (l.or.allocated (a)) STOP 4
+  if (l.or.allocated (a)) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable3.f90 b/libgomp/testsuite/libgomp.fortran/allocatable3.f90
index df69fff5491..4663b15988f 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable3.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable3.f90
@@ -7 +7 @@
-  if (allocated (a)) STOP 1
+  if (allocated (a)) stop 1
@@ -21 +21 @@
-  if (l.or.allocated (a)) STOP 2
+  if (l.or.allocated (a)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable4.f90 b/libgomp/testsuite/libgomp.fortran/allocatable4.f90
index 0b0ac174fad..2a8cf22901d 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable4.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable4.f90
@@ -9 +9 @@
-  if (allocated (a)) STOP 1
+  if (allocated (a)) stop 1
@@ -21 +21 @@
-  if (allocated (a).or.l) STOP 2
+  if (allocated (a).or.l) stop 2
@@ -24 +24 @@
-  if (.not.allocated (a)) STOP 3
+  if (.not.allocated (a)) stop 3
@@ -26 +26 @@
-  if (l) STOP 4
+  if (l) stop 4
@@ -33 +33 @@
-  if (l.or..not.allocated (a)) STOP 5
+  if (l.or..not.allocated (a)) stop 5
@@ -46 +46 @@
-  if (any (a.ne.3).or.any (b.ne.16).or.l) STOP 6
+  if (any (a.ne.3).or.any (b.ne.16).or.l) stop 6
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable5.f90 b/libgomp/testsuite/libgomp.fortran/allocatable5.f90
index 20ac6012ebd..73027e7082c 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable5.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable5.f90
@@ -15 +15 @@ program pr42866
-  if (any (a.ne.3)) STOP 1
+  if (any (a.ne.3)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable6.f90 b/libgomp/testsuite/libgomp.fortran/allocatable6.f90
index 444af1dd713..b7bfba9c53d 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable6.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable6.f90
@@ -28 +28 @@
-    if (c(i) .ne. j) STOP 1
+    if (c(i) .ne. j) stop 1
@@ -31 +31 @@
-    if (d(i) .ne. j) STOP 2
+    if (d(i) .ne. j) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable7.f90 b/libgomp/testsuite/libgomp.fortran/allocatable7.f90
index 787b03559e2..77cd5be6c82 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable7.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable7.f90
@@ -15 +15 @@
-  if (l) STOP 1
+  if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable8.f90 b/libgomp/testsuite/libgomp.fortran/allocatable8.f90
index 84b18f34940..d1a216a9f46 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable8.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable8.f90
@@ -8 +8 @@
-  if (allocated (a)) STOP 1
+  if (allocated (a)) stop 1
@@ -13 +13 @@
-  if (l.or.allocated (a)) STOP 2
+  if (l.or.allocated (a)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/allocatable9.f90 b/libgomp/testsuite/libgomp.fortran/allocatable9.f90
index c7decfb4b33..a9929f7506a 100644
--- a/libgomp/testsuite/libgomp.fortran/allocatable9.f90
+++ b/libgomp/testsuite/libgomp.fortran/allocatable9.f90
@@ -5 +5 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 1
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 1
@@ -7 +7 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 2
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 2
@@ -9,7 +9,7 @@
-  if (.not.allocated (a)) STOP 3
-  if (.not.allocated (b) .or. size (b) /= 7) STOP 4
-  if (lbound (b, 1) /= -7 .or. ubound (b, 1) /= -1) STOP 5
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 6
-  if (size (c, 1) /= 2 .or. size (c, 2) /= 3) STOP 7
-  if (lbound (c, 1) /= 2 .or. ubound (c, 1) /= 3) STOP 8
-  if (lbound (c, 2) /= 3 .or. ubound (c, 2) /= 5) STOP 9
+  if (.not.allocated (a)) stop 3
+  if (.not.allocated (b) .or. size (b) /= 7) stop 4
+  if (lbound (b, 1) /= -7 .or. ubound (b, 1) /= -1) stop 5
+  if (.not.allocated (c) .or. size (c) /= 6) stop 6
+  if (size (c, 1) /= 2 .or. size (c, 2) /= 3) stop 7
+  if (lbound (c, 1) /= 2 .or. ubound (c, 1) /= 3) stop 8
+  if (lbound (c, 2) /= 3 .or. ubound (c, 2) /= 5) stop 9
@@ -20 +20 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 10
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 10
@@ -22 +22 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 11
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 11
@@ -24,7 +24,7 @@
-  if (.not.allocated (a)) STOP 12
-  if (.not.allocated (b) .or. size (b) /= 7) STOP 13
-  if (lbound (b, 1) /= -7 .or. ubound (b, 1) /= -1) STOP 14
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 15
-  if (size (c, 1) /= 2 .or. size (c, 2) /= 3) STOP 16
-  if (lbound (c, 1) /= 2 .or. ubound (c, 1) /= 3) STOP 17
-  if (lbound (c, 2) /= 3 .or. ubound (c, 2) /= 5) STOP 18
+  if (.not.allocated (a)) stop 12
+  if (.not.allocated (b) .or. size (b) /= 7) stop 13
+  if (lbound (b, 1) /= -7 .or. ubound (b, 1) /= -1) stop 14
+  if (.not.allocated (c) .or. size (c) /= 6) stop 15
+  if (size (c, 1) /= 2 .or. size (c, 2) /= 3) stop 16
+  if (lbound (c, 1) /= 2 .or. ubound (c, 1) /= 3) stop 17
+  if (lbound (c, 2) /= 3 .or. ubound (c, 2) /= 5) stop 18
@@ -35 +35 @@
-  if (allocated (a) .or. allocated (b) .or. allocated (c)) STOP 19
+  if (allocated (a) .or. allocated (b) .or. allocated (c)) stop 19
@@ -40,7 +40,7 @@
-  if (.not.allocated (a)) STOP 20
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 21
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 22
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 23
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 24
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 25
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 26
+  if (.not.allocated (a)) stop 20
+  if (.not.allocated (b) .or. size (b) /= 4) stop 21
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 22
+  if (.not.allocated (c) .or. size (c) /= 6) stop 23
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 24
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 25
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 26
@@ -48,8 +48,8 @@
-  if (.not.allocated (a)) STOP 27
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 28
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 29
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 30
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 31
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 32
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 33
-  if (a /= 2 .or. any (b .ne. 4) .or. any (c .ne. 5)) STOP 34
+  if (.not.allocated (a)) stop 27
+  if (.not.allocated (b) .or. size (b) /= 4) stop 28
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 29
+  if (.not.allocated (c) .or. size (c) /= 6) stop 30
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 31
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 32
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 33
+  if (a /= 2 .or. any (b .ne. 4) .or. any (c .ne. 5)) stop 34
@@ -57 +57 @@
-  if (allocated (a)) STOP 35
+  if (allocated (a)) stop 35
@@ -62,8 +62,8 @@
-  if (.not.allocated (a)) STOP 36
-  if (.not.allocated (b) .or. size (b) /= 3) STOP 37
-  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 3) STOP 38
-  if (.not.allocated (c) .or. size (c) /= 8) STOP 39
-  if (size (c, 1) /= 2 .or. size (c, 2) /= 4) STOP 40
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 2) STOP 41
-  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 4) STOP 42
-  if (a /= 8 .or. b(2) /= 2 .or. c(1, 2) /= 3) STOP 43
+  if (.not.allocated (a)) stop 36
+  if (.not.allocated (b) .or. size (b) /= 3) stop 37
+  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 3) stop 38
+  if (.not.allocated (c) .or. size (c) /= 8) stop 39
+  if (size (c, 1) /= 2 .or. size (c, 2) /= 4) stop 40
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 2) stop 41
+  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 4) stop 42
+  if (a /= 8 .or. b(2) /= 2 .or. c(1, 2) /= 3) stop 43
@@ -71,8 +71,8 @@
-  if (.not.allocated (a)) STOP 44
-  if (.not.allocated (b) .or. size (b) /= 4) STOP 45
-  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 46
-  if (.not.allocated (c) .or. size (c) /= 6) STOP 47
-  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 48
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 49
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 50
-  if (a /= 2 .or. any (b .ne. 4) .or. any (c .ne. 5)) STOP 51
+  if (.not.allocated (a)) stop 44
+  if (.not.allocated (b) .or. size (b) /= 4) stop 45
+  if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 46
+  if (.not.allocated (c) .or. size (c) /= 6) stop 47
+  if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 48
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 49
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 50
+  if (a /= 2 .or. any (b .ne. 4) .or. any (c .ne. 5)) stop 51
@@ -82 +82 @@
-  if (.not.allocated (a)) STOP 52
+  if (.not.allocated (a)) stop 52
@@ -84,7 +84,7 @@
-    if (.not.allocated (b) .or. size (b) /= 6) STOP 53
-    if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 6) STOP 54
-    if (.not.allocated (c) .or. size (c) /= 8) STOP 55
-    if (size (c, 1) /= 4 .or. size (c, 2) /= 2) STOP 56
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 4) STOP 57
-    if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 2) STOP 58
-    if (a /= 12 .or. b(2) /= 8 .or. c(1, 2) /= 5) STOP 59
+    if (.not.allocated (b) .or. size (b) /= 6) stop 53
+    if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 6) stop 54
+    if (.not.allocated (c) .or. size (c) /= 8) stop 55
+    if (size (c, 1) /= 4 .or. size (c, 2) /= 2) stop 56
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 4) stop 57
+    if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 2) stop 58
+    if (a /= 12 .or. b(2) /= 8 .or. c(1, 2) /= 5) stop 59
@@ -92,6 +92,6 @@
-    if (.not.allocated (b) .or. size (b) /= 4) STOP 60
-    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 61
-    if (.not.allocated (c) .or. size (c) /= 6) STOP 62
-    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 63
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 64
-    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 65
+    if (.not.allocated (b) .or. size (b) /= 4) stop 60
+    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 61
+    if (.not.allocated (c) .or. size (c) /= 6) stop 62
+    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 63
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 64
+    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 65
@@ -101 +101 @@
-  if (allocated (a)) STOP 66
+  if (allocated (a)) stop 66
@@ -106,8 +106,8 @@
-  if (.not.allocated (a)) STOP 67
-  if (.not.allocated (b) .or. size (b) /= 3) STOP 68
-  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 3) STOP 69
-  if (.not.allocated (c) .or. size (c) /= 8) STOP 70
-  if (size (c, 1) /= 2 .or. size (c, 2) /= 4) STOP 71
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 2) STOP 72
-  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 4) STOP 73
-  if (a /= 8 .or. b(2) /= 2 .or. c(1, 2) /= 3) STOP 74
+  if (.not.allocated (a)) stop 67
+  if (.not.allocated (b) .or. size (b) /= 3) stop 68
+  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 3) stop 69
+  if (.not.allocated (c) .or. size (c) /= 8) stop 70
+  if (size (c, 1) /= 2 .or. size (c, 2) /= 4) stop 71
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 2) stop 72
+  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 4) stop 73
+  if (a /= 8 .or. b(2) /= 2 .or. c(1, 2) /= 3) stop 74
@@ -115 +115 @@
-  if (.not.allocated (a)) STOP 75
+  if (.not.allocated (a)) stop 75
@@ -117,7 +117,7 @@
-    if (.not.allocated (b) .or. size (b) /= 3) STOP 76
-    if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 3) STOP 77
-    if (.not.allocated (c) .or. size (c) /= 8) STOP 78
-    if (size (c, 1) /= 2 .or. size (c, 2) /= 4) STOP 79
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 2) STOP 80
-    if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 4) STOP 81
-    if (a /= 8 .or. b(2) /= 2 .or. c(1, 2) /= 3) STOP 82
+    if (.not.allocated (b) .or. size (b) /= 3) stop 76
+    if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 3) stop 77
+    if (.not.allocated (c) .or. size (c) /= 8) stop 78
+    if (size (c, 1) /= 2 .or. size (c, 2) /= 4) stop 79
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 2) stop 80
+    if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 4) stop 81
+    if (a /= 8 .or. b(2) /= 2 .or. c(1, 2) /= 3) stop 82
@@ -125,6 +125,6 @@
-    if (.not.allocated (b) .or. size (b) /= 4) STOP 83
-    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) STOP 84
-    if (.not.allocated (c) .or. size (c) /= 6) STOP 85
-    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) STOP 86
-    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) STOP 87
-    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) STOP 88
+    if (.not.allocated (b) .or. size (b) /= 4) stop 83
+    if (lbound (b, 1) /= 6 .or. ubound (b, 1) /= 9) stop 84
+    if (.not.allocated (c) .or. size (c) /= 6) stop 85
+    if (size (c, 1) /= 3 .or. size (c, 2) /= 2) stop 86
+    if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 3) stop 87
+    if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 9) stop 88
@@ -134 +134 @@
-  if (allocated (a)) STOP 89
+  if (allocated (a)) stop 89
@@ -139,8 +139,8 @@
-  if (.not.allocated (a)) STOP 90
-  if (.not.allocated (b) .or. size (b) /= 6) STOP 91
-  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 6) STOP 92
-  if (.not.allocated (c) .or. size (c) /= 8) STOP 93
-  if (size (c, 1) /= 4 .or. size (c, 2) /= 2) STOP 94
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 4) STOP 95
-  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 2) STOP 96
-  if (a /= 12 .or. b(2) /= 8 .or. c(1, 2) /= 5) STOP 97
+  if (.not.allocated (a)) stop 90
+  if (.not.allocated (b) .or. size (b) /= 6) stop 91
+  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 6) stop 92
+  if (.not.allocated (c) .or. size (c) /= 8) stop 93
+  if (size (c, 1) /= 4 .or. size (c, 2) /= 2) stop 94
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 4) stop 95
+  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 2) stop 96
+  if (a /= 12 .or. b(2) /= 8 .or. c(1, 2) /= 5) stop 97
@@ -148,8 +148,8 @@
-  if (.not.allocated (a)) STOP 98
-  if (.not.allocated (b) .or. size (b) /= 6) STOP 99
-  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 6) STOP 100
-  if (.not.allocated (c) .or. size (c) /= 8) STOP 101
-  if (size (c, 1) /= 4 .or. size (c, 2) /= 2) STOP 102
-  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 4) STOP 103
-  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 2) STOP 104
-  if (a /= 12 .or. b(2) /= 8 .or. c(1, 2) /= 5) STOP 105
+  if (.not.allocated (a)) stop 98
+  if (.not.allocated (b) .or. size (b) /= 6) stop 99
+  if (lbound (b, 1) /= 1 .or. ubound (b, 1) /= 6) stop 100
+  if (.not.allocated (c) .or. size (c) /= 8) stop 101
+  if (size (c, 1) /= 4 .or. size (c, 2) /= 2) stop 102
+  if (lbound (c, 1) /= 1 .or. ubound (c, 1) /= 4) stop 103
+  if (lbound (c, 2) /= 1 .or. ubound (c, 2) /= 2) stop 104
+  if (a /= 12 .or. b(2) /= 8 .or. c(1, 2) /= 5) stop 105
diff --git a/libgomp/testsuite/libgomp.fortran/appendix-a/a.18.1.f90 b/libgomp/testsuite/libgomp.fortran/appendix-a/a.18.1.f90
index ad9b763425f..ca10d7f653f 100644
--- a/libgomp/testsuite/libgomp.fortran/appendix-a/a.18.1.f90
+++ b/libgomp/testsuite/libgomp.fortran/appendix-a/a.18.1.f90
@@ -56 +56 @@
-            STOP 1
+            stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/appendix-a/a.19.1.f90 b/libgomp/testsuite/libgomp.fortran/appendix-a/a.19.1.f90
index 8b09e6e9324..3b88801d42c 100644
--- a/libgomp/testsuite/libgomp.fortran/appendix-a/a.19.1.f90
+++ b/libgomp/testsuite/libgomp.fortran/appendix-a/a.19.1.f90
@@ -58 +58 @@
-          STOP 1
+          stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/associate1.f90 b/libgomp/testsuite/libgomp.fortran/associate1.f90
index c7930c7644a..31ecaf04200 100644
--- a/libgomp/testsuite/libgomp.fortran/associate1.f90
+++ b/libgomp/testsuite/libgomp.fortran/associate1.f90
@@ -15,2 +15,2 @@ program associate1
-  if (v /= -1 .or. u /= 15) STOP 1
-  if (a(2,1) /= 2.5 .or. b /= 3.5) STOP 2
+  if (v /= -1 .or. u /= 15) stop 1
+  if (a(2,1) /= 2.5 .or. b /= 3.5) stop 2
@@ -18 +18 @@ program associate1
-  if (u /= -1 .or. b /= 2.5) STOP 3
+  if (u /= -1 .or. b /= 2.5) stop 3
@@ -20 +20 @@ program associate1
-  if (u /= 15 .or. b /= 3.5) STOP 4
+  if (u /= 15 .or. b /= 3.5) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/associate2.f90 b/libgomp/testsuite/libgomp.fortran/associate2.f90
index fbeae95b18f..63d172b476c 100644
--- a/libgomp/testsuite/libgomp.fortran/associate2.f90
+++ b/libgomp/testsuite/libgomp.fortran/associate2.f90
@@ -23,2 +23,2 @@ program associate2
-  if (v(3) /= -1 .or. u(3) /= 15) STOP 1
-  if (a(2,1)%a(1,2) /= 2.5 .or. b(1,2) /= 3.5) STOP 2
+  if (v(3) /= -1 .or. u(3) /= 15) stop 1
+  if (a(2,1)%a(1,2) /= 2.5 .or. b(1,2) /= 3.5) stop 2
@@ -26 +26 @@ program associate2
-  if (u(3) /= -1 .or. b(1,2) /= 2.5) STOP 3
+  if (u(3) /= -1 .or. b(1,2) /= 2.5) stop 3
@@ -28 +28 @@ program associate2
-  if (u(3) /= 15 .or. b(1,2) /= 3.5) STOP 4
+  if (u(3) /= 15 .or. b(1,2) /= 3.5) stop 4
@@ -38,2 +38,2 @@ program associate2
-  if (a(1,2)%c(2,1)%i /= 15 .or. d(1) /= 9) STOP 5
-  if (a(1,2)%c(2,2)%i /= 15 .or. d(2) /= 7) STOP 6
+  if (a(1,2)%c(2,1)%i /= 15 .or. d(1) /= 9) stop 5
+  if (a(1,2)%c(2,2)%i /= 15 .or. d(2) /= 7) stop 6
@@ -41 +41 @@ program associate2
-  if (d(1) /= 15 .or. d(2) /= 15) STOP 7
+  if (d(1) /= 15 .or. d(2) /= 15) stop 7
@@ -43 +43 @@ program associate2
-  if (d(1) /= 9 .or. d(2) /= 7) STOP 8
+  if (d(1) /= 9 .or. d(2) /= 7) stop 8
diff --git a/libgomp/testsuite/libgomp.fortran/associate3.f90 b/libgomp/testsuite/libgomp.fortran/associate3.f90
index da788a467ea..29c2dd3fc1d 100644
--- a/libgomp/testsuite/libgomp.fortran/associate3.f90
+++ b/libgomp/testsuite/libgomp.fortran/associate3.f90
@@ -19 +19 @@
-  if (any (v%f(:).ne.21.) .or. i.ne.7) STOP 1
+  if (any (v%f(:).ne.21.) .or. i.ne.7) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/async_io_4.f90 b/libgomp/testsuite/libgomp.fortran/async_io_4.f90
index a21ffaef478..1ff76b4f162 100644
--- a/libgomp/testsuite/libgomp.fortran/async_io_4.f90
+++ b/libgomp/testsuite/libgomp.fortran/async_io_4.f90
@@ -20 +20 @@ program main
-  if (i .ne. 1) STOP 1
+  if (i .ne. 1) stop 1
@@ -26 +26 @@ program main
-  if (i .ne. 1) STOP 2
+  if (i .ne. 1) stop 2
@@ -34 +34 @@ program main
-  if (i .ne. 7) STOP 3
+  if (i .ne. 7) stop 3
@@ -41 +41 @@ program main
-  if (i .ne. 8) STOP 4
+  if (i .ne. 8) stop 4
@@ -55 +55 @@ program main
-     if (abs(x(n)-y(n)) > 0.00001) STOP 5
+     if (abs(x(n)-y(n)) > 0.00001) stop 5
@@ -72 +72 @@ program main
-  if (nr .ne. 5) STOP 6
+  if (nr .ne. 5) stop 6
@@ -80 +80 @@ program main
-     if (abs(x(1) - i) .gt. 0.001) STOP 7
+     if (abs(x(1) - i) .gt. 0.001) stop 7
@@ -86 +86 @@ program main
-  STOP 8
+  stop 8
@@ -88 +88 @@ program main
-  STOP 9
+  stop 9
diff --git a/libgomp/testsuite/libgomp.fortran/async_io_5.f90 b/libgomp/testsuite/libgomp.fortran/async_io_5.f90
index 916e78aa001..56487bbd3fa 100644
--- a/libgomp/testsuite/libgomp.fortran/async_io_5.f90
+++ b/libgomp/testsuite/libgomp.fortran/async_io_5.f90
@@ -23 +23 @@ read (99,*, iostat=stat) cvar
-if (stat /= 0 .or. cvar /= "1") STOP 1
+if (stat /= 0 .or. cvar /= "1") stop 1
@@ -25 +25 @@ read (99,*, iostat=stat) cvar
-if (stat /= 0 .or. cvar /= "2") STOP 2
+if (stat /= 0 .or. cvar /= "2") stop 2
@@ -27 +27 @@ read (99,*, iostat=stat) cvar              ! << FAILS: stat /= 0
-if (stat /= 0 .or. cvar /= "3") STOP 3 ! << aborts here
+if (stat /= 0 .or. cvar /= "3") stop 3 ! << aborts here
@@ -32 +32 @@ read (99,*, iostat=stat) var
-if (stat /= 0 .or. var /= 1.0) STOP 4
+if (stat /= 0 .or. var /= 1.0) stop 4
@@ -34 +34 @@ read (99,*, iostat=stat) var
-if (stat /= 0 .or. var /= 2.0) STOP 5
+if (stat /= 0 .or. var /= 2.0) stop 5
@@ -36 +36 @@ read (99,*, iostat=stat) var ! << FAILS: stat /= 0
-if (stat /= 0 .or. var /= 3.0) STOP 6
+if (stat /= 0 .or. var /= 3.0) stop 6
@@ -48 +48 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 7
+if (stat /= 0) stop 7
@@ -50 +50 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 8
+if (stat /= 0) stop 8
@@ -52 +52 @@ read (99,*) var ! << FAILS: stat /= 0
-if (stat /= 0) STOP 9
+if (stat /= 0) stop 9
@@ -64 +64 @@ read (99,*, iostat=stat) lvar
-if (stat /= 0 .or. (.not.lvar)) STOP 10
+if (stat /= 0 .or. (.not.lvar)) stop 10
@@ -66 +66 @@ read (99,*, iostat=stat) lvar
-if (stat /= 0 .or. lvar) STOP 11
+if (stat /= 0 .or. lvar) stop 11
@@ -68 +68 @@ read (99,*) lvar ! << FAILS: stat /= 0
-if (stat /= 0 .or. (.not.lvar)) STOP 12
+if (stat /= 0 .or. (.not.lvar)) stop 12
@@ -80 +80 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 13
+if (stat /= 0) stop 13
@@ -82 +82 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 14
+if (stat /= 0) stop 14
@@ -84 +84 @@ read (99,*) var          ! << FAILS: stat /= 0
-if (stat /= 0) STOP 1! << aborts here
+if (stat /= 0) stop 1! << aborts here
@@ -95 +95 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 15
+if (stat /= 0) stop 15
@@ -97 +97 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 16
+if (stat /= 0) stop 16
@@ -99 +99 @@ read (99,*) var          ! << FAILS: stat /= 0
-if (stat /= 0) STOP 2! << aborts here
+if (stat /= 0) stop 2! << aborts here
@@ -110 +110 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 17
+if (stat /= 0) stop 17
@@ -112 +112 @@ read (99,*, iostat=stat) var
-if (stat /= 0) STOP 18
+if (stat /= 0) stop 18
@@ -114 +114 @@ read (99,*) var          ! << FAILS: stat /= 0
-if (stat /= 0) STOP 3! << aborts here
+if (stat /= 0) stop 3! << aborts here
@@ -126 +126 @@ read (99,*, iostat=stat) cval
-if (stat /= 0 .or. cval /= cmplx(1,2)) STOP 19
+if (stat /= 0 .or. cval /= cmplx(1,2)) stop 19
@@ -128 +128 @@ read (99,*, iostat=stat) cval
-if (stat /= 0 .or. cval /= cmplx(2,3)) STOP 20
+if (stat /= 0 .or. cval /= cmplx(2,3)) stop 20
@@ -130 +130 @@ read (99,*, iostat=stat) cval      ! << FAILS: stat /= 0, value is okay
-if (stat /= 0 .or. cval /= cmplx(4,5)) STOP 21
+if (stat /= 0 .or. cval /= cmplx(4,5)) stop 21
diff --git a/libgomp/testsuite/libgomp.fortran/async_io_6.f90 b/libgomp/testsuite/libgomp.fortran/async_io_6.f90
index f19c0379202..75f5ca7a2af 100644
--- a/libgomp/testsuite/libgomp.fortran/async_io_6.f90
+++ b/libgomp/testsuite/libgomp.fortran/async_io_6.f90
@@ -20 +20 @@ program flush_1
-   if (ios /= 0) STOP 1
+   if (ios /= 0) stop 1
@@ -25 +25 @@ program flush_1
-20 STOP 2
+20 stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/async_io_7.f90 b/libgomp/testsuite/libgomp.fortran/async_io_7.f90
index a7ce9ba47a7..0c8dd1b8056 100644
--- a/libgomp/testsuite/libgomp.fortran/async_io_7.f90
+++ b/libgomp/testsuite/libgomp.fortran/async_io_7.f90
@@ -19 +19 @@ program newunit_1
-  if (str.ne." abcdefghijklmnop") STOP 1
+  if (str.ne." abcdefghijklmnop") stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/cancel-do-1.f90 b/libgomp/testsuite/libgomp.fortran/cancel-do-1.f90
index 84009ec2ac9..1c44e25d77d 100644
--- a/libgomp/testsuite/libgomp.fortran/cancel-do-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/cancel-do-1.f90
@@ -11 +11 @@
-	if (omp_get_cancellation ()) STOP 1
+	if (omp_get_cancellation ()) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/cancel-do-2.f90 b/libgomp/testsuite/libgomp.fortran/cancel-do-2.f90
index 9d8e91cec98..b5cca934291 100644
--- a/libgomp/testsuite/libgomp.fortran/cancel-do-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/cancel-do-2.f90
@@ -25 +25 @@ contains
-	  STOP 1
+	  stop 1
@@ -50 +50 @@ contains
-    if (v.ne.3000.or.w.ne.0) STOP 2
+    if (v.ne.3000.or.w.ne.0) stop 2
@@ -59 +59 @@ contains
-	  STOP 3
+	  stop 3
@@ -88 +88 @@ contains
-    if (v.ne.6000.or.w.ne.0) STOP 4
+    if (v.ne.6000.or.w.ne.0) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/cancel-parallel-1.f90 b/libgomp/testsuite/libgomp.fortran/cancel-parallel-1.f90
index dc0f69b13ed..759870189ef 100644
--- a/libgomp/testsuite/libgomp.fortran/cancel-parallel-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/cancel-parallel-1.f90
@@ -8 +8 @@
-    if (omp_get_cancellation ()) STOP 1
+    if (omp_get_cancellation ()) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/cancel-sections-1.f90 b/libgomp/testsuite/libgomp.fortran/cancel-sections-1.f90
index 7e1d4b37534..cfc3903592f 100644
--- a/libgomp/testsuite/libgomp.fortran/cancel-sections-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/cancel-sections-1.f90
@@ -10 +10 @@
-	  STOP 1
+	  stop 1
@@ -13 +13 @@
-	  STOP 2
+	  stop 2
@@ -16 +16 @@
-	  STOP 3
+	  stop 3
@@ -19 +19 @@
-	  STOP 4
+	  stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/cancel-taskgroup-2.f90 b/libgomp/testsuite/libgomp.fortran/cancel-taskgroup-2.f90
index 54c52208b97..693241ef71c 100644
--- a/libgomp/testsuite/libgomp.fortran/cancel-taskgroup-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/cancel-taskgroup-2.f90
@@ -11 +11 @@
-	STOP 1
+	stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/character1.f90 b/libgomp/testsuite/libgomp.fortran/character1.f90
index a672b7d2fdc..eb3c21d068d 100644
--- a/libgomp/testsuite/libgomp.fortran/character1.f90
+++ b/libgomp/testsuite/libgomp.fortran/character1.f90
@@ -70 +70 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/character2.f90 b/libgomp/testsuite/libgomp.fortran/character2.f90
index 20a3f07c4b3..67ce63ac624 100644
--- a/libgomp/testsuite/libgomp.fortran/character2.f90
+++ b/libgomp/testsuite/libgomp.fortran/character2.f90
@@ -59 +59 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/collapse1.f90 b/libgomp/testsuite/libgomp.fortran/collapse1.f90
index 3777b520245..c22085599c2 100644
--- a/libgomp/testsuite/libgomp.fortran/collapse1.f90
+++ b/libgomp/testsuite/libgomp.fortran/collapse1.f90
@@ -25 +25 @@ program collapse1
-  if (l) STOP 1
+  if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/collapse2.f90 b/libgomp/testsuite/libgomp.fortran/collapse2.f90
index 32d9fdd816f..47cd7c9e580 100644
--- a/libgomp/testsuite/libgomp.fortran/collapse2.f90
+++ b/libgomp/testsuite/libgomp.fortran/collapse2.f90
@@ -28 +28 @@ firstdo: do i = 1, 3
-    if (l) STOP 1
+    if (l) stop 1
@@ -41 +41 @@ firstdo: do i = 1, 3
-    if (any(a(1:3,1:3,1:3).ne.1)) STOP 2
+    if (any(a(1:3,1:3,1:3).ne.1)) stop 2
@@ -51 +51 @@ firstdo: do i = 1, 3
-    if (any(a(1:3,1:3,1:3).ne.2)) STOP 3
+    if (any(a(1:3,1:3,1:3).ne.2)) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/collapse3.f90 b/libgomp/testsuite/libgomp.fortran/collapse3.f90
index 001dc2ac630..d463b4f39cc 100644
--- a/libgomp/testsuite/libgomp.fortran/collapse3.f90
+++ b/libgomp/testsuite/libgomp.fortran/collapse3.f90
@@ -27,2 +27,2 @@ contains
-    if (i.ne.7.or.j.ne.5.or.k.ne.19) STOP 1
-    if (m.ne.(600+40+18)) STOP 2
+    if (i.ne.7.or.j.ne.5.or.k.ne.19) stop 1
+    if (m.ne.(600+40+18)) stop 2
@@ -59,2 +59,2 @@ contains
-    if (i.ne.7.or.j.ne.5.or.k.ne.19) STOP 3
-    if (m.ne.(600+40+18)) STOP 4
+    if (i.ne.7.or.j.ne.5.or.k.ne.19) stop 3
+    if (m.ne.(600+40+18)) stop 4
@@ -91,2 +91,2 @@ contains
-    if (i.ne.7.or.j.ne.5.or.k.ne.19) STOP 5
-    if (m.ne.(600+40+18)) STOP 6
+    if (i.ne.7.or.j.ne.5.or.k.ne.19) stop 5
+    if (m.ne.(600+40+18)) stop 6
@@ -123,2 +123,2 @@ contains
-    if (i.ne.7.or.j.ne.5.or.k.ne.19) STOP 7
-    if (m.ne.(600+40+18)) STOP 8
+    if (i.ne.7.or.j.ne.5.or.k.ne.19) stop 7
+    if (m.ne.(600+40+18)) stop 8
@@ -156,2 +156,2 @@ contains
-    if (i.ne.7.or.j.ne.5.or.k.ne.19) STOP 9
-    if (m.ne.(600+40+18)) STOP 10
+    if (i.ne.7.or.j.ne.5.or.k.ne.19) stop 9
+    if (m.ne.(600+40+18)) stop 10
@@ -189,2 +189,2 @@ contains
-    if (i.ne.7.or.j.ne.5.or.k.ne.19) STOP 11
-    if (m.ne.(600+40+18)) STOP 12
+    if (i.ne.7.or.j.ne.5.or.k.ne.19) stop 11
+    if (m.ne.(600+40+18)) stop 12
diff --git a/libgomp/testsuite/libgomp.fortran/collapse4.f90 b/libgomp/testsuite/libgomp.fortran/collapse4.f90
index 2019d8dcccd..8c28571975b 100644
--- a/libgomp/testsuite/libgomp.fortran/collapse4.f90
+++ b/libgomp/testsuite/libgomp.fortran/collapse4.f90
@@ -11 +11 @@
-  if (i .ne. 18 .or. j .ne. 7 .or. k .ne. 6) STOP 1
+  if (i .ne. 18 .or. j .ne. 7 .or. k .ne. 6) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/crayptr1.f90 b/libgomp/testsuite/libgomp.fortran/crayptr1.f90
index 28e2aa62d80..2340257f3f6 100644
--- a/libgomp/testsuite/libgomp.fortran/crayptr1.f90
+++ b/libgomp/testsuite/libgomp.fortran/crayptr1.f90
@@ -29 +29 @@
-  if (l) STOP 1
+  if (l) stop 1
@@ -44 +44 @@
-  if (l) STOP 2
+  if (l) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/crayptr2.f90 b/libgomp/testsuite/libgomp.fortran/crayptr2.f90
index 2847de92e37..3014be832a3 100644
--- a/libgomp/testsuite/libgomp.fortran/crayptr2.f90
+++ b/libgomp/testsuite/libgomp.fortran/crayptr2.f90
@@ -30 +30 @@
-  if (l) STOP 1
+  if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/crayptr3.f90 b/libgomp/testsuite/libgomp.fortran/crayptr3.f90
index bb48f9e7371..2d360fa5a8b 100644
--- a/libgomp/testsuite/libgomp.fortran/crayptr3.f90
+++ b/libgomp/testsuite/libgomp.fortran/crayptr3.f90
@@ -21 +21 @@
-  if (l) STOP 1
+  if (l) stop 1
@@ -34,2 +34,2 @@
-  if (l) STOP 2
-  if (p .ne. 3) STOP 3
+  if (l) stop 2
+  if (p .ne. 3) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/declare-simd-1.f90 b/libgomp/testsuite/libgomp.fortran/declare-simd-1.f90
index c5b021dd951..cb8f4df8d62 100644
--- a/libgomp/testsuite/libgomp.fortran/declare-simd-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/declare-simd-1.f90
@@ -64 +64 @@ end module declare_simd_1_mod
-  if (any (b.ne.d)) STOP 1
+  if (any (b.ne.d)) stop 1
@@ -74 +74 @@ end module declare_simd_1_mod
-    if (b(i).ne.(7.0 + 4.0 * i)) STOP 2
+    if (b(i).ne.(7.0 + 4.0 * i)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/declare-simd-3.f90 b/libgomp/testsuite/libgomp.fortran/declare-simd-3.f90
index 85cea9cab0a..3a20e0aad70 100644
--- a/libgomp/testsuite/libgomp.fortran/declare-simd-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/declare-simd-3.f90
@@ -20 +20 @@ subroutine bar
-    if (b(i).ne.(7.0 + 10.0 * i * i)) STOP 1
+    if (b(i).ne.(7.0 + 10.0 * i * i)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/declare-target-2.f90 b/libgomp/testsuite/libgomp.fortran/declare-target-2.f90
index 1fbc0dc0cb7..85fc68c6ede 100644
--- a/libgomp/testsuite/libgomp.fortran/declare-target-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/declare-target-2.f90
@@ -17 +17 @@ subroutine foo
-  if (var_x /= 20) STOP 1
+  if (var_x /= 20) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/depend-1.f90 b/libgomp/testsuite/libgomp.fortran/depend-1.f90
index 5f7bb5faf21..85792fa9b4b 100644
--- a/libgomp/testsuite/libgomp.fortran/depend-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/depend-1.f90
@@ -24 +24 @@ contains
-          if (x.ne.2) STOP 1
+          if (x.ne.2) stop 1
@@ -39 +39 @@ contains
-          if (x.ne.2) STOP 2
+          if (x.ne.2) stop 2
@@ -55 +55 @@ contains
-          if (x.ne.2) STOP 3
+          if (x.ne.2) stop 3
@@ -70 +70 @@ contains
-          if (x.ne.1) STOP 4
+          if (x.ne.1) stop 4
@@ -82 +82 @@ contains
-          if (x.ne.1) STOP 5
+          if (x.ne.1) stop 5
@@ -98 +98 @@ contains
-            if (x.ne.1) STOP 6
+            if (x.ne.1) stop 6
@@ -114 +114 @@ contains
-          if (x.ne.1) STOP 7
+          if (x.ne.1) stop 7
@@ -135 +135 @@ contains
-        if (x.ne.2) STOP 8
+        if (x.ne.2) stop 8
@@ -149 +149 @@ contains
-          if (x.ne.2) STOP 9
+          if (x.ne.2) stop 9
@@ -152 +152 @@ contains
-          if (x.ne.2) STOP 10
+          if (x.ne.2) stop 10
@@ -155 +155 @@ contains
-          if (x.ne.2) STOP 11
+          if (x.ne.2) stop 11
@@ -170 +170 @@ contains
-          if (x.ne.2) STOP 12
+          if (x.ne.2) stop 12
@@ -173 +173 @@ contains
-          if (x.ne.2) STOP 13
+          if (x.ne.2) stop 13
@@ -176 +176 @@ contains
-          if (x.ne.2) STOP 14
+          if (x.ne.2) stop 14
@@ -192 +192 @@ contains
-          if (x.ne.2) STOP 15
+          if (x.ne.2) stop 15
@@ -195 +195 @@ contains
-          if (x.ne.2) STOP 16
+          if (x.ne.2) stop 16
@@ -198 +198 @@ contains
-          if (x.ne.2) STOP 17
+          if (x.ne.2) stop 17
diff --git a/libgomp/testsuite/libgomp.fortran/depend-2.f90 b/libgomp/testsuite/libgomp.fortran/depend-2.f90
index b53ba0795e6..4384c1f760e 100644
--- a/libgomp/testsuite/libgomp.fortran/depend-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/depend-2.f90
@@ -9 +9 @@
-	  if (y.ne.1) STOP 1
+	  if (y.ne.1) stop 1
@@ -17 +17 @@
-	  if (y.ne.2) STOP 2
+	  if (y.ne.2) stop 2
@@ -25 +25 @@
-	  if (y.ne.3) STOP 3
+	  if (y.ne.3) stop 3
@@ -33 +33 @@
-  if (y.ne.4) STOP 4
+  if (y.ne.4) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/depend-3.f90 b/libgomp/testsuite/libgomp.fortran/depend-3.f90
index 09478da4134..aa948edd916 100644
--- a/libgomp/testsuite/libgomp.fortran/depend-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/depend-3.f90
@@ -16 +16 @@ contains
-  	  if (y.ne.1) STOP 1
+  	  if (y.ne.1) stop 1
@@ -24 +24 @@ contains
-  	  if (y.ne.2) STOP 2
+  	  if (y.ne.2) stop 2
@@ -32 +32 @@ contains
-  	  if (y.ne.3) STOP 3
+  	  if (y.ne.3) stop 3
@@ -40 +40 @@ contains
-    if (y.ne.4) STOP 4
+    if (y.ne.4) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/do1.f90 b/libgomp/testsuite/libgomp.fortran/do1.f90
index bb7b6d83e14..e85f6371a9b 100644
--- a/libgomp/testsuite/libgomp.fortran/do1.f90
+++ b/libgomp/testsuite/libgomp.fortran/do1.f90
@@ -50 +50 @@
-  if (any (a .ne. b)) STOP 1
+  if (any (a .ne. b)) stop 1
@@ -82 +82 @@
-  if (any (a .ne. b)) STOP 2
+  if (any (a .ne. b)) stop 2
@@ -114 +114 @@
-  if (any (a .ne. b)) STOP 3
+  if (any (a .ne. b)) stop 3
@@ -146 +146 @@
-  if (any (a .ne. b)) STOP 4
+  if (any (a .ne. b)) stop 4
@@ -178 +178 @@
-  if (any (a .ne. b)) STOP 5
+  if (any (a .ne. b)) stop 5
diff --git a/libgomp/testsuite/libgomp.fortran/do2.f90 b/libgomp/testsuite/libgomp.fortran/do2.f90
index 11e3b8cec11..b6081831b1f 100644
--- a/libgomp/testsuite/libgomp.fortran/do2.f90
+++ b/libgomp/testsuite/libgomp.fortran/do2.f90
@@ -89 +89 @@
-  if (any (a .ne. b) .or. k) STOP 1
+  if (any (a .ne. b) .or. k) stop 1
@@ -158 +158 @@
-  if (any (a .ne. b) .or. k) STOP 2
+  if (any (a .ne. b) .or. k) stop 2
@@ -227 +227 @@
-  if (any (a .ne. b) .or. k) STOP 3
+  if (any (a .ne. b) .or. k) stop 3
@@ -296 +296 @@
-  if (any (a .ne. b) .or. k) STOP 4
+  if (any (a .ne. b) .or. k) stop 4
@@ -365 +365 @@
-  if (any (a .ne. b) .or. k) STOP 5
+  if (any (a .ne. b) .or. k) stop 5
diff --git a/libgomp/testsuite/libgomp.fortran/do_concurrent_5.f90 b/libgomp/testsuite/libgomp.fortran/do_concurrent_5.f90
index 6fb9d1e8d96..971cd634a5f 100644
--- a/libgomp/testsuite/libgomp.fortran/do_concurrent_5.f90
+++ b/libgomp/testsuite/libgomp.fortran/do_concurrent_5.f90
@@ -36 +36 @@ program main
-    if (abs (sum(pi) - atan(1.0d0)) > 1e-5) STOP 1
+    if (abs (sum(pi) - atan(1.0d0)) > 1e-5) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/doacross1.f90 b/libgomp/testsuite/libgomp.fortran/doacross1.f90
index e3beda05e89..2b15e7d7d11 100644
--- a/libgomp/testsuite/libgomp.fortran/doacross1.f90
+++ b/libgomp/testsuite/libgomp.fortran/doacross1.f90
@@ -20 +20 @@
-        if (l.lt.2) STOP 1
+        if (l.lt.2) stop 1
@@ -27 +27 @@
-        if (l.eq.3) STOP 2
+        if (l.eq.3) stop 2
@@ -46 +46 @@
-            if (l.lt.2) STOP 3
+            if (l.lt.2) stop 3
@@ -53 +53 @@
-            if (l.lt.2) STOP 4
+            if (l.lt.2) stop 4
@@ -58 +58 @@
-            if (l.lt.2) STOP 5
+            if (l.lt.2) stop 5
@@ -97 +97 @@
-              if (l.lt.2) STOP 6
+              if (l.lt.2) stop 6
@@ -104 +104 @@
-              if (l.lt.2) STOP 7
+              if (l.lt.2) stop 7
@@ -109 +109 @@
-              if (l.lt.2) STOP 8
+              if (l.lt.2) stop 8
@@ -140 +140 @@
-            if (e.eq.0) STOP 9
+            if (e.eq.0) stop 9
@@ -146 +146 @@
-    if (i.ne.1.or.j.ne.-1.or.k.ne.0) STOP 10
+    if (i.ne.1.or.j.ne.-1.or.k.ne.0) stop 10
@@ -156 +156 @@
-            STOP 11
+            stop 11
@@ -162 +162 @@
-    if (i.ne.1.or.j.ne.-1.or.k.ne.2.or.m.ne.0) STOP 12
+    if (i.ne.1.or.j.ne.-1.or.k.ne.2.or.m.ne.0) stop 12
@@ -171 +171 @@
-            if (e.eq.0) STOP 13
+            if (e.eq.0) stop 13
@@ -179 +179 @@
-      if (a(i) .ne. 3) STOP 14
+      if (a(i) .ne. 3) stop 14
@@ -187 +187 @@
-            if (b(i,j,k).ne.3) STOP 15
+            if (b(i,j,k).ne.3) stop 15
@@ -189 +189 @@
-            if (b(i,j,k).ne.0) STOP 16
+            if (b(i,j,k).ne.0) stop 16
@@ -200 +200 @@
-            if (c(i,j,k).ne.3) STOP 17
+            if (c(i,j,k).ne.3) stop 17
@@ -202 +202 @@
-            if (c(i,j,k).ne.0) STOP 18
+            if (c(i,j,k).ne.0) stop 18
diff --git a/libgomp/testsuite/libgomp.fortran/doacross2.f90 b/libgomp/testsuite/libgomp.fortran/doacross2.f90
index 226dbe2c14e..213ac715f9e 100644
--- a/libgomp/testsuite/libgomp.fortran/doacross2.f90
+++ b/libgomp/testsuite/libgomp.fortran/doacross2.f90
@@ -23 +23 @@
-        if (l.lt.2) STOP 1
+        if (l.lt.2) stop 1
@@ -30 +30 @@
-        if (l.eq.3) STOP 2
+        if (l.eq.3) stop 2
@@ -49 +49 @@
-            if (l.lt.2) STOP 3
+            if (l.lt.2) stop 3
@@ -56 +56 @@
-            if (l.lt.2) STOP 4
+            if (l.lt.2) stop 4
@@ -61 +61 @@
-            if (l.lt.2) STOP 5
+            if (l.lt.2) stop 5
@@ -100 +100 @@
-              if (l.lt.2) STOP 6
+              if (l.lt.2) stop 6
@@ -107 +107 @@
-              if (l.lt.2) STOP 7
+              if (l.lt.2) stop 7
@@ -112 +112 @@
-              if (l.lt.2) STOP 8
+              if (l.lt.2) stop 8
@@ -148 +148 @@
-            if (l.lt.2) STOP 9
+            if (l.lt.2) stop 9
@@ -155 +155 @@
-            if (l.lt.2) STOP 10
+            if (l.lt.2) stop 10
@@ -160 +160 @@
-            if (l.lt.2) STOP 11
+            if (l.lt.2) stop 11
@@ -176 +176 @@
-            if (e.eq.0) STOP 12
+            if (e.eq.0) stop 12
@@ -182 +182 @@
-    if (i.ne.3.or.j.ne.-1.or.k.ne.0) STOP 13
+    if (i.ne.3.or.j.ne.-1.or.k.ne.0) stop 13
@@ -192 +192 @@
-            STOP 14
+            stop 14
@@ -198 +198 @@
-    if (i.ne.3.or.j.ne.-1.or.k.ne.2.or.m.ne.0) STOP 15
+    if (i.ne.3.or.j.ne.-1.or.k.ne.2.or.m.ne.0) stop 15
@@ -207 +207 @@
-            if (e.eq.0) STOP 16
+            if (e.eq.0) stop 16
@@ -214 +214 @@
-    if (a(1) .ne. 0) STOP 17
+    if (a(1) .ne. 0) stop 17
@@ -218 +218 @@
-      if (a(i) .ne. 3) STOP 18
+      if (a(i) .ne. 3) stop 18
@@ -226 +226 @@
-            if (b(i,j,k).ne.3) STOP 19
+            if (b(i,j,k).ne.3) stop 19
@@ -228 +228 @@
-            if (b(i,j,k).ne.0) STOP 20
+            if (b(i,j,k).ne.0) stop 20
@@ -239 +239 @@
-            if (c(i,j,k).ne.3) STOP 21
+            if (c(i,j,k).ne.3) stop 21
@@ -241 +241 @@
-            if (c(i,j,k).ne.0) STOP 22
+            if (c(i,j,k).ne.0) stop 22
@@ -252 +252 @@
-            if (g(i,j,k).ne.3) STOP 23
+            if (g(i,j,k).ne.3) stop 23
@@ -254 +254 @@
-            if (g(i,j,k).ne.0) STOP 24
+            if (g(i,j,k).ne.0) stop 24
diff --git a/libgomp/testsuite/libgomp.fortran/doacross3.f90 b/libgomp/testsuite/libgomp.fortran/doacross3.f90
index 6649894a8fe..5ba57008c6f 100644
--- a/libgomp/testsuite/libgomp.fortran/doacross3.f90
+++ b/libgomp/testsuite/libgomp.fortran/doacross3.f90
@@ -23 +23 @@
-        if (l.lt.2) STOP 1
+        if (l.lt.2) stop 1
@@ -30 +30 @@
-        if (l.eq.3) STOP 2
+        if (l.eq.3) stop 2
@@ -49 +49 @@
-            if (l.lt.2) STOP 3
+            if (l.lt.2) stop 3
@@ -56 +56 @@
-            if (l.lt.2) STOP 4
+            if (l.lt.2) stop 4
@@ -61 +61 @@
-            if (l.lt.2) STOP 5
+            if (l.lt.2) stop 5
@@ -100 +100 @@
-              if (l.lt.2) STOP 6
+              if (l.lt.2) stop 6
@@ -107 +107 @@
-              if (l.lt.2) STOP 7
+              if (l.lt.2) stop 7
@@ -112 +112 @@
-              if (l.lt.2) STOP 8
+              if (l.lt.2) stop 8
@@ -148 +148 @@
-            if (l.lt.2) STOP 9
+            if (l.lt.2) stop 9
@@ -155 +155 @@
-            if (l.lt.2) STOP 10
+            if (l.lt.2) stop 10
@@ -160 +160 @@
-            if (l.lt.2) STOP 11
+            if (l.lt.2) stop 11
@@ -176 +176 @@
-            if (e.eq.0) STOP 12
+            if (e.eq.0) stop 12
@@ -182 +182 @@
-    if (i.ne.3.or.j.ne.-1.or.k.ne.0) STOP 13
+    if (i.ne.3.or.j.ne.-1.or.k.ne.0) stop 13
@@ -192 +192 @@
-            STOP 14
+            stop 14
@@ -198 +198 @@
-    if (i.ne.3.or.j.ne.-1.or.k.ne.2.or.m.ne.0) STOP 15
+    if (i.ne.3.or.j.ne.-1.or.k.ne.2.or.m.ne.0) stop 15
@@ -207 +207 @@
-            if (e.eq.0) STOP 16
+            if (e.eq.0) stop 16
@@ -214 +214 @@
-    if (a(1) .ne. 0) STOP 17
+    if (a(1) .ne. 0) stop 17
@@ -218 +218 @@
-      if (a(i) .ne. 3) STOP 18
+      if (a(i) .ne. 3) stop 18
@@ -226 +226 @@
-            if (b(i,j,k).ne.3) STOP 19
+            if (b(i,j,k).ne.3) stop 19
@@ -228 +228 @@
-            if (b(i,j,k).ne.0) STOP 20
+            if (b(i,j,k).ne.0) stop 20
@@ -239 +239 @@
-            if (c(i,j,k).ne.3) STOP 21
+            if (c(i,j,k).ne.3) stop 21
@@ -241 +241 @@
-            if (c(i,j,k).ne.0) STOP 22
+            if (c(i,j,k).ne.0) stop 22
@@ -252 +252 @@
-            if (g(i,j,k).ne.3) STOP 23
+            if (g(i,j,k).ne.3) stop 23
@@ -254 +254 @@
-            if (g(i,j,k).ne.0) STOP 24
+            if (g(i,j,k).ne.0) stop 24
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-3.f90
index 08091b83fcb..50c71300fb6 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-3.f90
@@ -15 +15 @@ contains
-    if (A(3) /= 777 .or. A(9) /= 777) STOP 1
+    if (A(3) /= 777 .or. A(9) /= 777) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-4.f90
index f730894bd95..e6715e37532 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/array_sections-4.f90
@@ -16 +16 @@ contains
-    if (A(3) /= 777 .or. A(9) /= 999) STOP 1
+    if (A(3) /= 777 .or. A(9) /= 999) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90
index dd6f7f5a791..6d1fc98cb74 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90
@@ -30 +30 @@ subroutine check ()
-    if (err > EPS .or. err < -EPS) STOP 1
+    if (err > EPS .or. err < -EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90
index 2380f3a01f0..ad35539aa44 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90
@@ -20 +20 @@ subroutine check (p, N)
-    if (diff > EPS .or. -diff > EPS) STOP 1
+    if (diff > EPS .or. -diff > EPS) stop 1
@@ -33 +33 @@ subroutine vec_mult (p, N)
-        if (omp_is_initial_device ()) STOP 2
+        if (omp_is_initial_device ()) stop 2
@@ -40 +40 @@ subroutine vec_mult (p, N)
-        if (omp_is_initial_device ()) STOP 3
+        if (omp_is_initial_device ()) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-1.f90
index 51de6b26b36..e439fe1b738 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-1.f90
@@ -29 +29 @@ program e_53_1
-  if (fib (15) /= fib_wrapper (15)) STOP 1
+  if (fib (15) /= fib_wrapper (15)) stop 1
@@ -32 +32 @@ program e_53_1
-  if (fib (23) /= fib_wrapper (23)) STOP 2
+  if (fib (23) /= fib_wrapper (23)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90
index 76cce01a658..ee582b21632 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90
@@ -11 +11 @@ program e_53_2
-  if (x /= fib (23)) STOP 1
+  if (x /= fib (23)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90
index 1405ea71793..1d332496ce5 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90
@@ -24 +24 @@ subroutine check (p, N)
-    if (diff > EPS .or. -diff > EPS) STOP 1
+    if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90
index 47d6cd87d5f..a1f6478388f 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90
@@ -56 +56 @@ subroutine check (a, b)
-  if (err > EPS .or. err < -EPS) STOP 1
+  if (err > EPS .or. err < -EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90
index 8fd6af7d738..5b334514a4d 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90
@@ -71 +71 @@ subroutine check (a, b)
-  if (err > EPS .or. err < -EPS) STOP 1
+  if (err > EPS .or. err < -EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/device-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/device-1.f90
index a141e058e52..f7db7bdb505 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/device-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/device-1.f90
@@ -23 +23 @@ program e_57_1
-  if (b /= 100 .or. .not. c .or. d) STOP 1
+  if (b /= 100 .or. .not. c .or. d) stop 1
@@ -39 +39 @@ program e_57_1
-  if (b /= 0 .or. c .or. d) STOP 2
+  if (b /= 0 .or. c .or. d) stop 2
@@ -55 +55 @@ program e_57_1
-  if (b /= 100 .or. .not. c .or. d) STOP 3
+  if (b /= 100 .or. .not. c .or. d) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/device-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/device-2.f90
index a7d4f24611f..a63162198d4 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/device-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/device-2.f90
@@ -18 +18 @@ program e_57_2
-    if (offload(i)) STOP 1
+    if (offload(i)) stop 1
@@ -22 +22 @@ program e_57_2
-    if (.not. offload(i)) STOP 2
+    if (.not. offload(i)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/device-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/device-3.f90
index d6bc042d6c2..50c75c03f14 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/device-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/device-3.f90
@@ -14 +14 @@ program e_57_3
-  if (res) STOP 1
+  if (res) stop 1
@@ -20 +20 @@ program e_57_3
-  if (.not. res) STOP 2
+  if (.not. res) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-1.f90
index 1d705535cfd..04f659a84f5 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-1.f90
@@ -31 +31 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-2.f90
index c9c162fef0d..3bb88388ad2 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-2.f90
@@ -52 +52 @@ contains
-        if (diff > EPS .or. -diff > EPS) STOP 1
+        if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-3.f90
index eb8497053bf..5e376f604b9 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-3.f90
@@ -60 +60 @@ program SIMD3
-  if (diff > EPS .or. -diff > EPS) STOP 1
+  if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-4.f90
index cb78e2c7765..551b8396f13 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-4.f90
@@ -50 +50 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-5.f90
index 561deb786c4..d2c266cba55 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-5.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-5.f90
@@ -59 +59 @@ contains
-        if (diff > EPS .or. -diff > EPS) STOP 1
+        if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-6.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-6.f90
index 7f7c5101475..7540a945628 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-6.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-6.f90
@@ -112 +112 @@ contains
-        if (diff > EPS .or. -diff > EPS) STOP 1
+        if (diff > EPS .or. -diff > EPS) stop 1
@@ -119 +119 @@ contains
-        if (a(i) .ne. b(i)) STOP 2
+        if (a(i) .ne. b(i)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-7.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-7.f90
index e6af9c8224b..1e2233ee869 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-7.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-7.f90
@@ -26 +26 @@ program fibonacci
-     if (a(i) .ne. a_ref(i)) STOP 1
+     if (a(i) .ne. a_ref(i)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/simd-8.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/simd-8.f90
index 722d9824c5f..5fa4db5cf5a 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/simd-8.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/simd-8.f90
@@ -50 +50 @@ program simd_8f
-  if (diff > EPS .or. -diff > EPS) STOP 1
+  if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90
index 2ec4f68f309..b5dfd09dd75 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90
@@ -20 +20 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90
index e995ef5a3ac..7e01c57bf80 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90
@@ -20 +20 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90
index 338189f6952..76eb6d17bd7 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90
@@ -20 +20 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90
index 856ccdb536a..71f0f69e046 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90
@@ -20 +20 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-5.f90
index bae30414234..b4fd99efa74 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target-5.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-5.f90
@@ -22 +22 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
@@ -32 +32 @@ contains
-      if (omp_is_initial_device ()) STOP 2
+      if (omp_is_initial_device ()) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90
index f9cceb94050..b3b2a48ca5a 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90
@@ -20 +20 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90
index 219b450c005..217cc73061a 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90
@@ -29 +29 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90
index b48dbe29836..6d470cfd9e9 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90
@@ -22 +22 @@ contains
-        if (diff > EPS .or. -diff > EPS) STOP 1
+        if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90
index 7499e3b70a5..24554aa5f89 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90
@@ -20 +20 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90
index 8057d058a21..364e2f36a96 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90
@@ -20 +20 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-6.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-6.f90
index ba6d879ca8b..c578eba4dc1 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-6.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-6.f90
@@ -31 +31 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
@@ -42 +42 @@ contains
-        if (omp_is_initial_device ()) STOP 2
+        if (omp_is_initial_device ()) stop 2
@@ -50 +50 @@ contains
-        if (omp_is_initial_device ()) STOP 3
+        if (omp_is_initial_device ()) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-7.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-7.f90
index 629ef2c6c4d..ec8ef07d3d3 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-7.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-7.f90
@@ -22 +22 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
@@ -33 +33 @@ contains
-        if (omp_is_initial_device ()) STOP 2
+        if (omp_is_initial_device ()) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90
index 1861d4405a5..8a6b23014fa 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90
@@ -29 +29 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90
index 7734a6adb96..149449239ba 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90
@@ -29 +29 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-1.f90
index f40e36f3bca..1e24a4067d8 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-1.f90
@@ -12 +12 @@ program example
-         if (x .ne. 2) STOP 1
+         if (x .ne. 2) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-2.f90
index 7debb607ff4..e13b3d69a4b 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-2.f90
@@ -9 +9 @@ program example
-         if (x .ne. 1) STOP 1
+         if (x .ne. 1) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-3.f90
index 34cd2c74970..a12998db1e4 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-3.f90
@@ -15 +15 @@ program example
-      if ((x .ne. 1) .and. (x .ne. 2)) STOP 1
+      if ((x .ne. 1) .and. (x .ne. 2)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-4.f90
index 47e93f9213b..ab78626dd3b 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-4.f90
@@ -12 +12 @@ program example
-         if (x .ne. 2) STOP 1
+         if (x .ne. 2) stop 1
@@ -15 +15 @@ program example
-         if (x .ne. 2) STOP 2
+         if (x .ne. 2) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-5.f90
index 9e12db3386c..45054dfba9e 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-5.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/task_dep-5.f90
@@ -54 +54 @@ contains
-          STOP 1
+          stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90
index 794c907e975..a288c3a9f6e 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90
@@ -52 +52 @@ subroutine check (a, b)
-  if (err > EPS .or. err < -EPS) STOP 1
+  if (err > EPS .or. err < -EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90
index 1c8f7d8a43d..f4d95853acc 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90
@@ -45 +45 @@ subroutine check (a, b)
-  if (err > EPS .or. err < -EPS) STOP 1
+  if (err > EPS .or. err < -EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90
index 94de777c71c..4911ea4df75 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90
@@ -47 +47 @@ subroutine check (a, b)
-  if (err > EPS .or. err < -EPS) STOP 1
+  if (err > EPS .or. err < -EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-5.f90
index 7e380ad2658..243164ec785 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-5.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-5.f90
@@ -21 +21 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90
index 8121fba67d7..677ce0179a9 100644
--- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90
+++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90
@@ -21 +21 @@ contains
-      if (diff > EPS .or. -diff > EPS) STOP 1
+      if (diff > EPS .or. -diff > EPS) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/lastprivate1.f90 b/libgomp/testsuite/libgomp.fortran/lastprivate1.f90
index 132617b5c27..4eae92b39e8 100644
--- a/libgomp/testsuite/libgomp.fortran/lastprivate1.f90
+++ b/libgomp/testsuite/libgomp.fortran/lastprivate1.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -7 +8 @@ program lastprivate
-  if (i .ne. 21) STOP 1
+  if (i .ne. 21) stop 1
@@ -11 +12 @@ program lastprivate
-  if (i .ne. 64) STOP 2
+  if (i .ne. 64) stop 2
@@ -15 +16 @@ program lastprivate
-  if (i .ne. 14) STOP 3
+  if (i .ne. 14) stop 3
@@ -56 +57 @@ contains
-    if (j .ne. 21) STOP 4
+    if (j .ne. 21) stop 4
@@ -63 +64 @@ contains
-    if (j .ne. 64) STOP 5
+    if (j .ne. 64) stop 5
@@ -70 +71 @@ contains
-    if (j .ne. 14) STOP 6
+    if (j .ne. 14) stop 6
@@ -78 +79 @@ contains
-    if (i .ne. 21) STOP 7
+    if (i .ne. 21) stop 7
@@ -86 +87 @@ contains
-    if (i .ne. 64) STOP 8
+    if (i .ne. 64) stop 8
@@ -94 +95 @@ contains
-    if (i .ne. 14) STOP 9
+    if (i .ne. 14) stop 9
@@ -104 +105 @@ contains
-    if (i .ne. 21) STOP 10
+    if (i .ne. 21) stop 10
@@ -114 +115 @@ contains
-    if (i .ne. 64) STOP 11
+    if (i .ne. 64) stop 11
@@ -124 +125 @@ contains
-    if (i .ne. 14) STOP 12
+    if (i .ne. 14) stop 12
diff --git a/libgomp/testsuite/libgomp.fortran/lastprivate2.f90 b/libgomp/testsuite/libgomp.fortran/lastprivate2.f90
index 6cd5760206c..edaf82325a8 100644
--- a/libgomp/testsuite/libgomp.fortran/lastprivate2.f90
+++ b/libgomp/testsuite/libgomp.fortran/lastprivate2.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -7 +8 @@ program lastprivate
-  if (i .ne. 21 .or. k .ne. 20) STOP 1
+  if (i .ne. 21 .or. k .ne. 20) stop 1
@@ -11 +12 @@ program lastprivate
-  if (i .ne. 64 .or. k .ne. 61) STOP 2
+  if (i .ne. 64 .or. k .ne. 61) stop 2
@@ -15 +16 @@ program lastprivate
-  if (i .ne. 14 .or. k .ne. 11) STOP 3
+  if (i .ne. 14 .or. k .ne. 11) stop 3
@@ -60 +61 @@ contains
-    if (j .ne. 21 .or. l .ne. 20) STOP 4
+    if (j .ne. 21 .or. l .ne. 20) stop 4
@@ -69 +70 @@ contains
-    if (j .ne. 64 .or. l .ne. 61) STOP 5
+    if (j .ne. 64 .or. l .ne. 61) stop 5
@@ -77 +78 @@ contains
-    if (j .ne. 14 .or. l .ne. 11) STOP 6
+    if (j .ne. 14 .or. l .ne. 11) stop 6
@@ -86 +87 @@ contains
-    if (i .ne. 21 .or. k .ne. 20) STOP 7
+    if (i .ne. 21 .or. k .ne. 20) stop 7
@@ -95 +96 @@ contains
-    if (i .ne. 64 .or. k .ne. 61) STOP 8
+    if (i .ne. 64 .or. k .ne. 61) stop 8
@@ -105 +106 @@ contains
-    if (i .ne. 14 .or. k .ne. 11) STOP 9
+    if (i .ne. 14 .or. k .ne. 11) stop 9
@@ -116 +117 @@ contains
-    if (i .ne. 21 .or. k .ne. 20) STOP 10
+    if (i .ne. 21 .or. k .ne. 20) stop 10
@@ -127 +128 @@ contains
-    if (i .ne. 64 .or. k .ne. 61) STOP 11
+    if (i .ne. 64 .or. k .ne. 61) stop 11
@@ -139 +140 @@ contains
-    if (i .ne. 14 .or. k .ne. 11) STOP 12
+    if (i .ne. 14 .or. k .ne. 11) stop 12
diff --git a/libgomp/testsuite/libgomp.fortran/lib1.f90 b/libgomp/testsuite/libgomp.fortran/lib1.f90
index 92c32508491..4e7f9b24bd5 100644
--- a/libgomp/testsuite/libgomp.fortran/lib1.f90
+++ b/libgomp/testsuite/libgomp.fortran/lib1.f90
@@ -14 +14 @@
-  if (omp_test_lock (lck)) STOP 1
+  if (omp_test_lock (lck)) stop 1
@@ -16,2 +16,2 @@
-  if (.not. omp_test_lock (lck)) STOP 2
-  if (omp_test_lock (lck)) STOP 3
+  if (.not. omp_test_lock (lck)) stop 2
+  if (omp_test_lock (lck)) stop 3
@@ -22 +22 @@
-  if (omp_test_nest_lock (nlck) .ne. 1) STOP 4
+  if (omp_test_nest_lock (nlck) .ne. 1) stop 4
@@ -24 +24 @@
-  if (omp_test_nest_lock (nlck) .ne. 3) STOP 5
+  if (omp_test_nest_lock (nlck) .ne. 3) stop 5
@@ -27 +27 @@
-  if (omp_test_nest_lock (nlck) .ne. 2) STOP 6
+  if (omp_test_nest_lock (nlck) .ne. 2) stop 6
@@ -33 +33 @@
-  if (.not. omp_get_dynamic ()) STOP 7
+  if (.not. omp_get_dynamic ()) stop 7
@@ -35 +35 @@
-  if (omp_get_dynamic ()) STOP 8
+  if (omp_get_dynamic ()) stop 8
@@ -38 +38 @@
-  if (.not. omp_get_nested ()) STOP 9
+  if (.not. omp_get_nested ()) stop 9
@@ -40 +40 @@
-  if (omp_get_nested ()) STOP 10
+  if (omp_get_nested ()) stop 10
@@ -43,3 +43,3 @@
-  if (omp_get_num_threads () .ne. 1) STOP 11
-  if (omp_get_max_threads () .ne. 5) STOP 12
-  if (omp_get_thread_num () .ne. 0) STOP 13
+  if (omp_get_num_threads () .ne. 1) stop 11
+  if (omp_get_max_threads () .ne. 5) stop 12
+  if (omp_get_thread_num () .ne. 0) stop 13
@@ -47,3 +47,3 @@
-  if (omp_get_num_threads () .ne. 1) STOP 14
-  if (omp_get_max_threads () .ne. 3) STOP 15
-  if (omp_get_thread_num () .ne. 0) STOP 16
+  if (omp_get_num_threads () .ne. 1) stop 14
+  if (omp_get_max_threads () .ne. 3) stop 15
+  if (omp_get_thread_num () .ne. 0) stop 16
@@ -59 +59 @@
-  if (l) STOP 17
+  if (l) stop 17
@@ -61,2 +61,2 @@
-  if (omp_get_num_procs () .le. 0) STOP 18
-  if (omp_in_parallel ()) STOP 19
+  if (omp_get_num_procs () .le. 0) stop 18
+  if (omp_in_parallel ()) stop 19
@@ -69 +69 @@
-  if (l) STOP 20
+  if (l) stop 20
@@ -72 +72 @@
-  if (d .gt. e) STOP 21
+  if (d .gt. e) stop 21
@@ -76 +76 @@
-  if (d .le. 0 .or. d .gt. 1.) STOP 22
+  if (d .le. 0 .or. d .gt. 1.) stop 22
diff --git a/libgomp/testsuite/libgomp.fortran/lib2.f b/libgomp/testsuite/libgomp.fortran/lib2.f
index 91b56c06081..c651d1b14a5 100644
--- a/libgomp/testsuite/libgomp.fortran/lib2.f
+++ b/libgomp/testsuite/libgomp.fortran/lib2.f
@@ -14 +14 @@ C { dg-do run }
-      IF (OMP_TEST_LOCK (LCK)) STOP 1
+      IF (OMP_TEST_LOCK (LCK)) stop 1
@@ -16,2 +16,2 @@ C { dg-do run }
-      IF (.NOT. OMP_TEST_LOCK (LCK)) STOP 2
-      IF (OMP_TEST_LOCK (LCK)) STOP 3
+      IF (.NOT. OMP_TEST_LOCK (LCK)) stop 2
+      IF (OMP_TEST_LOCK (LCK)) stop 3
@@ -22 +22 @@ C { dg-do run }
-      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 1) STOP 4
+      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 1) stop 4
@@ -24 +24 @@ C { dg-do run }
-      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 3) STOP 5
+      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 3) stop 5
@@ -27 +27 @@ C { dg-do run }
-      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 2) STOP 6
+      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 2) stop 6
@@ -33 +33 @@ C { dg-do run }
-      IF (.NOT. OMP_GET_DYNAMIC ()) STOP 7
+      IF (.NOT. OMP_GET_DYNAMIC ()) stop 7
@@ -35 +35 @@ C { dg-do run }
-      IF (OMP_GET_DYNAMIC ()) STOP 8
+      IF (OMP_GET_DYNAMIC ()) stop 8
@@ -38 +38 @@ C { dg-do run }
-      IF (.NOT. OMP_GET_NESTED ()) STOP 9
+      IF (.NOT. OMP_GET_NESTED ()) stop 9
@@ -40 +40 @@ C { dg-do run }
-      IF (OMP_GET_NESTED ()) STOP 10
+      IF (OMP_GET_NESTED ()) stop 10
@@ -43,3 +43,3 @@ C { dg-do run }
-      IF (OMP_GET_NUM_THREADS () .NE. 1) STOP 11
-      IF (OMP_GET_MAX_THREADS () .NE. 5) STOP 12
-      IF (OMP_GET_THREAD_NUM () .NE. 0) STOP 13
+      IF (OMP_GET_NUM_THREADS () .NE. 1) stop 11
+      IF (OMP_GET_MAX_THREADS () .NE. 5) stop 12
+      IF (OMP_GET_THREAD_NUM () .NE. 0) stop 13
@@ -47,3 +47,3 @@ C { dg-do run }
-      IF (OMP_GET_NUM_THREADS () .NE. 1) STOP 14
-      IF (OMP_GET_MAX_THREADS () .NE. 3) STOP 15
-      IF (OMP_GET_THREAD_NUM () .NE. 0) STOP 16
+      IF (OMP_GET_NUM_THREADS () .NE. 1) stop 14
+      IF (OMP_GET_MAX_THREADS () .NE. 3) stop 15
+      IF (OMP_GET_THREAD_NUM () .NE. 0) stop 16
@@ -59 +59 @@ C$OMP END PARALLEL
-      IF (L) STOP 17
+      IF (L) stop 17
@@ -61,2 +61,2 @@ C$OMP END PARALLEL
-      IF (OMP_GET_NUM_PROCS () .LE. 0) STOP 18
-      IF (OMP_IN_PARALLEL ()) STOP 19
+      IF (OMP_GET_NUM_PROCS () .LE. 0) stop 18
+      IF (OMP_IN_PARALLEL ()) stop 19
@@ -69 +69 @@ C$OMP END PARALLEL
-      IF (L) STOP 20
+      IF (L) stop 20
@@ -72 +72 @@ C$OMP END PARALLEL
-      IF (D .GT. E) STOP 21
+      IF (D .GT. E) stop 21
@@ -76 +76 @@ C bigger than 1s clock resolution is also strange
-      IF (D .LE. 0 .OR. D .GT. 1.) STOP 22
+      IF (D .LE. 0 .OR. D .GT. 1.) stop 22
diff --git a/libgomp/testsuite/libgomp.fortran/lib3.f b/libgomp/testsuite/libgomp.fortran/lib3.f
index 34d9b64d9a3..6ebb0f6df7f 100644
--- a/libgomp/testsuite/libgomp.fortran/lib3.f
+++ b/libgomp/testsuite/libgomp.fortran/lib3.f
@@ -14 +14 @@ C { dg-do run }
-      IF (OMP_TEST_LOCK (LCK)) STOP 1
+      IF (OMP_TEST_LOCK (LCK)) stop 1
@@ -16,2 +16,2 @@ C { dg-do run }
-      IF (.NOT. OMP_TEST_LOCK (LCK)) STOP 2
-      IF (OMP_TEST_LOCK (LCK)) STOP 3
+      IF (.NOT. OMP_TEST_LOCK (LCK)) stop 2
+      IF (OMP_TEST_LOCK (LCK)) stop 3
@@ -22 +22 @@ C { dg-do run }
-      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 1) STOP 4
+      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 1) stop 4
@@ -24 +24 @@ C { dg-do run }
-      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 3) STOP 5
+      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 3) stop 5
@@ -27 +27 @@ C { dg-do run }
-      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 2) STOP 6
+      IF (OMP_TEST_NEST_LOCK (NLCK) .NE. 2) stop 6
@@ -33 +33 @@ C { dg-do run }
-      IF (.NOT. OMP_GET_DYNAMIC ()) STOP 7
+      IF (.NOT. OMP_GET_DYNAMIC ()) stop 7
@@ -35 +35 @@ C { dg-do run }
-      IF (OMP_GET_DYNAMIC ()) STOP 8
+      IF (OMP_GET_DYNAMIC ()) stop 8
@@ -38 +38 @@ C { dg-do run }
-      IF (.NOT. OMP_GET_NESTED ()) STOP 9
+      IF (.NOT. OMP_GET_NESTED ()) stop 9
@@ -40 +40 @@ C { dg-do run }
-      IF (OMP_GET_NESTED ()) STOP 10
+      IF (OMP_GET_NESTED ()) stop 10
@@ -43,3 +43,3 @@ C { dg-do run }
-      IF (OMP_GET_NUM_THREADS () .NE. 1) STOP 11
-      IF (OMP_GET_MAX_THREADS () .NE. 5) STOP 12
-      IF (OMP_GET_THREAD_NUM () .NE. 0) STOP 13
+      IF (OMP_GET_NUM_THREADS () .NE. 1) stop 11
+      IF (OMP_GET_MAX_THREADS () .NE. 5) stop 12
+      IF (OMP_GET_THREAD_NUM () .NE. 0) stop 13
@@ -47,3 +47,3 @@ C { dg-do run }
-      IF (OMP_GET_NUM_THREADS () .NE. 1) STOP 14
-      IF (OMP_GET_MAX_THREADS () .NE. 3) STOP 15
-      IF (OMP_GET_THREAD_NUM () .NE. 0) STOP 16
+      IF (OMP_GET_NUM_THREADS () .NE. 1) stop 14
+      IF (OMP_GET_MAX_THREADS () .NE. 3) stop 15
+      IF (OMP_GET_THREAD_NUM () .NE. 0) stop 16
@@ -59 +59 @@ C$OMP END PARALLEL
-      IF (L) STOP 17
+      IF (L) stop 17
@@ -61,2 +61,2 @@ C$OMP END PARALLEL
-      IF (OMP_GET_NUM_PROCS () .LE. 0) STOP 18
-      IF (OMP_IN_PARALLEL ()) STOP 19
+      IF (OMP_GET_NUM_PROCS () .LE. 0) stop 18
+      IF (OMP_IN_PARALLEL ()) stop 19
@@ -69 +69 @@ C$OMP END PARALLEL
-      IF (L) STOP 20
+      IF (L) stop 20
@@ -72 +72 @@ C$OMP END PARALLEL
-      IF (D .GT. E) STOP 21
+      IF (D .GT. E) stop 21
@@ -76 +76 @@ C bigger than 1s clock resolution is also strange
-      IF (D .LE. 0 .OR. D .GT. 1.) STOP 22
+      IF (D .LE. 0 .OR. D .GT. 1.) stop 22
diff --git a/libgomp/testsuite/libgomp.fortran/lib4.f90 b/libgomp/testsuite/libgomp.fortran/lib4.f90
index ce6aa00e521..d551cde35c6 100644
--- a/libgomp/testsuite/libgomp.fortran/lib4.f90
+++ b/libgomp/testsuite/libgomp.fortran/lib4.f90
@@ -9 +9 @@ program lib4
-  if (kind.ne.omp_sched_static.or.modifier.ne.32) STOP 1
+  if (kind.ne.omp_sched_static.or.modifier.ne.32) stop 1
@@ -12,2 +12,2 @@ program lib4
-  if (kind.ne.omp_sched_dynamic.or.modifier.ne.4) STOP 2
-  if (omp_get_thread_limit ().lt.0) STOP 3
+  if (kind.ne.omp_sched_dynamic.or.modifier.ne.4) stop 2
+  if (omp_get_thread_limit ().lt.0) stop 3
@@ -15 +15 @@ program lib4
-  if (omp_get_max_active_levels ().ne.6) STOP 4
+  if (omp_get_max_active_levels ().ne.6) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/lock-1.f90 b/libgomp/testsuite/libgomp.fortran/lock-1.f90
index b3408388c5d..21116078049 100644
--- a/libgomp/testsuite/libgomp.fortran/lock-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/lock-1.f90
@@ -10,2 +10,2 @@
-  if (omp_test_nest_lock (lock) .ne. 1) STOP 1
-  if (omp_test_nest_lock (lock) .ne. 2) STOP 2
+  if (omp_test_nest_lock (lock) .ne. 1) stop 1
+  if (omp_test_nest_lock (lock) .ne. 2) stop 2
@@ -18,2 +18,2 @@
-  if (l) STOP 3
-  if (omp_test_nest_lock (lock) .ne. 3) STOP 4
+  if (l) stop 3
+  if (omp_test_nest_lock (lock) .ne. 3) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/lock-2.f90 b/libgomp/testsuite/libgomp.fortran/lock-2.f90
index 8608027ef54..ddf53c1b70e 100644
--- a/libgomp/testsuite/libgomp.fortran/lock-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/lock-2.f90
@@ -11,2 +11,2 @@
-  if (omp_test_nest_lock (lock) .ne. 1) STOP 1
-  if (omp_test_nest_lock (lock) .ne. 2) STOP 2
+  if (omp_test_nest_lock (lock) .ne. 1) stop 1
+  if (omp_test_nest_lock (lock) .ne. 2) stop 2
@@ -22 +22 @@
-  if (l) STOP 3
+  if (l) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/nested1.f90 b/libgomp/testsuite/libgomp.fortran/nested1.f90
index ed1e832ee6e..f521b7bf820 100644
--- a/libgomp/testsuite/libgomp.fortran/nested1.f90
+++ b/libgomp/testsuite/libgomp.fortran/nested1.f90
@@ -11,10 +11,10 @@ program nested1
-  if (omp_in_parallel ()) STOP 1
-  if (omp_get_num_threads ().ne.1) STOP 2
-  if (omp_get_level ().ne.0) STOP 3
-  if (omp_get_ancestor_thread_num (0).ne.0) STOP 4
-  if (omp_get_ancestor_thread_num (-1).ne.-1) STOP 5
-  if (omp_get_ancestor_thread_num (1).ne.-1) STOP 6
-  if (omp_get_team_size (0).ne.1) STOP 7
-  if (omp_get_team_size (-1).ne.-1) STOP 8
-  if (omp_get_team_size (1).ne.-1) STOP 9
-  if (omp_get_active_level ().ne.0) STOP 10
+  if (omp_in_parallel ()) stop 1
+  if (omp_get_num_threads ().ne.1) stop 2
+  if (omp_get_level ().ne.0) stop 3
+  if (omp_get_ancestor_thread_num (0).ne.0) stop 4
+  if (omp_get_ancestor_thread_num (-1).ne.-1) stop 5
+  if (omp_get_ancestor_thread_num (1).ne.-1) stop 6
+  if (omp_get_team_size (0).ne.1) stop 7
+  if (omp_get_team_size (-1).ne.-1) stop 8
+  if (omp_get_team_size (1).ne.-1) stop 9
+  if (omp_get_active_level ().ne.0) stop 10
@@ -86 +86 @@ program nested1
-  if (e1.ne.0.or.e2.ne.0.or.e3.ne.0) STOP 11
+  if (e1.ne.0.or.e2.ne.0.or.e3.ne.0) stop 11
diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn1.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn1.f90
index 833cb9a0884..9949071b4b9 100644
--- a/libgomp/testsuite/libgomp.fortran/nestedfn1.f90
+++ b/libgomp/testsuite/libgomp.fortran/nestedfn1.f90
@@ -8 +8 @@
-  if (a .ne. 7) STOP 1
+  if (a .ne. 7) stop 1
@@ -41 +41 @@ contains
-    if (l) STOP 2
+    if (l) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn2.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn2.f90
index 34054ad4937..cd2e505a6e6 100644
--- a/libgomp/testsuite/libgomp.fortran/nestedfn2.f90
+++ b/libgomp/testsuite/libgomp.fortran/nestedfn2.f90
@@ -27,2 +27,2 @@ contains
-    if (i .lt. 0 .or. i .ge. 4) STOP 1
-    if (i + 10 .ne. vari) STOP 2
+    if (i .lt. 0 .or. i .ge. 4) stop 1
+    if (i + 10 .ne. vari) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn3.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn3.f90
index 4e8a18a63ac..fa82d2f23b0 100644
--- a/libgomp/testsuite/libgomp.fortran/nestedfn3.f90
+++ b/libgomp/testsuite/libgomp.fortran/nestedfn3.f90
@@ -8 +8 @@ program nestomp
-  if (j.ne.10) STOP 1
+  if (j.ne.10) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn4.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn4.f90
index bc8614a340a..6e4126888c1 100644
--- a/libgomp/testsuite/libgomp.fortran/nestedfn4.f90
+++ b/libgomp/testsuite/libgomp.fortran/nestedfn4.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -9 +10 @@ program foo
-    if (a(i) .ne. 10 * i) STOP 1
+    if (a(i) .ne. 10 * i) stop 1
@@ -16 +17 @@ program foo
-    if (c(i) .ne. 10 * a(i)) STOP 2
+    if (c(i) .ne. 10 * a(i)) stop 2
@@ -21 +22 @@ program foo
-  if (j .ne. 11) STOP 3
+  if (j .ne. 11) stop 3
@@ -39 +40 @@ contains
-    if (j .ne. 11) STOP 4
+    if (j .ne. 11) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn5.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn5.f90
index e65019e2666..28c9b00da67 100644
--- a/libgomp/testsuite/libgomp.fortran/nestedfn5.f90
+++ b/libgomp/testsuite/libgomp.fortran/nestedfn5.f90
@@ -33 +33 @@ contains
-    if (a /= 21 .or. b /= 12) STOP 1
+    if (a /= 21 .or. b /= 12) stop 1
@@ -47,2 +47,2 @@ contains
-    if (a /= 22) STOP 2
-    if (any (d(2:2,4:5) /= 5)) STOP 3
+    if (a /= 22) stop 2
+    if (any (d(2:2,4:5) /= 5)) stop 3
@@ -67,2 +67,2 @@ contains
-    if (a /= 6 .or. l .or. b /= 11 .or. any (q /= 8)) STOP 4
-    if (any (d(2:3,4:4) /= 9) .or. d(2,5) /= 5 .or. d(3,5) /= 4) STOP 5
+    if (a /= 6 .or. l .or. b /= 11 .or. any (q /= 8)) stop 4
+    if (any (d(2:3,4:4) /= 9) .or. d(2,5) /= 5 .or. d(3,5) /= 4) stop 5
@@ -85 +85 @@ contains
-    if (l) STOP 6
+    if (l) stop 6
@@ -94 +94 @@ contains
-    if (m /= 64) STOP 7
+    if (m /= 64) stop 7
diff --git a/libgomp/testsuite/libgomp.fortran/omp_atomic1.f90 b/libgomp/testsuite/libgomp.fortran/omp_atomic1.f90
index cec05287fc2..57b7c0051f7 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_atomic1.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_atomic1.f90
@@ -21 +21 @@
-    if (a .ne. 5 .or. b .ne. 2 .or. c .ne. 6 .or. d .ne. 0.5) STOP 1
+    if (a .ne. 5 .or. b .ne. 2 .or. c .ne. 6 .or. d .ne. 0.5) stop 1
@@ -27 +27 @@
-    if (a .ne. 12 .or. b .ne. -17) STOP 2
+    if (a .ne. 12 .or. b .ne. -17) stop 2
@@ -32 +32 @@
-    if (a .ne. 19 .or. b .ne. 43) STOP 3
+    if (a .ne. 19 .or. b .ne. 43) stop 3
@@ -38 +38 @@
-    if (a .ne. 9 .or. b .ne. -16) STOP 4
+    if (a .ne. 9 .or. b .ne. -16) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90 b/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90
index 68df316c85d..3748e30bc26 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90
@@ -16,2 +16,2 @@
-  if (n .ne. 22) STOP 1
-  if (any (r .ne. 33)) STOP 2
+  if (n .ne. 22) stop 1
+  if (any (r .ne. 33)) stop 2
@@ -24 +24 @@
-  if (i .ne. 1) STOP 3
+  if (i .ne. 1) stop 3
@@ -27 +27 @@
-  if (i .ne. 23) STOP 4
+  if (i .ne. 23) stop 4
@@ -34 +34 @@
-  if (a .ne. 1) STOP 5
+  if (a .ne. 1) stop 5
@@ -37 +37 @@
-  if (a .ne. 23) STOP 6
+  if (a .ne. 23) stop 6
diff --git a/libgomp/testsuite/libgomp.fortran/omp_atomic3.f90 b/libgomp/testsuite/libgomp.fortran/omp_atomic3.f90
index e4a1a6e460d..454b167157f 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_atomic3.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_atomic3.f90
@@ -39 +39 @@
-    if (a2 .ne. 5 .or. b2 .ne. 2 .or. c2 .ne. 6 .or. d2 .ne. 0.5) STOP 1
+    if (a2 .ne. 5 .or. b2 .ne. 2 .or. c2 .ne. 6 .or. d2 .ne. 0.5) stop 1
@@ -46 +46 @@
-    if (a .ne. 12 .or. b .ne. -17) STOP 2
+    if (a .ne. 12 .or. b .ne. -17) stop 2
@@ -51 +51 @@
-    if (a .ne. 19 .or. b .ne. 43) STOP 3
+    if (a .ne. 19 .or. b .ne. 43) stop 3
@@ -57 +57 @@
-    if (a .ne. 9 .or. b .ne. -16) STOP 4
+    if (a .ne. 9 .or. b .ne. -16) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/omp_atomic4.f90 b/libgomp/testsuite/libgomp.fortran/omp_atomic4.f90
index c4cb5cf9de9..75da9f39400 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_atomic4.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_atomic4.f90
@@ -31 +31 @@
-    if (a2 .ne. 1 .or. b2 .ne. -16 .or. c2 .ne. 3 .or. d2 .ne. 2) STOP 1
+    if (a2 .ne. 1 .or. b2 .ne. -16 .or. c2 .ne. 3 .or. d2 .ne. 2) stop 1
@@ -36 +36 @@
-    if (a2 .ne. 5 .or. b2 .ne. -16 .or. c2 .ne. 6 .or. d2 .ne. 2) STOP 2
+    if (a2 .ne. 5 .or. b2 .ne. -16 .or. c2 .ne. 6 .or. d2 .ne. 2) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/omp_atomic5.f90 b/libgomp/testsuite/libgomp.fortran/omp_atomic5.f90
index 1303ba4b51c..292a7f62a2f 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_atomic5.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_atomic5.f90
@@ -33 +33 @@
-    if (a2 .ne. 1 .or. b2 .ne. -16 .or. c2 .ne. 3 .or. d2 .ne. 2) STOP 1
+    if (a2 .ne. 1 .or. b2 .ne. -16 .or. c2 .ne. 3 .or. d2 .ne. 2) stop 1
@@ -38 +38 @@
-    if (a2 .ne. 5 .or. b2 .ne. -16 .or. c2 .ne. 6 .or. d2 .ne. 2) STOP 2
+    if (a2 .ne. 5 .or. b2 .ne. -16 .or. c2 .ne. 6 .or. d2 .ne. 2) stop 2
@@ -40 +40 @@
-    if (a2 .ne. 10) STOP 3
+    if (a2 .ne. 10) stop 3
@@ -45 +45 @@
-    if (a2 .ne. 5) STOP 4
+    if (a2 .ne. 5) stop 4
@@ -49 +49 @@
-    if (a2 .ne. 28) STOP 5
+    if (a2 .ne. 28) stop 5
@@ -54 +54 @@
-    if (b2 .ne. -16) STOP 6
+    if (b2 .ne. -16) stop 6
@@ -58 +58 @@
-    if (b2 .ne. 24) STOP 7
+    if (b2 .ne. 24) stop 7
diff --git a/libgomp/testsuite/libgomp.fortran/omp_cond1.f b/libgomp/testsuite/libgomp.fortran/omp_cond1.f
index f050f5101be..d98e6cc2848 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_cond1.f
+++ b/libgomp/testsuite/libgomp.fortran/omp_cond1.f
@@ -4 +4 @@ C Test conditional compilation in fixed form if -fopenmp
-      if (foo.ne.256) STOP 1
+      if (foo.ne.256) stop 1
@@ -10 +10 @@ c$   +r = 42
-      if (bar.ne.43) STOP 2
+      if (bar.ne.43) stop 2
@@ -20 +20 @@ c$ 10&baz = 2
-      if (baz.ne.51242) STOP 3
+      if (baz.ne.51242) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/omp_cond2.f b/libgomp/testsuite/libgomp.fortran/omp_cond2.f
index 83e79dc36eb..e54edeaf55e 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_cond2.f
+++ b/libgomp/testsuite/libgomp.fortran/omp_cond2.f
@@ -5 +5 @@ c Test conditional compilation in fixed form if -fno-openmp
-      if (foo.ne.256) STOP 1
+      if (foo.ne.256) stop 1
@@ -11 +11 @@ c$   +r = 42
-      if (bar.ne.26) STOP 2
+      if (bar.ne.26) stop 2
@@ -21 +21 @@ c$ 10&baz = 2
-      if (baz.ne.26) STOP 3
+      if (baz.ne.26) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/omp_cond3.F90 b/libgomp/testsuite/libgomp.fortran/omp_cond3.F90
index 3db2fd1163e..6a8ce52d326 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_cond3.F90
+++ b/libgomp/testsuite/libgomp.fortran/omp_cond3.F90
@@ -4 +4 @@
-  if (foo.ne.256) STOP 1
+  if (foo.ne.256) stop 1
@@ -14 +14 @@ bar = bar - 1
-  if (bar.ne.43) STOP 2
+  if (bar.ne.43) stop 2
@@ -22 +22 @@ baz = baz + 1 !$ baz = 2
-      if (baz.ne.515) STOP 3
+      if (baz.ne.515) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/omp_cond4.F90 b/libgomp/testsuite/libgomp.fortran/omp_cond4.F90
index ae2e93253aa..644f7e302a2 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_cond4.F90
+++ b/libgomp/testsuite/libgomp.fortran/omp_cond4.F90
@@ -5 +5 @@
-  if (foo.ne.256) STOP 1
+  if (foo.ne.256) stop 1
@@ -15 +15 @@ bar = bar - 1
-  if (bar.ne.26) STOP 2
+  if (bar.ne.26) stop 2
@@ -23 +23 @@ baz = baz + 1 !$ baz = 2
-      if (baz.ne.27) STOP 3
+      if (baz.ne.27) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/omp_parse1.f90 b/libgomp/testsuite/libgomp.fortran/omp_parse1.f90
index db89401f839..f3b4bc579cf 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_parse1.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_parse1.f90
@@ -46,4 +46,4 @@ contains
-    if (h) STOP 1
-    if (a .ne. 6) STOP 2
-    if (j .ne. 24) STOP 3
-    if (d(1) .eq. -1) STOP 4
+    if (h) stop 1
+    if (a .ne. 6) stop 2
+    if (j .ne. 24) stop 3
+    if (d(1) .eq. -1) stop 4
@@ -52 +52 @@ contains
-      if (d(g) .ne. d(1)) STOP 5
+      if (d(g) .ne. d(1)) stop 5
@@ -55 +55 @@ contains
-    if (e .ne. i) STOP 6
+    if (e .ne. i) stop 6
@@ -82 +82 @@ contains
-      if (i .eq. 1 .and. n .ne. 24) STOP 7
+      if (i .eq. 1 .and. n .ne. 24) stop 7
@@ -106 +106 @@ contains
-    if (.not. m) STOP 8
+    if (.not. m) stop 8
@@ -110 +110 @@ contains
-      if (d(i) .lt. j .or. d(i) .ge. j + k) STOP 9
+      if (d(i) .lt. j .or. d(i) .ge. j + k) stop 9
@@ -155,3 +155,3 @@ contains
-    if (j .ne. 271 .or. l .ne. 0) STOP 10
-    if (m .ne. 4 + 6 + 8 + 10) STOP 11
-    if (n .ne. 7) STOP 12
+    if (j .ne. 271 .or. l .ne. 0) stop 10
+    if (m .ne. 4 + 6 + 8 + 10) stop 11
+    if (n .ne. 7) stop 12
@@ -185 +185 @@ contains
-    if (m) STOP 13
+    if (m) stop 13
diff --git a/libgomp/testsuite/libgomp.fortran/omp_parse2.f90 b/libgomp/testsuite/libgomp.fortran/omp_parse2.f90
index e63f55f7c31..3de6968bae2 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_parse2.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_parse2.f90
@@ -19 +19 @@ contains
-    if (.not. (i .or. j)) STOP 1
+    if (.not. (i .or. j)) stop 1
@@ -48 +48 @@ contains
-    if (n .lt. 1 .or. i .ne. n * 3 .or. j .ne. n * 3) STOP 2
+    if (n .lt. 1 .or. i .ne. n * 3 .or. j .ne. n * 3) stop 2
@@ -65 +65 @@ contains
-    if (i .ne. 5 .or. j) STOP 3
+    if (i .ne. 5 .or. j) stop 3
@@ -92,2 +92,2 @@ contains
-    if (g .le. 0 .or. g .gt. 8) STOP 4
-    if (a .ne. 6 * g .or. b .ne. 3 ** g) STOP 5
+    if (g .le. 0 .or. g .gt. 8) stop 4
+    if (a .ne. 6 * g .or. b .ne. 3 ** g) stop 5
@@ -95 +95 @@ contains
-      if (c .ne. 8) STOP 6
+      if (c .ne. 8) stop 6
@@ -97 +97 @@ contains
-      STOP 7
+      stop 7
@@ -99,2 +99,2 @@ contains
-    if (d .ne. 1024 / (2 ** g)) STOP 8
-    if (e .ne. 0 .or. f .ne. g - 1) STOP 9
+    if (d .ne. 1024 / (2 ** g)) stop 8
+    if (e .ne. 0 .or. f .ne. g - 1) stop 9
diff --git a/libgomp/testsuite/libgomp.fortran/omp_parse3.f90 b/libgomp/testsuite/libgomp.fortran/omp_parse3.f90
index a61d54615d2..6076c7aad3c 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_parse3.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_parse3.f90
@@ -48 +48 @@ contains
-	if (d(i) .ne. i) STOP 1
+	if (d(i) .ne. i) stop 1
@@ -51 +51 @@ contains
-	if (d(i) .ne. -1) STOP 2
+	if (d(i) .ne. -1) stop 2
@@ -72 +72 @@ contains
-    if (x .ne. 6 .or. y .ne. 7 .or. z .ne. 8) STOP 3
+    if (x .ne. 6 .or. y .ne. 7 .or. z .ne. 8) stop 3
@@ -77 +77 @@ contains
-    if (x .ne. 0 .or. y .ne. 1024 .or. z .ne. 4096) STOP 4
+    if (x .ne. 0 .or. y .ne. 1024 .or. z .ne. 4096) stop 4
@@ -82 +82 @@ contains
-&       STOP 5
+&       stop 5
@@ -92 +92 @@ contains
-      if (x .ne. j .or. y .ne. j + 1024) STOP 6
+      if (x .ne. j .or. y .ne. j + 1024) stop 6
@@ -95 +95 @@ contains
-    if (m .or. n) STOP 7
+    if (m .or. n) stop 7
diff --git a/libgomp/testsuite/libgomp.fortran/omp_parse4.f90 b/libgomp/testsuite/libgomp.fortran/omp_parse4.f90
index 273ce53075b..09b0fa24269 100644
--- a/libgomp/testsuite/libgomp.fortran/omp_parse4.f90
+++ b/libgomp/testsuite/libgomp.fortran/omp_parse4.f90
@@ -62,7 +62,7 @@ contains
-&     STOP 1
-    if (any (g .ne. (/-1, -1, -1, 0, 0, 0, 0, 0, 0, 0/))) STOP 2
-    if (i .ne. 20) STOP 3
-!$  if (l .ne. 128 + m) STOP 4
-    if (any (d .ne. 1 .or. e .ne. 1)) STOP 5
-    if (any (b .ne. transpose (a))) STOP 6
-    if (any (c .ne. b)) STOP 7
+&     stop 1
+    if (any (g .ne. (/-1, -1, -1, 0, 0, 0, 0, 0, 0, 0/))) stop 2
+    if (i .ne. 20) stop 3
+!$  if (l .ne. 128 + m) stop 4
+    if (any (d .ne. 1 .or. e .ne. 1)) stop 5
+    if (any (b .ne. transpose (a))) stop 6
+    if (any (c .ne. b)) stop 7
@@ -70 +70 @@ contains
-&                     110, 132, 13, 182, 210, 240/))) STOP 8
+&                     110, 132, 13, 182, 210, 240/))) stop 8
diff --git a/libgomp/testsuite/libgomp.fortran/openmp_version-1.f b/libgomp/testsuite/libgomp.fortran/openmp_version-1.f
index de16933f9e5..78d4b981f6b 100644
--- a/libgomp/testsuite/libgomp.fortran/openmp_version-1.f
+++ b/libgomp/testsuite/libgomp.fortran/openmp_version-1.f
@@ -7 +7 @@
-      if (openmp_version .ne. 201511) STOP 1;
+      if (openmp_version .ne. 201511) stop 1;
diff --git a/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 b/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90
index b2e0d3a7064..693dba0b3f5 100644
--- a/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90
@@ -7 +7 @@ program main
-  if (openmp_version .ne. 201511) STOP 1;
+  if (openmp_version .ne. 201511) stop 1;
diff --git a/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95 b/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95
index bb165cdfaca..0f800e64523 100644
--- a/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95
+++ b/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95
@@ -37 +37 @@ program main
-     if (c(i) .ne. (i + MODULO ((i * 3), 7))) STOP 1
+     if (c(i) .ne. (i + MODULO ((i * 3), 7))) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt.f95 b/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt.f95
index 5ed4a382a08..1485683467c 100644
--- a/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt.f95
+++ b/libgomp/testsuite/libgomp.fortran/parloops-exit-first-loop-alt.f95
@@ -38 +38 @@ program main
-     if (c(i) .ne. (i + MODULO ((i * 3), 7))) STOP 1
+     if (c(i) .ne. (i + MODULO ((i * 3), 7))) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pointer1.f90 b/libgomp/testsuite/libgomp.fortran/pointer1.f90
index 817006a2d20..3332000dc61 100644
--- a/libgomp/testsuite/libgomp.fortran/pointer1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pointer1.f90
@@ -24 +24 @@ contains
-    if (a.ne.r.or.c(1).ne.r) STOP 1
+    if (a.ne.r.or.c(1).ne.r) stop 1
@@ -36 +36 @@ contains
-    if (b.ne.r+r2.or.d(1).ne.r+r2) STOP 2
+    if (b.ne.r+r2.or.d(1).ne.r+r2) stop 2
@@ -58,2 +58,2 @@ contains
-    if (b.ne.100.or.any(d.ne.10)) STOP 3
-    if (a.ne.17.or.any(c.ne.21)) STOP 4
+    if (b.ne.100.or.any(d.ne.10)) stop 3
+    if (a.ne.17.or.any(c.ne.21)) stop 4
@@ -74,2 +74,2 @@ contains
-    if (a.ne.200.or.any(c.ne.20)) STOP 5
-    if (b.ne.17.or.any(d.ne.21)) STOP 6
+    if (a.ne.200.or.any(c.ne.20)) stop 5
+    if (b.ne.17.or.any(d.ne.21)) stop 6
diff --git a/libgomp/testsuite/libgomp.fortran/pointer2.f90 b/libgomp/testsuite/libgomp.fortran/pointer2.f90
index 859c0e4c36b..3db052e72aa 100644
--- a/libgomp/testsuite/libgomp.fortran/pointer2.f90
+++ b/libgomp/testsuite/libgomp.fortran/pointer2.f90
@@ -24,4 +24,4 @@
-  if (l) STOP 1
-  if (thr(1).ne.14) STOP 2
-  if (s(1).ne.1+i) STOP 3
-  if (u(1).ne.14) STOP 4
+  if (l) stop 1
+  if (thr(1).ne.14) stop 2
+  if (s(1).ne.1+i) stop 3
+  if (u(1).ne.14) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/pr25162.f b/libgomp/testsuite/libgomp.fortran/pr25162.f
index f0f760da0aa..93ea6f99a1d 100644
--- a/libgomp/testsuite/libgomp.fortran/pr25162.f
+++ b/libgomp/testsuite/libgomp.fortran/pr25162.f
@@ -37 +37 @@ C$OMP THREADPRIVATE(/TESTCOM/)
-         IF (K.NE.BPRIM(K)) STOP 1
+         IF (K.NE.BPRIM(K)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr25219.f90 b/libgomp/testsuite/libgomp.fortran/pr25219.f90
index 61dd1bc04e6..6795efa4e85 100644
--- a/libgomp/testsuite/libgomp.fortran/pr25219.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr25219.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -14 +15 @@
-  if (k .ne. 100) STOP 1
+  if (k .ne. 100) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr27395-1.f90 b/libgomp/testsuite/libgomp.fortran/pr27395-1.f90
index 8930c780ff2..855a346c865 100644
--- a/libgomp/testsuite/libgomp.fortran/pr27395-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr27395-1.f90
@@ -11 +11 @@ program pr27395_1
-    if (sumarray(i).ne.m*i) STOP 1
+    if (sumarray(i).ne.m*i) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr27395-2.f90 b/libgomp/testsuite/libgomp.fortran/pr27395-2.f90
index f55b701cdb4..55229cc4b39 100644
--- a/libgomp/testsuite/libgomp.fortran/pr27395-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr27395-2.f90
@@ -28 +28 @@ subroutine foo(n,m)
-    if (sumarray(i).ne.m*i) STOP 1
+    if (sumarray(i).ne.m*i) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr27416-1.f90 b/libgomp/testsuite/libgomp.fortran/pr27416-1.f90
index 7bc5d3e78c8..e62a784b5a8 100644
--- a/libgomp/testsuite/libgomp.fortran/pr27416-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr27416-1.f90
@@ -9 +9 @@
-  if (j.ne.6+16) STOP 1
+  if (j.ne.6+16) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr27916-1.f90 b/libgomp/testsuite/libgomp.fortran/pr27916-1.f90
index bb75af9c15c..1a1b0c34144 100644
--- a/libgomp/testsuite/libgomp.fortran/pr27916-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr27916-1.f90
@@ -25 +25 @@ program pr27916
-  if (r) STOP 1
+  if (r) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr27916-2.f90 b/libgomp/testsuite/libgomp.fortran/pr27916-2.f90
index 7973726cb57..c0bc6668f36 100644
--- a/libgomp/testsuite/libgomp.fortran/pr27916-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr27916-2.f90
@@ -25 +25 @@ program pr27916
-  if (r) STOP 1
+  if (r) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr28390.f b/libgomp/testsuite/libgomp.fortran/pr28390.f
index a667e08f73e..9a0832a59bb 100644
--- a/libgomp/testsuite/libgomp.fortran/pr28390.f
+++ b/libgomp/testsuite/libgomp.fortran/pr28390.f
@@ -0,0 +1 @@
+! { dg-do run }
@@ -7 +8 @@
-      if (i.ne.101) STOP 1
+      if (i.ne.101) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr29629.f90 b/libgomp/testsuite/libgomp.fortran/pr29629.f90
index 4b802c56310..1920ac0b4a3 100644
--- a/libgomp/testsuite/libgomp.fortran/pr29629.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr29629.f90
@@ -7 +7 @@ program pr29629
-  if (any (func(n).ne.10000)) STOP 1
+  if (any (func(n).ne.10000)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr32550.f90 b/libgomp/testsuite/libgomp.fortran/pr32550.f90
index ce496cacd23..99852df3296 100644
--- a/libgomp/testsuite/libgomp.fortran/pr32550.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr32550.f90
@@ -20 +20 @@
-      if (e.ne.0) STOP 1
+      if (e.ne.0) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr33880.f90 b/libgomp/testsuite/libgomp.fortran/pr33880.f90
index e6a26f42d82..ec00dd86d8b 100644
--- a/libgomp/testsuite/libgomp.fortran/pr33880.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr33880.f90
@@ -12 +12 @@ program pr33880
-  if (j .ne. 1000) STOP 1
+  if (j .ne. 1000) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr34020.f90 b/libgomp/testsuite/libgomp.fortran/pr34020.f90
index 6d2316472d8..31aaecda180 100644
--- a/libgomp/testsuite/libgomp.fortran/pr34020.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr34020.f90
@@ -19 +19 @@
-      if (lhs .ne. 300000) STOP 1
+      if (lhs .ne. 300000) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr35130.f90 b/libgomp/testsuite/libgomp.fortran/pr35130.f90
index e6be64f15f5..05d00a67ee1 100644
--- a/libgomp/testsuite/libgomp.fortran/pr35130.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr35130.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -13 +14 @@ program pr35130
-  if (any (a.ne.42)) STOP 1
+  if (any (a.ne.42)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr42162.f90 b/libgomp/testsuite/libgomp.fortran/pr42162.f90
index 3792a33fe9f..fd75f554ea4 100644
--- a/libgomp/testsuite/libgomp.fortran/pr42162.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr42162.f90
@@ -52 +52 @@ program pr42162
-  if (k.ne.4.or.any(a.ne.2).or.any(b.ne.3).or.any(c.ne.4)) STOP 1
+  if (k.ne.4.or.any(a.ne.2).or.any(b.ne.3).or.any(c.ne.4)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr46753.f90 b/libgomp/testsuite/libgomp.fortran/pr46753.f90
index 0d9debce196..5caa4d7e86b 100644
--- a/libgomp/testsuite/libgomp.fortran/pr46753.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr46753.f90
@@ -10 +10 @@
-  if (j.ne.11) STOP 1
+  if (j.ne.11) stop 1
@@ -16 +16 @@
-  if (j.ne.11) STOP 2
+  if (j.ne.11) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/pr48894.f90 b/libgomp/testsuite/libgomp.fortran/pr48894.f90
index 0f7bfad4cae..e906f45e27f 100644
--- a/libgomp/testsuite/libgomp.fortran/pr48894.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr48894.f90
@@ -22 +22 @@
-  if (err .ne. 0) STOP 1
+  if (err .ne. 0) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr49792-1.f90 b/libgomp/testsuite/libgomp.fortran/pr49792-1.f90
index 18643ac5a50..5a9d470b5e9 100644
--- a/libgomp/testsuite/libgomp.fortran/pr49792-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr49792-1.f90
@@ -17 +17 @@ program pr49792
-  if (any (a.ne.b)) STOP 1
+  if (any (a.ne.b)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr49792-2.f90 b/libgomp/testsuite/libgomp.fortran/pr49792-2.f90
index 689f7decacb..570901d5559 100644
--- a/libgomp/testsuite/libgomp.fortran/pr49792-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr49792-2.f90
@@ -20,2 +20,2 @@ program pr49792
-  if (size(a).ne.size(b)) STOP 1
-  if (any (a.ne.b)) STOP 2
+  if (size(a).ne.size(b)) stop 1
+  if (any (a.ne.b)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/pr63938-1.f90 b/libgomp/testsuite/libgomp.fortran/pr63938-1.f90
index eb85500ea4c..4cc8be7ec1e 100644
--- a/libgomp/testsuite/libgomp.fortran/pr63938-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr63938-1.f90
@@ -13 +13 @@ program pr63938_1
-  if (x(1) .ne. 1000) STOP 1
+  if (x(1) .ne. 1000) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr63938-2.f90 b/libgomp/testsuite/libgomp.fortran/pr63938-2.f90
index 934e800648e..d0a17ac4fea 100644
--- a/libgomp/testsuite/libgomp.fortran/pr63938-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr63938-2.f90
@@ -17 +17 @@ program pr63938_2
-  if (x%x .ne. 1000) STOP 1
+  if (x%x .ne. 1000) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr65597.f90 b/libgomp/testsuite/libgomp.fortran/pr65597.f90
index 25754314766..29d1c9e80bc 100644
--- a/libgomp/testsuite/libgomp.fortran/pr65597.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr65597.f90
@@ -16 +16 @@
-      if (a(i) .ne. 2) STOP 1
+      if (a(i) .ne. 2) stop 1
@@ -18 +18 @@
-      if (a(i) .ne. 0) STOP 2
+      if (a(i) .ne. 0) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/pr66199-1.f90 b/libgomp/testsuite/libgomp.fortran/pr66199-1.f90
index ecf62458340..38cac5e4573 100644
--- a/libgomp/testsuite/libgomp.fortran/pr66199-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr66199-1.f90
@@ -13 +13 @@
-  if (d .ne. 1025) STOP 1
+  if (d .ne. 1025) stop 1
@@ -23,2 +23,2 @@
-  if (d .ne. 1025 .or. c .ne. (17 + 5 * 1024)) STOP 2
-  if (e .ne. (17 + 5 * 1024)) STOP 3
+  if (d .ne. 1025 .or. c .ne. (17 + 5 * 1024)) stop 2
+  if (e .ne. (17 + 5 * 1024)) stop 3
@@ -38 +38 @@
-  if (d1 .ne. 32 .or. d2 .ne. 32) STOP 4
+  if (d1 .ne. 32 .or. d2 .ne. 32) stop 4
@@ -48 +48 @@
-  if (d1 .ne. 32 .or. d2 .ne. 32) STOP 5
+  if (d1 .ne. 32 .or. d2 .ne. 32) stop 5
diff --git a/libgomp/testsuite/libgomp.fortran/pr71014.f90 b/libgomp/testsuite/libgomp.fortran/pr71014.f90
index 7fcbf73862d..518df1024aa 100644
--- a/libgomp/testsuite/libgomp.fortran/pr71014.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr71014.f90
@@ -19 +19 @@ program pr71014
-  if (any(s /= t)) STOP 1
+  if (any(s /= t)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr81304.f90 b/libgomp/testsuite/libgomp.fortran/pr81304.f90
index c7419342ca6..3f7406aeaf5 100644
--- a/libgomp/testsuite/libgomp.fortran/pr81304.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr81304.f90
@@ -16 +16 @@ program pr81304
-   if (any (a /= (/ 1, -4, 6 /)) .or. any (b /= (/ 16, 11, 21 /))) STOP 1
+   if (any (a /= (/ 1, -4, 6 /)) .or. any (b /= (/ 16, 11, 21 /))) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr81841.f90 b/libgomp/testsuite/libgomp.fortran/pr81841.f90
index ed75837c37b..9ddc95af69f 100644
--- a/libgomp/testsuite/libgomp.fortran/pr81841.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr81841.f90
@@ -20 +20 @@ program pr81841
-  if ((e /= 32) .or. any(f /= 1.)) STOP 1
+  if ((e /= 32) .or. any(f /= 1.)) stop 1
@@ -24 +24 @@ program pr81841
-  if ((e /= omp_get_thread_num ()) .or. any(f /= e + 19.)) STOP 2
+  if ((e /= omp_get_thread_num ()) .or. any(f /= e + 19.)) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/pr84418-1.f90 b/libgomp/testsuite/libgomp.fortran/pr84418-1.f90
index 59391211a74..8547fceb79e 100644
--- a/libgomp/testsuite/libgomp.fortran/pr84418-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr84418-1.f90
@@ -18 +18 @@
-    if (c(i).ne.(2 * i)) STOP 1
+    if (c(i).ne.(2 * i)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr84418-2.f90 b/libgomp/testsuite/libgomp.fortran/pr84418-2.f90
index f85fbf2ba87..481e24e5d8a 100644
--- a/libgomp/testsuite/libgomp.fortran/pr84418-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr84418-2.f90
@@ -26 +26 @@
-    if (c(i).ne.(6 * i)) STOP 1
+    if (c(i).ne.(6 * i)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/pr90779.f90 b/libgomp/testsuite/libgomp.fortran/pr90779.f90
index a6d687abfe6..c14dc87dd00 100644
--- a/libgomp/testsuite/libgomp.fortran/pr90779.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr90779.f90
@@ -0,0 +1 @@
+! { dg-do run }
diff --git a/libgomp/testsuite/libgomp.fortran/procptr1.f90 b/libgomp/testsuite/libgomp.fortran/procptr1.f90
index 560d0da4216..44410d47b53 100644
--- a/libgomp/testsuite/libgomp.fortran/procptr1.f90
+++ b/libgomp/testsuite/libgomp.fortran/procptr1.f90
@@ -14 +14 @@
-  if (ptr () /= 1) STOP 1
+  if (ptr () /= 1) stop 1
@@ -18 +18 @@
-  if (ptr () /= 2) STOP 2
+  if (ptr () /= 2) stop 2
@@ -23 +23 @@
-  if (ptr () /= 1) STOP 3
+  if (ptr () /= 1) stop 3
@@ -26 +26 @@
-  if (ptr () /= 2) STOP 4
+  if (ptr () /= 2) stop 4
@@ -29 +29 @@
-  if (ptr () /= 3) STOP 5
+  if (ptr () /= 3) stop 5
@@ -31,2 +31,2 @@
-  if (ptr () /= 3) STOP 6
-  if (.not.associated (ptr, baz)) STOP 7
+  if (ptr () /= 3) stop 6
+  if (.not.associated (ptr, baz)) stop 7
diff --git a/libgomp/testsuite/libgomp.fortran/recursion1.f90 b/libgomp/testsuite/libgomp.fortran/recursion1.f90
index c9aec7e4159..2546d09d11e 100644
--- a/libgomp/testsuite/libgomp.fortran/recursion1.f90
+++ b/libgomp/testsuite/libgomp.fortran/recursion1.f90
@@ -17 +17 @@ end do
-if (s/=55) STOP 1
+if (s/=55) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/reduction1.f90 b/libgomp/testsuite/libgomp.fortran/reduction1.f90
index bc036b057ea..622a7059d6c 100644
--- a/libgomp/testsuite/libgomp.fortran/reduction1.f90
+++ b/libgomp/testsuite/libgomp.fortran/reduction1.f90
@@ -58 +58 @@
-  if (v) STOP 1
+  if (v) stop 1
@@ -60,6 +60,6 @@
-    if (i .ne. 8 .or. any (ia .ne. (/3, 3, 1, 6, 6, 8/))) STOP 2
-    if (r .ne. 8 .or. any (ra .ne. (/9.5, 8.0, 1.5, 1.5/))) STOP 3
-    if (d .ne. 12.5 .or. any (da .ne. (/8.0, 16.5, 16.5, 14.0, 5.5/))) STOP 4
-    if (c .ne. cmplx (11.5, -5)) STOP 5
-    if (ca(1) .ne. cmplx (12, 2)) STOP 6
-    if (ca(2) .ne. cmplx (6.5, 3) .or. ca(2) .ne. ca(3)) STOP 7
+    if (i .ne. 8 .or. any (ia .ne. (/3, 3, 1, 6, 6, 8/))) stop 2
+    if (r .ne. 8 .or. any (ra .ne. (/9.5, 8.0, 1.5, 1.5/))) stop 3
+    if (d .ne. 12.5 .or. any (da .ne. (/8.0, 16.5, 16.5, 14.0, 5.5/))) stop 4
+    if (c .ne. cmplx (11.5, -5)) stop 5
+    if (ca(1) .ne. cmplx (12, 2)) stop 6
+    if (ca(2) .ne. cmplx (6.5, 3) .or. ca(2) .ne. ca(3)) stop 7
@@ -116 +116 @@
-  if (v) STOP 8
+  if (v) stop 8
@@ -118,6 +118,6 @@
-    if (i .ne. 8 .or. any (ia .ne. (/3, 3, 1, 6, 6, 8/))) STOP 9
-    if (r .ne. 8 .or. any (ra .ne. (/9.5, 8.0, 1.5, 1.5/))) STOP 10
-    if (d .ne. 12.5 .or. any (da .ne. (/8.0, 16.5, 16.5, 14.0, 5.5/))) STOP 11
-    if (c .ne. cmplx (11.5, -5)) STOP 12
-    if (ca(1) .ne. cmplx (12, 2)) STOP 13
-    if (ca(2) .ne. cmplx (6.5, 3) .or. ca(2) .ne. ca(3)) STOP 14
+    if (i .ne. 8 .or. any (ia .ne. (/3, 3, 1, 6, 6, 8/))) stop 9
+    if (r .ne. 8 .or. any (ra .ne. (/9.5, 8.0, 1.5, 1.5/))) stop 10
+    if (d .ne. 12.5 .or. any (da .ne. (/8.0, 16.5, 16.5, 14.0, 5.5/))) stop 11
+    if (c .ne. cmplx (11.5, -5)) stop 12
+    if (ca(1) .ne. cmplx (12, 2)) stop 13
+    if (ca(2) .ne. cmplx (6.5, 3) .or. ca(2) .ne. ca(3)) stop 14
@@ -172 +172 @@
-  if (v) STOP 15
+  if (v) stop 15
@@ -174,6 +174,6 @@
-    if (i .ne. 6 .or. any (ia .ne. (/4, 4, 8, -16, -16, -8/))) STOP 16
-    if (r .ne. 8 .or. any (ra .ne. (/4., -2., -1., -1./))) STOP 17
-    if (d .ne. -40 .or. any (da .ne. (/32., -64., -64., 64., -32./))) STOP 18
-    if (c .ne. cmplx (0, 15)) STOP 19
-    if (ca(1) .ne. cmplx (0, 10)) STOP 20
-    if (ca(2) .ne. cmplx (-2, 0) .or. ca(2) .ne. ca(3)) STOP 21
+    if (i .ne. 6 .or. any (ia .ne. (/4, 4, 8, -16, -16, -8/))) stop 16
+    if (r .ne. 8 .or. any (ra .ne. (/4., -2., -1., -1./))) stop 17
+    if (d .ne. -40 .or. any (da .ne. (/32., -64., -64., 64., -32./))) stop 18
+    if (c .ne. cmplx (0, 15)) stop 19
+    if (ca(1) .ne. cmplx (0, 10)) stop 20
+    if (ca(2) .ne. cmplx (-2, 0) .or. ca(2) .ne. ca(3)) stop 21
diff --git a/libgomp/testsuite/libgomp.fortran/reduction2.f90 b/libgomp/testsuite/libgomp.fortran/reduction2.f90
index 6af173d2397..75c2e0cf239 100644
--- a/libgomp/testsuite/libgomp.fortran/reduction2.f90
+++ b/libgomp/testsuite/libgomp.fortran/reduction2.f90
@@ -34 +34 @@
-  if (v) STOP 1
+  if (v) stop 1
@@ -36,2 +36,2 @@
-    if (l .or. any (la .neqv. (/.true., .false., .false., .false./))) STOP 2
-    if (.not. m .or. any (ma .neqv. (/.true., .true., .false., .true./))) STOP 3
+    if (l .or. any (la .neqv. (/.true., .false., .false., .false./))) stop 2
+    if (.not. m .or. any (ma .neqv. (/.true., .true., .false., .true./))) stop 3
@@ -67 +67 @@
-  if (v) STOP 4
+  if (v) stop 4
@@ -69,2 +69,2 @@
-    if (.not. l .or. any (la .neqv. (/.true., .false., .true., .false./))) STOP 5
-    if (.not. m .or. any (ma .neqv. (/.false., .true., .false., .true./))) STOP 6
+    if (.not. l .or. any (la .neqv. (/.true., .false., .true., .false./))) stop 5
+    if (.not. m .or. any (ma .neqv. (/.false., .true., .false., .true./))) stop 6
diff --git a/libgomp/testsuite/libgomp.fortran/reduction3.f90 b/libgomp/testsuite/libgomp.fortran/reduction3.f90
index b0a858b54f0..e19bac6f57e 100644
--- a/libgomp/testsuite/libgomp.fortran/reduction3.f90
+++ b/libgomp/testsuite/libgomp.fortran/reduction3.f90
@@ -49 +49 @@
-  if (v) STOP 1
+  if (v) stop 1
@@ -51,3 +51,3 @@
-    if (i .ne. 4 .or. any (ia .ne. (/7, 2, 2, 5, 5, 5/))) STOP 2
-    if (r .ne. 5 .or. any (ra .ne. (/6.5, 6.5, 4., 4./))) STOP 3
-    if (d .ne. 8.5 .or. any (da .ne. (/6.5, 8.5, 8.5, 8.5, 6.5/))) STOP 4
+    if (i .ne. 4 .or. any (ia .ne. (/7, 2, 2, 5, 5, 5/))) stop 2
+    if (r .ne. 5 .or. any (ra .ne. (/6.5, 6.5, 4., 4./))) stop 3
+    if (d .ne. 8.5 .or. any (da .ne. (/6.5, 8.5, 8.5, 8.5, 6.5/))) stop 4
@@ -97 +97 @@
-  if (v) STOP 5
+  if (v) stop 5
@@ -99,3 +99,3 @@
-    if (i .ne. 1 .or. any (ia .ne. (/1, 1, -2, -2, -2, 1/))) STOP 6
-    if (r .ne. -1 .or. any (ra .ne. (/4., -1.5, -8.5, -1.5/))) STOP 7
-    if (d .ne. -2.5 .or. any (da .ne. (/2.5, 2.5, 2.5, 6., 6.5/))) STOP 8
+    if (i .ne. 1 .or. any (ia .ne. (/1, 1, -2, -2, -2, 1/))) stop 6
+    if (r .ne. -1 .or. any (ra .ne. (/4., -1.5, -8.5, -1.5/))) stop 7
+    if (d .ne. -2.5 .or. any (da .ne. (/2.5, 2.5, 2.5, 6., 6.5/))) stop 8
diff --git a/libgomp/testsuite/libgomp.fortran/reduction4.f90 b/libgomp/testsuite/libgomp.fortran/reduction4.f90
index 498d5460554..2de903c05a1 100644
--- a/libgomp/testsuite/libgomp.fortran/reduction4.f90
+++ b/libgomp/testsuite/libgomp.fortran/reduction4.f90
@@ -47 +47 @@
-  if (v) STOP 1
+  if (v) stop 1
@@ -50 +50 @@
-    if (i .ne. int(Z'777f07') .or. any (ia .ne. ta)) STOP 2
+    if (i .ne. int(Z'777f07') .or. any (ia .ne. ta)) stop 2
@@ -52 +52 @@
-    if (j .ne. int(Z'fff80') .or. any (ja .ne. ta)) STOP 3
+    if (j .ne. int(Z'fff80') .or. any (ja .ne. ta)) stop 3
@@ -54 +54 @@
-    if (k .ne. int(Z'54a8f') .or. any (ka .ne. ta)) STOP 4
+    if (k .ne. int(Z'54a8f') .or. any (ka .ne. ta)) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/reduction5.f90 b/libgomp/testsuite/libgomp.fortran/reduction5.f90
index a1d1a8e5425..e2a17a93a1f 100644
--- a/libgomp/testsuite/libgomp.fortran/reduction5.f90
+++ b/libgomp/testsuite/libgomp.fortran/reduction5.f90
@@ -21 +21 @@ contains
-    if (n .ne. int(Z'243f')) STOP 1
+    if (n .ne. int(Z'243f')) stop 1
@@ -39 +39 @@ contains
-    if (m .ne. 3 .or. n .ne. 15) STOP 2
+    if (m .ne. 3 .or. n .ne. 15) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/reduction6.f90 b/libgomp/testsuite/libgomp.fortran/reduction6.f90
index 99fb8d16bc0..24d849cc60f 100644
--- a/libgomp/testsuite/libgomp.fortran/reduction6.f90
+++ b/libgomp/testsuite/libgomp.fortran/reduction6.f90
@@ -11 +11 @@
-    if (c .ne. '999999999999966699966699966699999999') STOP 1
+    if (c .ne. '999999999999966699966699966699999999') stop 1
@@ -30 +30 @@ contains
-    if (err .gt. 0) STOP 2
+    if (err .gt. 0) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/reference1.f90 b/libgomp/testsuite/libgomp.fortran/reference1.f90
index 8c9631b49d2..1d52c2fcdaa 100644
--- a/libgomp/testsuite/libgomp.fortran/reference1.f90
+++ b/libgomp/testsuite/libgomp.fortran/reference1.f90
@@ -11,2 +11,2 @@
-  if (i .ne. 38) STOP 1
-  if (iand (k, 255) .ne. 0) STOP 2
+  if (i .ne. 38) stop 1
+  if (iand (k, 255) .ne. 0) stop 2
@@ -14 +14 @@
-    if (k .ne. 65536 * 4) STOP 3
+    if (k .ne. 65536 * 4) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/reference2.f90 b/libgomp/testsuite/libgomp.fortran/reference2.f90
index 87efab255e1..6fcd05dca4b 100644
--- a/libgomp/testsuite/libgomp.fortran/reference2.f90
+++ b/libgomp/testsuite/libgomp.fortran/reference2.f90
@@ -14 +14 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/retval1.f90 b/libgomp/testsuite/libgomp.fortran/retval1.f90
index db49a0da8a0..604e14e2e84 100644
--- a/libgomp/testsuite/libgomp.fortran/retval1.f90
+++ b/libgomp/testsuite/libgomp.fortran/retval1.f90
@@ -17 +17 @@ function f1 ()
-  if (l) STOP 1
+  if (l) stop 1
@@ -35 +35 @@ entry e2 ()
-  if (l) STOP 2
+  if (l) stop 2
@@ -56 +56 @@ entry e3 ()
-  if (l) STOP 3
+  if (l) stop 3
@@ -77 +77 @@ entry e4 () result (s4)
-  if (l) STOP 4
+  if (l) stop 4
@@ -104 +104 @@ entry e5 (is_f5)
-  if (l) STOP 5
+  if (l) stop 5
@@ -111,9 +111,9 @@ end function f5
-  if (f1 () .ne. -2.5) STOP 6
-  if (f2 () .ne. 7.5) STOP 7
-  if (e2 () .ne. 7.5) STOP 8
-  if (f3 () .ne. 0.5) STOP 9
-  if (e3 () .ne. 0.5) STOP 10
-  if (f4 () .ne. -0.5) STOP 11
-  if (e4 () .ne. -0.5) STOP 12
-  if (f5 (.true.) .ne. -2.5) STOP 13
-  if (e5 (.false.) .ne. 8) STOP 14
+  if (f1 () .ne. -2.5) stop 6
+  if (f2 () .ne. 7.5) stop 7
+  if (e2 () .ne. 7.5) stop 8
+  if (f3 () .ne. 0.5) stop 9
+  if (e3 () .ne. 0.5) stop 10
+  if (f4 () .ne. -0.5) stop 11
+  if (e4 () .ne. -0.5) stop 12
+  if (f5 (.true.) .ne. -2.5) stop 13
+  if (e5 (.false.) .ne. 8) stop 14
diff --git a/libgomp/testsuite/libgomp.fortran/retval2.f90 b/libgomp/testsuite/libgomp.fortran/retval2.f90
index a2fd5b99117..2851e056eb8 100644
--- a/libgomp/testsuite/libgomp.fortran/retval2.f90
+++ b/libgomp/testsuite/libgomp.fortran/retval2.f90
@@ -20 +20 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
@@ -26 +26 @@ end function f1
-  if (f1 () .ne. -2.5) STOP 2
+  if (f1 () .ne. -2.5) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/sharing1.f90 b/libgomp/testsuite/libgomp.fortran/sharing1.f90
index 03633e9a78c..48c21aae429 100644
--- a/libgomp/testsuite/libgomp.fortran/sharing1.f90
+++ b/libgomp/testsuite/libgomp.fortran/sharing1.f90
@@ -28 +28 @@
-  if (l .or. j .ne. 25) STOP 1
+  if (l .or. j .ne. 25) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/sharing2.f90 b/libgomp/testsuite/libgomp.fortran/sharing2.f90
index 0b01059ee1d..3f76475f68e 100644
--- a/libgomp/testsuite/libgomp.fortran/sharing2.f90
+++ b/libgomp/testsuite/libgomp.fortran/sharing2.f90
@@ -30,2 +30,2 @@
-  if (l) STOP 1
-  if (j .ne. 25) STOP 2
+  if (l) stop 1
+  if (j .ne. 25) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/simd1.f90 b/libgomp/testsuite/libgomp.fortran/simd1.f90
index 558e141e1d1..353f16d04bc 100644
--- a/libgomp/testsuite/libgomp.fortran/simd1.f90
+++ b/libgomp/testsuite/libgomp.fortran/simd1.f90
@@ -33,2 +33,2 @@
-  if (r.ne.2700.or.j.ne.70.or.k.ne.80.or.s.ne.2700) STOP 1
-  if (t%x.ne.2700) STOP 2
+  if (r.ne.2700.or.j.ne.70.or.k.ne.80.or.s.ne.2700) stop 1
+  if (t%x.ne.2700) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/simd2.f90 b/libgomp/testsuite/libgomp.fortran/simd2.f90
index 0062d5e6e60..415ad9c965d 100644
--- a/libgomp/testsuite/libgomp.fortran/simd2.f90
+++ b/libgomp/testsuite/libgomp.fortran/simd2.f90
@@ -16 +16 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 1
+    if (a(i).ne.((i - 513) * b(i))) stop 1
@@ -18 +18 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 2
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 2
@@ -20 +20 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 3
+      if (b(i).ne.(modulo (i - 52, 39))) stop 3
@@ -24 +24 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 4
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 4
@@ -30 +30 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 5
+    if (a(i).ne.((i - 513) * b(i))) stop 5
@@ -32 +32 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 6
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 6
@@ -34 +34 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 7
+      if (b(i).ne.(modulo (i - 52, 39))) stop 7
@@ -38 +38 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 8
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 8
@@ -44 +44 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 9
+    if (a(i).ne.((i - 513) * b(i))) stop 9
@@ -46 +46 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 10
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 10
@@ -48 +48 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 11
+      if (b(i).ne.(modulo (i - 52, 39))) stop 11
@@ -51 +51 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 12
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 12
@@ -65,2 +65,2 @@ contains
-    if (i.ne.1025) STOP 13
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 14
+    if (i.ne.1025) stop 13
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 14
@@ -81,2 +81,2 @@ contains
-    if (i.ne.1025) STOP 15
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 16
+    if (i.ne.1025) stop 15
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 16
@@ -97,2 +97,2 @@ contains
-    if (i.ne.1025) STOP 17
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 18
+    if (i.ne.1025) stop 17
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 18
diff --git a/libgomp/testsuite/libgomp.fortran/simd3.f90 b/libgomp/testsuite/libgomp.fortran/simd3.f90
index 22ff564bd06..29b98e1895a 100644
--- a/libgomp/testsuite/libgomp.fortran/simd3.f90
+++ b/libgomp/testsuite/libgomp.fortran/simd3.f90
@@ -16 +16 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 1
+    if (a(i).ne.((i - 513) * b(i))) stop 1
@@ -18 +18 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 2
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 2
@@ -20 +20 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 3
+      if (b(i).ne.(modulo (i - 52, 39))) stop 3
@@ -24 +24 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 4
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 4
@@ -30 +30 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 5
+    if (a(i).ne.((i - 513) * b(i))) stop 5
@@ -32 +32 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 6
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 6
@@ -34 +34 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 7
+      if (b(i).ne.(modulo (i - 52, 39))) stop 7
@@ -38 +38 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 8
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 8
@@ -44 +44 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 9
+    if (a(i).ne.((i - 513) * b(i))) stop 9
@@ -46 +46 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 10
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 10
@@ -48 +48 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 11
+      if (b(i).ne.(modulo (i - 52, 39))) stop 11
@@ -51 +51 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 12
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 12
@@ -68,2 +68,2 @@ contains
-    if (i.ne.1025) STOP 13
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 14
+    if (i.ne.1025) stop 13
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 14
@@ -87,2 +87,2 @@ contains
-    if (i.ne.1025) STOP 15
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 16
+    if (i.ne.1025) stop 15
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 16
@@ -105,2 +105,2 @@ contains
-    if (i.ne.1025) STOP 17
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 18
+    if (i.ne.1025) stop 17
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 18
diff --git a/libgomp/testsuite/libgomp.fortran/simd4.f90 b/libgomp/testsuite/libgomp.fortran/simd4.f90
index ceb1611bd38..a81bc5e3472 100644
--- a/libgomp/testsuite/libgomp.fortran/simd4.f90
+++ b/libgomp/testsuite/libgomp.fortran/simd4.f90
@@ -16 +16 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 1
+    if (a(i).ne.((i - 513) * b(i))) stop 1
@@ -18 +18 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 2
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 2
@@ -20 +20 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 3
+      if (b(i).ne.(modulo (i - 52, 39))) stop 3
@@ -24 +24 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 4
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 4
@@ -30 +30 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 5
+    if (a(i).ne.((i - 513) * b(i))) stop 5
@@ -32 +32 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 6
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 6
@@ -34 +34 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 7
+      if (b(i).ne.(modulo (i - 52, 39))) stop 7
@@ -38 +38 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 8
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 8
@@ -44 +44 @@
-    if (a(i).ne.((i - 513) * b(i))) STOP 9
+    if (a(i).ne.((i - 513) * b(i))) stop 9
@@ -46 +46 @@
-      if (b(i).ne.(modulo (i - 52, 39) - 39)) STOP 10
+      if (b(i).ne.(modulo (i - 52, 39) - 39)) stop 10
@@ -48 +48 @@
-      if (b(i).ne.(modulo (i - 52, 39))) STOP 11
+      if (b(i).ne.(modulo (i - 52, 39))) stop 11
@@ -51 +51 @@
-  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) STOP 12
+  if (k.ne.(4 + 3 * 1024).or.s.ne.1596127) stop 12
@@ -66,2 +66,2 @@ contains
-    if (i.ne.1025) STOP 13
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 14
+    if (i.ne.1025) stop 13
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 14
@@ -83,2 +83,2 @@ contains
-    if (i.ne.1025) STOP 15
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 16
+    if (i.ne.1025) stop 15
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 16
@@ -99,2 +99,2 @@ contains
-    if (i.ne.1025) STOP 17
-    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) STOP 18
+    if (i.ne.1025) stop 17
+    if (u.ne.(36 + 4 + 3 * 1023).or.v.ne.(36 + 4 + 3 * 1024)) stop 18
diff --git a/libgomp/testsuite/libgomp.fortran/simd5.f90 b/libgomp/testsuite/libgomp.fortran/simd5.f90
index e1383d20d30..099fec55cb9 100644
--- a/libgomp/testsuite/libgomp.fortran/simd5.f90
+++ b/libgomp/testsuite/libgomp.fortran/simd5.f90
@@ -15 +15 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 1
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 1
@@ -24 +24 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 2
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 2
@@ -33 +33 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 3
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 3
@@ -42 +42 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 4
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 4
@@ -53 +53 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 5
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 5
@@ -64 +64 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 6
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 6
@@ -73 +73 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 7
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 7
@@ -82 +82 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 8
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 8
@@ -91 +91 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 9
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 9
@@ -100 +100 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 10
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 10
@@ -111 +111 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 11
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 11
@@ -123 +123 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 12
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 12
diff --git a/libgomp/testsuite/libgomp.fortran/simd6.f90 b/libgomp/testsuite/libgomp.fortran/simd6.f90
index b78bb4b6886..445ac4de4c4 100644
--- a/libgomp/testsuite/libgomp.fortran/simd6.f90
+++ b/libgomp/testsuite/libgomp.fortran/simd6.f90
@@ -21 +21 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 1
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 1
@@ -30 +30 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 2
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 2
@@ -39 +39 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 3
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 3
@@ -48 +48 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 4
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 4
@@ -59 +59 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 5
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 5
@@ -70 +70 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 6
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 6
@@ -79 +79 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 7
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 7
@@ -88 +88 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 8
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 8
@@ -97 +97 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) STOP 9
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 64 * 2) stop 9
@@ -106 +106 @@
-  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) STOP 10
+  if (c /= 0 .or. i /= 64 .or. b /= 7 + 16 * 3) stop 10
@@ -117 +117 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 11
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 11
@@ -129 +129 @@
-  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) STOP 12
+  if (c /= 0 .or. i /= 8 .or. j /= 8 .or. b /= 7 + 64 * 2) stop 12
diff --git a/libgomp/testsuite/libgomp.fortran/simd7.f90 b/libgomp/testsuite/libgomp.fortran/simd7.f90
index 4b5633e902b..28b2f251c55 100644
--- a/libgomp/testsuite/libgomp.fortran/simd7.f90
+++ b/libgomp/testsuite/libgomp.fortran/simd7.f90
@@ -33,14 +33,14 @@ subroutine foo (d, e, f, g, m, n)
-  if (l .or. i /= 64) STOP 1
-  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) STOP 2
-  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) STOP 3
-  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) STOP 4
-  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) STOP 5
-  if (m /= 15 + 9 * 64) STOP 6
-  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) STOP 7
-  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) STOP 8
-  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) STOP 9
-  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) STOP 10
-  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) STOP 11
-  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) STOP 12
-  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) STOP 13
-  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) STOP 14
+  if (l .or. i /= 64) stop 1
+  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) stop 2
+  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) stop 3
+  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) stop 4
+  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) stop 5
+  if (m /= 15 + 9 * 64) stop 6
+  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) stop 7
+  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) stop 8
+  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) stop 9
+  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) stop 10
+  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) stop 11
+  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) stop 12
+  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) stop 13
+  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) stop 14
@@ -71,14 +71,14 @@ subroutine foo (d, e, f, g, m, n)
-  if (l .or. i /= 8 .or. j /= 8) STOP 15
-  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) STOP 16
-  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) STOP 17
-  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) STOP 18
-  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) STOP 19
-  if (m /= 15 + 9 * 64) STOP 20
-  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) STOP 21
-  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) STOP 22
-  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) STOP 23
-  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) STOP 24
-  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) STOP 25
-  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) STOP 26
-  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) STOP 27
-  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) STOP 28
+  if (l .or. i /= 8 .or. j /= 8) stop 15
+  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) stop 16
+  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) stop 17
+  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) stop 18
+  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) stop 19
+  if (m /= 15 + 9 * 64) stop 20
+  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) stop 21
+  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) stop 22
+  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) stop 23
+  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) stop 24
+  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) stop 25
+  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) stop 26
+  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) stop 27
+  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) stop 28
@@ -107,14 +107,14 @@ subroutine foo (d, e, f, g, m, n)
-  if (l .or. i /= 64) STOP 29
-  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) STOP 30
-  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) STOP 31
-  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) STOP 32
-  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) STOP 33
-  if (m /= 15 + 9 * 64) STOP 34
-  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) STOP 35
-  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) STOP 36
-  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) STOP 37
-  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) STOP 38
-  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) STOP 39
-  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) STOP 40
-  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) STOP 41
-  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) STOP 42
+  if (l .or. i /= 64) stop 29
+  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) stop 30
+  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) stop 31
+  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) stop 32
+  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) stop 33
+  if (m /= 15 + 9 * 64) stop 34
+  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) stop 35
+  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) stop 36
+  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) stop 37
+  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) stop 38
+  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) stop 39
+  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) stop 40
+  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) stop 41
+  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) stop 42
@@ -145,14 +145,14 @@ subroutine foo (d, e, f, g, m, n)
-  if (l .or. i /= 8 .or. j /= 8) STOP 43
-  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) STOP 44
-  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) STOP 45
-  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) STOP 46
-  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) STOP 47
-  if (m /= 15 + 9 * 64) STOP 48
-  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) STOP 49
-  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) STOP 50
-  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) STOP 51
-  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) STOP 52
-  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) STOP 53
-  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) STOP 54
-  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) STOP 55
-  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) STOP 56
+  if (l .or. i /= 8 .or. j /= 8) stop 43
+  if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) stop 44
+  if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) stop 45
+  if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) stop 46
+  if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) stop 47
+  if (m /= 15 + 9 * 64) stop 48
+  if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) stop 49
+  if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) stop 50
+  if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) stop 51
+  if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) stop 52
+  if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) stop 53
+  if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) stop 54
+  if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) stop 55
+  if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) stop 56
diff --git a/libgomp/testsuite/libgomp.fortran/stack.f90 b/libgomp/testsuite/libgomp.fortran/stack.f90
index f0babdd059a..da0ff744f17 100644
--- a/libgomp/testsuite/libgomp.fortran/stack.f90
+++ b/libgomp/testsuite/libgomp.fortran/stack.f90
@@ -14 +14 @@ program stack
-  if (ilocs(1) .eq. ilocs(2)) STOP 1
+  if (ilocs(1) .eq. ilocs(2)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/strassen.f90 b/libgomp/testsuite/libgomp.fortran/strassen.f90
index 84faced494a..e0dc0c8eef9 100644
--- a/libgomp/testsuite/libgomp.fortran/strassen.f90
+++ b/libgomp/testsuite/libgomp.fortran/strassen.f90
@@ -22 +22 @@ program strassen_matmul
-  if (sqrt (sum ((C - D) ** 2)) / N .gt. 0.1) STOP 1
+  if (sqrt (sum ((C - D) ** 2)) / N .gt. 0.1) stop 1
@@ -32 +32 @@ program strassen_matmul
-  if (sqrt (sum ((C - D) ** 2)) / N .gt. 0.1) STOP 2
+  if (sqrt (sum ((C - D) ** 2)) / N .gt. 0.1) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/tabs1.f90 b/libgomp/testsuite/libgomp.fortran/tabs1.f90
index 68dba38c9ad..da334dc419e 100644
--- a/libgomp/testsuite/libgomp.fortran/tabs1.f90
+++ b/libgomp/testsuite/libgomp.fortran/tabs1.f90
@@ -1 +1 @@
-	if (b().ne.2) STOP 1
+	if (b().ne.2) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/tabs2.f b/libgomp/testsuite/libgomp.fortran/tabs2.f
index 07fca22cac3..a018dd53f60 100644
--- a/libgomp/testsuite/libgomp.fortran/tabs2.f
+++ b/libgomp/testsuite/libgomp.fortran/tabs2.f
@@ -2 +2 @@
-      if (b().ne.2) STOP 1
+      if (b().ne.2) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/target-simd.f90 b/libgomp/testsuite/libgomp.fortran/target-simd.f90
index a58e6a57d15..158347b59dc 100644
--- a/libgomp/testsuite/libgomp.fortran/target-simd.f90
+++ b/libgomp/testsuite/libgomp.fortran/target-simd.f90
@@ -17 +17 @@ program test
-  if (any (b - 5.0 *a > 10.0*epsilon(a))) call abort()
+  if (any (b - 5.0 *a > 10.0*epsilon(a))) stop 1
@@ -25 +25 @@ program test
-  if (any (b - 2.0 *a > 10.0*epsilon(a))) call abort()
+  if (any (b - 2.0 *a > 10.0*epsilon(a))) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/target1.f90 b/libgomp/testsuite/libgomp.fortran/target1.f90
index 99c5087ca97..36b12591344 100644
--- a/libgomp/testsuite/libgomp.fortran/target1.f90
+++ b/libgomp/testsuite/libgomp.fortran/target1.f90
@@ -16 +16 @@ contains
-    if (any (p /= q)) STOP 1
+    if (any (p /= q)) stop 1
@@ -18 +18 @@ contains
-      if (p(i) /= i * iand (i, 63)) STOP 2
+      if (p(i) /= i * iand (i, 63)) stop 2
@@ -41 +41 @@ contains
-    if (any (p + 2.0 /= q)) STOP 3
+    if (any (p + 2.0 /= q)) stop 3
@@ -55 +55 @@ end module target1
-    if (p(i) /= i * iand (i, 63) + 3) STOP 4
+    if (p(i) /= i * iand (i, 63) + 3) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/target2.f90 b/libgomp/testsuite/libgomp.fortran/target2.f90
index 0595ed192d5..11b8af737e3 100644
--- a/libgomp/testsuite/libgomp.fortran/target2.f90
+++ b/libgomp/testsuite/libgomp.fortran/target2.f90
@@ -32 +32 @@ contains
-    if (r) STOP 1
+    if (r) stop 1
@@ -43 +43 @@ contains
-    if (r) STOP 2
+    if (r) stop 2
@@ -65 +65 @@ contains
-    if (r) STOP 3
+    if (r) stop 3
@@ -80 +80 @@ contains
-    if (r) STOP 4
+    if (r) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/target3.f90 b/libgomp/testsuite/libgomp.fortran/target3.f90
index 6c45d119e6e..d9b9ccf63be 100644
--- a/libgomp/testsuite/libgomp.fortran/target3.f90
+++ b/libgomp/testsuite/libgomp.fortran/target3.f90
@@ -16 +16 @@ contains
-    if (r) STOP 1
+    if (r) stop 1
@@ -21 +21 @@ contains
-    if (r) STOP 2
+    if (r) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/target4.f90 b/libgomp/testsuite/libgomp.fortran/target4.f90
index 52575af07f4..5dac76cffd1 100644
--- a/libgomp/testsuite/libgomp.fortran/target4.f90
+++ b/libgomp/testsuite/libgomp.fortran/target4.f90
@@ -47 +47 @@ end module target4
-  if (any (a /= res)) STOP 1
+  if (any (a /= res)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/target5.f90 b/libgomp/testsuite/libgomp.fortran/target5.f90
index b03cb58c544..9d4662a18eb 100644
--- a/libgomp/testsuite/libgomp.fortran/target5.f90
+++ b/libgomp/testsuite/libgomp.fortran/target5.f90
@@ -6 +6 @@
-  if (r /= 11) STOP 1
+  if (r /= 11) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/target6.f90 b/libgomp/testsuite/libgomp.fortran/target6.f90
index 82f49e2b9c8..c4105d73082 100644
--- a/libgomp/testsuite/libgomp.fortran/target6.f90
+++ b/libgomp/testsuite/libgomp.fortran/target6.f90
@@ -19 +19 @@ contains
-      if (p(i) /= i * iand (i, 63)) STOP 1
+      if (p(i) /= i * iand (i, 63)) stop 1
@@ -31,2 +31,2 @@ contains
-      if (q(i) /= (v(i) - 1) * w(i)) STOP 2
-      if (p(i) /= q(i) + w(i)) STOP 3
+      if (q(i) /= (v(i) - 1) * w(i)) stop 2
+      if (p(i) /= q(i) + w(i)) stop 3
@@ -47 +47 @@ end module target6
-    if (p(i) /= (i + 1) * iand (i, 63)) STOP 4
+    if (p(i) /= (i + 1) * iand (i, 63)) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/target7.f90 b/libgomp/testsuite/libgomp.fortran/target7.f90
index 49ebb97618e..73a7485a638 100644
--- a/libgomp/testsuite/libgomp.fortran/target7.f90
+++ b/libgomp/testsuite/libgomp.fortran/target7.f90
@@ -31 +31 @@
-    if (a(i) /= i + 1) STOP 1
+    if (a(i) /= i + 1) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/target8.f90 b/libgomp/testsuite/libgomp.fortran/target8.f90
index e4874ae275c..5e7b1a4951f 100644
--- a/libgomp/testsuite/libgomp.fortran/target8.f90
+++ b/libgomp/testsuite/libgomp.fortran/target8.f90
@@ -25 +25 @@
-    if (a(i) /= i + 1) STOP 1
+    if (a(i) /= i + 1) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/task1.f90 b/libgomp/testsuite/libgomp.fortran/task1.f90
index 761226cd854..4eb6c106ea2 100644
--- a/libgomp/testsuite/libgomp.fortran/task1.f90
+++ b/libgomp/testsuite/libgomp.fortran/task1.f90
@@ -16 +16 @@ program tasktest
-  if (j.gt.0) STOP 1
+  if (j.gt.0) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/task2.f90 b/libgomp/testsuite/libgomp.fortran/task2.f90
index 27151415043..623c7179293 100644
--- a/libgomp/testsuite/libgomp.fortran/task2.f90
+++ b/libgomp/testsuite/libgomp.fortran/task2.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -10 +11 @@
-  if (err.ne.0) STOP 1
+  if (err.ne.0) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/task3.f90 b/libgomp/testsuite/libgomp.fortran/task3.f90
index fcff52ad016..a7b90d4c990 100644
--- a/libgomp/testsuite/libgomp.fortran/task3.f90
+++ b/libgomp/testsuite/libgomp.fortran/task3.f90
@@ -24 +24 @@ program F03_2_7_1d
-      STOP 1
+      stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/task4.f90 b/libgomp/testsuite/libgomp.fortran/task4.f90
index 6430f2914a4..918bb1f97a7 100644
--- a/libgomp/testsuite/libgomp.fortran/task4.f90
+++ b/libgomp/testsuite/libgomp.fortran/task4.f90
@@ -44 +44 @@
-  if (e .ne. 0) STOP 1
+  if (e .ne. 0) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/taskgroup1.f90 b/libgomp/testsuite/libgomp.fortran/taskgroup1.f90
index 3f6b38a35f9..a32d4440c16 100644
--- a/libgomp/testsuite/libgomp.fortran/taskgroup1.f90
+++ b/libgomp/testsuite/libgomp.fortran/taskgroup1.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -21 +22 @@
-	if (v(i).ne.(i + 1)) STOP 1
+	if (v(i).ne.(i + 1)) stop 1
@@ -37 +38 @@
-	if (v(i).ne.(i + 2)) STOP 2
+	if (v(i).ne.(i + 2)) stop 2
@@ -56,2 +57,2 @@
-	if (v(i).ne.(i + 3)) STOP 3
-	if (v(i + 1).ne.(i + 5)) STOP 4
+	if (v(i).ne.(i + 3)) stop 3
+	if (v(i + 1).ne.(i + 5)) stop 4
@@ -69 +70 @@
-	  if (v(i).ne.(i + 4).or.v(i + 1).ne.(i + 6)) STOP 5
+	  if (v(i).ne.(i + 4).or.v(i + 1).ne.(i + 6)) stop 5
@@ -76 +77 @@
-	if (v(i).ne.(i + 5)) STOP 6
+	if (v(i).ne.(i + 5)) stop 6
diff --git a/libgomp/testsuite/libgomp.fortran/taskloop1.f90 b/libgomp/testsuite/libgomp.fortran/taskloop1.f90
index 48904b145bd..616d16a6a26 100644
--- a/libgomp/testsuite/libgomp.fortran/taskloop1.f90
+++ b/libgomp/testsuite/libgomp.fortran/taskloop1.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -10 +11 @@
-  if (q .ne. 6 .or. r .ne. 17 .or. e) STOP 1
+  if (q .ne. 6 .or. r .ne. 17 .or. e) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/taskloop2.f90 b/libgomp/testsuite/libgomp.fortran/taskloop2.f90
index 0e92fcb6f89..d5646544d50 100644
--- a/libgomp/testsuite/libgomp.fortran/taskloop2.f90
+++ b/libgomp/testsuite/libgomp.fortran/taskloop2.f90
@@ -16 +16 @@
-    if (u(i) .ne. 2 * i + 1) STOP 1
+    if (u(i) .ne. 2 * i + 1) stop 1
@@ -27 +27 @@
-      if (u(i) .ne. 2 * i + 1) STOP 2
+      if (u(i) .ne. 2 * i + 1) stop 2
@@ -29 +29 @@
-      if (u(i) .ne. 1536 - 2 * i) STOP 3
+      if (u(i) .ne. 1536 - 2 * i) stop 3
@@ -34 +34 @@
-  if (m .ne. (1023 + 2 * (1021 * 5 + 17) + 9)) STOP 4
+  if (m .ne. (1023 + 2 * (1021 * 5 + 17) + 9)) stop 4
@@ -41 +41 @@
-    if (u(i) .ne. 2 * i + 1) STOP 5
+    if (u(i) .ne. 2 * i + 1) stop 5
@@ -45 +45 @@
-  if (m .ne. 1025) STOP 6
+  if (m .ne. 1025) stop 6
@@ -52 +52 @@
-    if (u(i) .ne. 1536 - 2 * i) STOP 7
+    if (u(i) .ne. 1536 - 2 * i) stop 7
@@ -56 +56 @@
-  if (m .ne. 32 + 33 + 1024) STOP 8
+  if (m .ne. 32 + 33 + 1024) stop 8
@@ -63 +63 @@
-    if (u(i) .ne. 2 * i + 1) STOP 9
+    if (u(i) .ne. 2 * i + 1) stop 9
@@ -65 +65 @@
-  if (m .ne. 32 + 33) STOP 10
+  if (m .ne. 32 + 33) stop 10
diff --git a/libgomp/testsuite/libgomp.fortran/taskloop3.f90 b/libgomp/testsuite/libgomp.fortran/taskloop3.f90
index 75f48229211..158966e39dd 100644
--- a/libgomp/testsuite/libgomp.fortran/taskloop3.f90
+++ b/libgomp/testsuite/libgomp.fortran/taskloop3.f90
@@ -8 +8 @@
-    if (f1 (74) .ne. 63 + 4) STOP 1
+    if (f1 (74) .ne. 63 + 4) stop 1
@@ -12,2 +12,2 @@
-    if (g .ne. 63 + 9) STOP 2
-    if (f3 (7_8, 11_8, 2_8) .ne. 11 * 7 + 13) STOP 3
+    if (g .ne. 63 + 9) stop 2
+    if (f3 (7_8, 11_8, 2_8) .ne. 11 * 7 + 13) stop 3
@@ -15 +15 @@
-&       + 11 * 31 + 17 * 46) STOP 4
+&       + 11 * 31 + 17 * 46) stop 4
@@ -25 +25 @@ contains
-      if (x .ne. 74) STOP 5
+      if (x .ne. 74) stop 5
@@ -36 +36 @@ contains
-      if (g .ne. 77) STOP 6
+      if (g .ne. 77) stop 6
@@ -63 +63 @@ contains
-        if (k .ne. 73) STOP 7
+        if (k .ne. 73) stop 7
diff --git a/libgomp/testsuite/libgomp.fortran/taskloop4.f90 b/libgomp/testsuite/libgomp.fortran/taskloop4.f90
index 23067a3e48d..88062805f67 100644
--- a/libgomp/testsuite/libgomp.fortran/taskloop4.f90
+++ b/libgomp/testsuite/libgomp.fortran/taskloop4.f90
@@ -14,2 +14,2 @@
-    if (cnt .ne. 79) STOP 1
-    if (min_iters .lt. 17 .or. max_iters .ge. 17 * 2) STOP 2
+    if (cnt .ne. 79) stop 1
+    if (min_iters .lt. 17 .or. max_iters .ge. 17 * 2) stop 2
@@ -17,2 +17,2 @@
-    if (cnt .ne. 370) STOP 3
-    if (min_iters .lt. 28 .or. max_iters .ge. 28 * 2) STOP 4
+    if (cnt .ne. 370) stop 3
+    if (min_iters .lt. 28 .or. max_iters .ge. 28 * 2) stop 4
@@ -20,3 +20,3 @@
-    if (cnt .ne. 7) STOP 5
-    if (min_iters .ne. 7 .or. max_iters .ne. 7) STOP 6
-    if (ntasks .ne. 1) STOP 7
+    if (cnt .ne. 7) stop 5
+    if (min_iters .ne. 7 .or. max_iters .ne. 7) stop 6
+    if (ntasks .ne. 1) stop 7
@@ -27 +27 @@
-    if (cnt .ne. 54 .or. ntasks .ne. 9) STOP 8
+    if (cnt .ne. 54 .or. ntasks .ne. 9) stop 8
@@ -29 +29 @@
-    if (cnt .ne. 13 .or. ntasks .ne. 13) STOP 9
+    if (cnt .ne. 13 .or. ntasks .ne. 13) stop 9
@@ -45 +45 @@ contains
-        if (k .ge. 64) STOP 10
+        if (k .ge. 64) stop 10
@@ -63 +63 @@ contains
-        if (k .ge. 64) STOP 11
+        if (k .ge. 64) stop 11
diff --git a/libgomp/testsuite/libgomp.fortran/threadprivate1.f90 b/libgomp/testsuite/libgomp.fortran/threadprivate1.f90
index 4867cc2cdbc..4ee56448aa0 100644
--- a/libgomp/testsuite/libgomp.fortran/threadprivate1.f90
+++ b/libgomp/testsuite/libgomp.fortran/threadprivate1.f90
@@ -18 +18 @@ end module threadprivate1
-  if (l) STOP 1
+  if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/threadprivate2.f90 b/libgomp/testsuite/libgomp.fortran/threadprivate2.f90
index c0aa5be8a94..f1428d8bef9 100644
--- a/libgomp/testsuite/libgomp.fortran/threadprivate2.f90
+++ b/libgomp/testsuite/libgomp.fortran/threadprivate2.f90
@@ -56,8 +56,8 @@ end module threadprivate2
-  if (l) STOP 1
-  if (.not.allocated (foo)) STOP 2
-  if (size (foo).ne.18) STOP 3
-  if (any (foo.ne.1)) STOP 4
-
-  if (associated (bar1)) STOP 5
-  if (.not.associated (bar3)) STOP 6
-  if (any (bar3 .ne. -2)) STOP 7
+  if (l) stop 1
+  if (.not.allocated (foo)) stop 2
+  if (size (foo).ne.18) stop 3
+  if (any (foo.ne.1)) stop 4
+
+  if (associated (bar1)) stop 5
+  if (.not.associated (bar3)) stop 6
+  if (any (bar3 .ne. -2)) stop 7
@@ -65 +65 @@ end module threadprivate2
-  if (associated (bar3)) STOP 8
+  if (associated (bar3)) stop 8
@@ -88,4 +88,4 @@ end module threadprivate2
-  if (l) STOP 9
-  if (.not.allocated (foo)) STOP 10
-  if (size (foo).ne.18) STOP 11
-  if (any (foo.ne.1)) STOP 12
+  if (l) stop 9
+  if (.not.allocated (foo)) stop 10
+  if (size (foo).ne.18) stop 11
+  if (any (foo.ne.1)) stop 12
@@ -93 +93 @@ end module threadprivate2
-  if (allocated (foo)) STOP 13
+  if (allocated (foo)) stop 13
diff --git a/libgomp/testsuite/libgomp.fortran/threadprivate3.f90 b/libgomp/testsuite/libgomp.fortran/threadprivate3.f90
index 5bb6b290e48..e82cc8a5ce4 100644
--- a/libgomp/testsuite/libgomp.fortran/threadprivate3.f90
+++ b/libgomp/testsuite/libgomp.fortran/threadprivate3.f90
@@ -47 +47 @@ end module threadprivate3
-    if (associated (bar3)) STOP 1
+    if (associated (bar3)) stop 1
@@ -58,5 +58,5 @@ end module threadprivate3
-  if (l) STOP 2
-  if (.not.associated (bar1)) STOP 3
-  if (any (bar1.ne.6)) STOP 4
-  if (.not.associated (bar3)) STOP 5
-  if (any (bar3 .ne. -2)) STOP 6
+  if (l) stop 2
+  if (.not.associated (bar1)) stop 3
+  if (any (bar1.ne.6)) stop 4
+  if (.not.associated (bar3)) stop 5
+  if (any (bar3 .ne. -2)) stop 6
@@ -64 +64 @@ end module threadprivate3
-  if (associated (bar3)) STOP 7
+  if (associated (bar3)) stop 7
@@ -105 +105 @@ end module threadprivate3
-  if (l) STOP 8
+  if (l) stop 8
diff --git a/libgomp/testsuite/libgomp.fortran/threadprivate4.f90 b/libgomp/testsuite/libgomp.fortran/threadprivate4.f90
index 2e7a438dd7b..a428ed94b15 100644
--- a/libgomp/testsuite/libgomp.fortran/threadprivate4.f90
+++ b/libgomp/testsuite/libgomp.fortran/threadprivate4.f90
@@ -75 +75 @@ end module threadprivate4
-  if (l) STOP 1
+  if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/udr1.f90 b/libgomp/testsuite/libgomp.fortran/udr1.f90
index 138bd587232..a12016d8864 100644
--- a/libgomp/testsuite/libgomp.fortran/udr1.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr1.f90
@@ -31 +31 @@ end module udr1
-  if (j .ne. 5050) STOP 1
+  if (j .ne. 5050) stop 1
@@ -37 +37 @@ end module udr1
-  if (j .ne. (5050 * 4 + 3)) STOP 2
+  if (j .ne. (5050 * 4 + 3)) stop 2
@@ -40 +40 @@ end module udr1
-    if (d%y .ne. 9) STOP 3
+    if (d%y .ne. 9) stop 3
@@ -43 +43 @@ end module udr1
-  if (d%x .ne. (5050 * 8 + 7) .or. d%y .ne. 9) STOP 4
+  if (d%x .ne. (5050 * 8 + 7) .or. d%y .ne. 9) stop 4
@@ -47 +47 @@ end module udr1
-    if (d%y .ne. 21) STOP 5
+    if (d%y .ne. 21) stop 5
@@ -50 +50 @@ end module udr1
-  if (d%x .ne. (5050 * 8 + 5) .or. d%y .ne. 21) STOP 6
+  if (d%x .ne. (5050 * 8 + 5) .or. d%y .ne. 21) stop 6
diff --git a/libgomp/testsuite/libgomp.fortran/udr10.f90 b/libgomp/testsuite/libgomp.fortran/udr10.f90
index a855c0b15c9..15e0f869bee 100644
--- a/libgomp/testsuite/libgomp.fortran/udr10.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr10.f90
@@ -31 +31 @@ program udr10
-  if (j%x /= 5050 .or. k%x /= 10100) STOP 1
+  if (j%x /= 5050 .or. k%x /= 10100) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/udr11.f90 b/libgomp/testsuite/libgomp.fortran/udr11.f90
index d69dd72bac3..57989be4a01 100644
--- a/libgomp/testsuite/libgomp.fortran/udr11.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr11.f90
@@ -91,4 +91,4 @@ end module udr11
-  if (j%x /= 5050 .or. k%x /= 30300 .or. l%x /= 15150) STOP 1
-  if (m%x /= 5050 .or. n%x /= 10100 .or. o%x /= 15150) STOP 2
-  if (p%x /= 5050 .or. q%x /= 10100 .or. r%x /= 15150) STOP 3
-  if (s%x /= 5050 .or. t%x /= 10100 .or. u%x /= 15150) STOP 4
+  if (j%x /= 5050 .or. k%x /= 30300 .or. l%x /= 15150) stop 1
+  if (m%x /= 5050 .or. n%x /= 10100 .or. o%x /= 15150) stop 2
+  if (p%x /= 5050 .or. q%x /= 10100 .or. r%x /= 15150) stop 3
+  if (s%x /= 5050 .or. t%x /= 10100 .or. u%x /= 15150) stop 4
diff --git a/libgomp/testsuite/libgomp.fortran/udr12.f90 b/libgomp/testsuite/libgomp.fortran/udr12.f90
index c39f0ebc90a..d1ae1aad909 100644
--- a/libgomp/testsuite/libgomp.fortran/udr12.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr12.f90
@@ -37 +37 @@
-  if (any (a /= 2 * r) .or. b /= 3 * r) STOP 1
+  if (any (a /= 2 * r) .or. b /= 3 * r) stop 1
@@ -46 +46 @@
-  if (any (a /= 4 * r) .or. b /= 6 * r) STOP 2
+  if (any (a /= 4 * r) .or. b /= 6 * r) stop 2
@@ -55 +55 @@
-  if (any (a /= 2 * r) .or. b /= 3 * r) STOP 3
+  if (any (a /= 2 * r) .or. b /= 3 * r) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/udr13.f90 b/libgomp/testsuite/libgomp.fortran/udr13.f90
index 0ff53adf0ca..d29e498e6bb 100644
--- a/libgomp/testsuite/libgomp.fortran/udr13.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr13.f90
@@ -44 +44 @@
-  if (lbound (a, 1) /= 1 .or. ubound (a, 1) /= 10) STOP 1
+  if (lbound (a, 1) /= 1 .or. ubound (a, 1) /= 10) stop 1
@@ -48 +48 @@
-  if (any (a /= 4 * r) ) STOP 2
+  if (any (a /= 4 * r) ) stop 2
@@ -54,5 +54,5 @@
-  if (lbound (b, 1) /= 3 .or. ubound (b, 1) /= 5) STOP 3
-  if (lbound (b, 2) /= 7 .or. ubound (b, 2) /= 9) STOP 4
-  if (.not. allocated (c)) STOP 5
-  if (lbound (c, 1) /= 4 .or. ubound (c, 1) /= 6) STOP 6
-  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 10) STOP 7
+  if (lbound (b, 1) /= 3 .or. ubound (b, 1) /= 5) stop 3
+  if (lbound (b, 2) /= 7 .or. ubound (b, 2) /= 9) stop 4
+  if (.not. allocated (c)) stop 5
+  if (lbound (c, 1) /= 4 .or. ubound (c, 1) /= 6) stop 6
+  if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 10) stop 7
@@ -63 +63 @@
-  if (any (b /= 3 * r) .or. any (c /= 4 * r)) STOP 8
+  if (any (b /= 3 * r) .or. any (c /= 4 * r)) stop 8
@@ -69,3 +69,3 @@
-  if (.not. allocated (c)) STOP 9
-  if (lbound (c, 1) /= 0 .or. ubound (c, 1) /= 1) STOP 10
-  if (lbound (c, 2) /= 7 .or. ubound (c, 2) /= 11) STOP 11
+  if (.not. allocated (c)) stop 9
+  if (lbound (c, 1) /= 0 .or. ubound (c, 1) /= 1) stop 10
+  if (lbound (c, 2) /= 7 .or. ubound (c, 2) /= 11) stop 11
@@ -75 +75 @@
-  if (any (c /= 10 * r)) STOP 12
+  if (any (c /= 10 * r)) stop 12
diff --git a/libgomp/testsuite/libgomp.fortran/udr14.f90 b/libgomp/testsuite/libgomp.fortran/udr14.f90
index cb54f4350b9..eed57e9afaf 100644
--- a/libgomp/testsuite/libgomp.fortran/udr14.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr14.f90
@@ -16,5 +16,5 @@
-  if (.not.allocated (a)) STOP 1
-  if (lbound (a, 1) /= 7 .or. ubound (a, 1) /= 8) STOP 2
-  if (.not.allocated (a(7)%h)) STOP 3
-  if (allocated (a(8)%h)) STOP 4
-  if (lbound (a(7)%h, 1) /= 1 .or. ubound (a(7)%h, 1) /= 3) STOP 5
+  if (.not.allocated (a)) stop 1
+  if (lbound (a, 1) /= 7 .or. ubound (a, 1) /= 8) stop 2
+  if (.not.allocated (a(7)%h)) stop 3
+  if (allocated (a(8)%h)) stop 4
+  if (lbound (a(7)%h, 1) /= 1 .or. ubound (a(7)%h, 1) /= 3) stop 5
@@ -25,6 +25,6 @@
-  if (.not.allocated (a)) STOP 6
-  if (lbound (a, 1) /= 7 .or. ubound (a, 1) /= 8) STOP 7
-  if (.not.allocated (a(7)%h)) STOP 8
-  if (allocated (a(8)%h)) STOP 9
-  if (lbound (a(7)%h, 1) /= 1 .or. ubound (a(7)%h, 1) /= 3) STOP 10
-  if (any (a(:)%g /= 2 * r) .or. any (a(7)%h(:) /= 3 * r)) STOP 11
+  if (.not.allocated (a)) stop 6
+  if (lbound (a, 1) /= 7 .or. ubound (a, 1) /= 8) stop 7
+  if (.not.allocated (a(7)%h)) stop 8
+  if (allocated (a(8)%h)) stop 9
+  if (lbound (a(7)%h, 1) /= 1 .or. ubound (a(7)%h, 1) /= 3) stop 10
+  if (any (a(:)%g /= 2 * r) .or. any (a(7)%h(:) /= 3 * r)) stop 11
@@ -34,7 +34,7 @@ contains
-    if (allocated (x) .neqv. allocated (y)) STOP 12
-    if (lbound (x, 1) /= lbound (y, 1)) STOP 13
-    if (ubound (x, 1) /= ubound (y, 1)) STOP 14
-    if (allocated (x(7)%h) .neqv. allocated (y(7)%h)) STOP 15
-    if (allocated (x(8)%h) .neqv. allocated (y(8)%h)) STOP 16
-    if (lbound (x(7)%h, 1) /= lbound (y(7)%h, 1)) STOP 17
-    if (ubound (x(7)%h, 1) /= ubound (y(7)%h, 1)) STOP 18
+    if (allocated (x) .neqv. allocated (y)) stop 12
+    if (lbound (x, 1) /= lbound (y, 1)) stop 13
+    if (ubound (x, 1) /= ubound (y, 1)) stop 14
+    if (allocated (x(7)%h) .neqv. allocated (y(7)%h)) stop 15
+    if (allocated (x(8)%h) .neqv. allocated (y(8)%h)) stop 16
+    if (lbound (x(7)%h, 1) /= lbound (y(7)%h, 1)) stop 17
+    if (ubound (x(7)%h, 1) /= ubound (y(7)%h, 1)) stop 18
diff --git a/libgomp/testsuite/libgomp.fortran/udr15.f90 b/libgomp/testsuite/libgomp.fortran/udr15.f90
index ffdb9a783bc..f5f3139d084 100644
--- a/libgomp/testsuite/libgomp.fortran/udr15.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr15.f90
@@ -63 +63 @@ end module udr15m2
-  if (d%x /= 5050 .or. j /= 4903) STOP 1
+  if (d%x /= 5050 .or. j /= 4903) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/udr2.f90 b/libgomp/testsuite/libgomp.fortran/udr2.f90
index 5b7d87b33eb..81fc6519257 100644
--- a/libgomp/testsuite/libgomp.fortran/udr2.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr2.f90
@@ -31 +31 @@ end module udr2
-  if (any(j .ne. 5050)) STOP 1
+  if (any(j .ne. 5050)) stop 1
@@ -37 +37 @@ end module udr2
-  if (any(j .ne. (5050 * 4 + 3))) STOP 2
+  if (any(j .ne. (5050 * 4 + 3))) stop 2
@@ -40 +40 @@ end module udr2
-    if (any(d%y .ne. 9)) STOP 3
+    if (any(d%y .ne. 9)) stop 3
@@ -43 +43 @@ end module udr2
-  if (any(d%x .ne. (5050 * 8 + 7)) .or. any(d%y .ne. 9)) STOP 4
+  if (any(d%x .ne. (5050 * 8 + 7)) .or. any(d%y .ne. 9)) stop 4
@@ -47 +47 @@ end module udr2
-    if (any(d%y .ne. 21)) STOP 5
+    if (any(d%y .ne. 21)) stop 5
@@ -50 +50 @@ end module udr2
-  if (any(d%x .ne. (5050 * 8 + 5)) .or. any(d%y .ne. 21)) STOP 6
+  if (any(d%x .ne. (5050 * 8 + 5)) .or. any(d%y .ne. 21)) stop 6
diff --git a/libgomp/testsuite/libgomp.fortran/udr3.f90 b/libgomp/testsuite/libgomp.fortran/udr3.f90
index 50cecec1f5a..a54f8ba2b2f 100644
--- a/libgomp/testsuite/libgomp.fortran/udr3.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr3.f90
@@ -32,2 +32,2 @@
-    if (index (c, char (ichar ('0') + i)) .eq. 0) STOP 1
-    if (index (d, char (ichar ('0') + i)) .eq. 0) STOP 2
+    if (index (c, char (ichar ('0') + i)) .eq. 0) stop 1
+    if (index (d, char (ichar ('0') + i)) .eq. 0) stop 2
@@ -35,3 +35,3 @@
-  if (e.ne.char (ichar ('0') + 64)) STOP 3
-  if (f(1:1).ne.char (ichar ('0') + 32)) STOP 4
-  if (f(2:2).ne.char (ichar ('0') + 64)) STOP 5
+  if (e.ne.char (ichar ('0') + 64)) stop 3
+  if (f(1:1).ne.char (ichar ('0') + 32)) stop 4
+  if (f(2:2).ne.char (ichar ('0') + 64)) stop 5
diff --git a/libgomp/testsuite/libgomp.fortran/udr4.f90 b/libgomp/testsuite/libgomp.fortran/udr4.f90
index 86d9515c70a..5d70b6b2830 100644
--- a/libgomp/testsuite/libgomp.fortran/udr4.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr4.f90
@@ -39,2 +39,2 @@
-    if (any (index (c, char (ichar ('0') + i)) .eq. 0)) STOP 1
-    if (any (index (d, char (ichar ('0') + i)) .eq. 0)) STOP 2
+    if (any (index (c, char (ichar ('0') + i)) .eq. 0)) stop 1
+    if (any (index (d, char (ichar ('0') + i)) .eq. 0)) stop 2
@@ -42,3 +42,3 @@
-  if (any (e.ne.char (ichar ('0') + 64))) STOP 3
-  if (any (f(:,:)(1:1).ne.char (ichar ('0') + 32))) STOP 4
-  if (any (f(:,:)(2:2).ne.char (ichar ('0') + 64))) STOP 5
+  if (any (e.ne.char (ichar ('0') + 64))) stop 3
+  if (any (f(:,:)(1:1).ne.char (ichar ('0') + 32))) stop 4
+  if (any (f(:,:)(2:2).ne.char (ichar ('0') + 64))) stop 5
diff --git a/libgomp/testsuite/libgomp.fortran/udr5.f90 b/libgomp/testsuite/libgomp.fortran/udr5.f90
index 8c6c525742a..725d0bfc905 100644
--- a/libgomp/testsuite/libgomp.fortran/udr5.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr5.f90
@@ -55,2 +55,2 @@ program udr5
-  if (xdt%r .ne. r) STOP 1
-  if (i4.ne.r.or.i8.ne.r.or.r4.ne.r.or.dp.ne.r) STOP 2
+  if (xdt%r .ne. r) stop 1
+  if (i4.ne.r.or.i8.ne.r.or.r4.ne.r.or.dp.ne.r) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/udr6.f90 b/libgomp/testsuite/libgomp.fortran/udr6.f90
index 159f6a40ffb..7c7556b5f24 100644
--- a/libgomp/testsuite/libgomp.fortran/udr6.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr6.f90
@@ -65,3 +65,3 @@ program udr6
-  if (any (xdt%r .ne. r)) STOP 1
-  if (any (i4.ne.r).or.any(i8.ne.r)) STOP 2
-  if (any(r4.ne.r).or.any(dp.ne.r)) STOP 3
+  if (any (xdt%r .ne. r)) stop 1
+  if (any (i4.ne.r).or.any(i8.ne.r)) stop 2
+  if (any(r4.ne.r).or.any(dp.ne.r)) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/udr7.f90 b/libgomp/testsuite/libgomp.fortran/udr7.f90
index 92b24a196f4..9e60ac1eb0d 100644
--- a/libgomp/testsuite/libgomp.fortran/udr7.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr7.f90
@@ -25 +25 @@ program udr7
-  if (any (x /= 2080.0)) STOP 1
+  if (any (x /= 2080.0)) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/udr8.f90 b/libgomp/testsuite/libgomp.fortran/udr8.f90
index 6b8eac22a7f..fb1fc2e9373 100644
--- a/libgomp/testsuite/libgomp.fortran/udr8.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr8.f90
@@ -45 +45 @@ end module udr8m2
-  if (d%x /= 5050 .or. j /= 4903) STOP 1
+  if (d%x /= 5050 .or. j /= 4903) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/udr9.f90 b/libgomp/testsuite/libgomp.fortran/udr9.f90
index a8ba78d924d..7b96f88fcbb 100644
--- a/libgomp/testsuite/libgomp.fortran/udr9.f90
+++ b/libgomp/testsuite/libgomp.fortran/udr9.f90
@@ -26 +26 @@ contains
-    if (y .ne. 3) STOP 1
+    if (y .ne. 3) stop 1
@@ -64 +64 @@ end module udr9m2
-  if (d%x /= 5050 .or. j /= 4903) STOP 2
+  if (d%x /= 5050 .or. j /= 4903) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90
index 2e5ce60d47c..69607e03e88 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90
@@ -0,0 +1 @@
+! { dg-do run }
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90
index bddb4491414..391a8313aec 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90
@@ -0,0 +1 @@
+! { dg-do run }
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90
index 93c61216034..ac69df559c9 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -17,2 +18,2 @@ contains
-    if (.not.present(ii)) call abort()
-    if (.not.associated(ii, ixx)) call abort()
+    if (.not.present(ii)) stop 1
+    if (.not.associated(ii, ixx)) stop 2
@@ -20,2 +21,2 @@ contains
-    if (.not.present(ii)) call abort()
-    if (.not.associated(ii)) call abort()
+    if (.not.present(ii)) stop 3
+    if (.not.associated(ii)) stop 4
@@ -29,2 +30,2 @@ contains
-    if (.not.present(jj)) call abort()
-    if (associated(jj)) call abort()
+    if (.not.present(jj)) stop 5
+    if (associated(jj)) stop 6
@@ -32,2 +33,2 @@ contains
-    if (.not.present(jj)) call abort()
-   if (associated(jj)) call abort()
+    if (.not.present(jj)) stop 7
+   if (associated(jj)) stop 8
diff --git a/libgomp/testsuite/libgomp.fortran/vla1.f90 b/libgomp/testsuite/libgomp.fortran/vla1.f90
index bf25e89a54a..63d17e7d47b 100644
--- a/libgomp/testsuite/libgomp.fortran/vla1.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla1.f90
@@ -159 +159 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/vla2.f90 b/libgomp/testsuite/libgomp.fortran/vla2.f90
index 1bda078a8f1..ef337d4753e 100644
--- a/libgomp/testsuite/libgomp.fortran/vla2.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla2.f90
@@ -127 +127 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/vla3.f90 b/libgomp/testsuite/libgomp.fortran/vla3.f90
index e31aaaf6b15..c21048370bc 100644
--- a/libgomp/testsuite/libgomp.fortran/vla3.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla3.f90
@@ -165 +165 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/vla4.f90 b/libgomp/testsuite/libgomp.fortran/vla4.f90
index 3388e872288..2d1a940778f 100644
--- a/libgomp/testsuite/libgomp.fortran/vla4.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla4.f90
@@ -169 +169 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
@@ -205 +205 @@ contains
-      if (l) STOP 2
+      if (l) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/vla5.f90 b/libgomp/testsuite/libgomp.fortran/vla5.f90
index 3b040c737ff..3b28c5108fe 100644
--- a/libgomp/testsuite/libgomp.fortran/vla5.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla5.f90
@@ -141 +141 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
@@ -177 +177 @@ contains
-      if (l) STOP 2
+      if (l) stop 2
diff --git a/libgomp/testsuite/libgomp.fortran/vla6.f90 b/libgomp/testsuite/libgomp.fortran/vla6.f90
index ccc91ec85d3..c2ea7f38ac4 100644
--- a/libgomp/testsuite/libgomp.fortran/vla6.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla6.f90
@@ -176 +176 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/vla7.f90 b/libgomp/testsuite/libgomp.fortran/vla7.f90
index a97132dc0a4..1e27a2e3f4a 100644
--- a/libgomp/testsuite/libgomp.fortran/vla7.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla7.f90
@@ -7 +7 @@
-  if (c .ne. 'opqrst') STOP 1
+  if (c .ne. 'opqrst') stop 1
@@ -9 +9 @@
-  if (c .ne. '_/!!/_') STOP 2
+  if (c .ne. '_/!!/_') stop 2
@@ -11 +11 @@
-  if (d(1) .ne. 'opqrst' .or. d(2) .ne. 'a') STOP 3
+  if (d(1) .ne. 'opqrst' .or. d(2) .ne. 'a') stop 3
@@ -13 +13 @@
-  if (d(1) .ne. 'Opqrst' .or. d(2) .ne. 'A') STOP 4
+  if (d(1) .ne. 'Opqrst' .or. d(2) .ne. 'A') stop 4
@@ -43 +43 @@ contains
-    if (l) STOP 5
+    if (l) stop 5
@@ -74 +74 @@ contains
-    if (l) STOP 6
+    if (l) stop 6
@@ -108 +108 @@ contains
-    if (l) STOP 7
+    if (l) stop 7
@@ -141 +141 @@ function f2 (n)
-  if (l) STOP 8
+  if (l) stop 8
diff --git a/libgomp/testsuite/libgomp.fortran/vla8.f90 b/libgomp/testsuite/libgomp.fortran/vla8.f90
index ee756d4fe6e..fbf3308d747 100644
--- a/libgomp/testsuite/libgomp.fortran/vla8.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla8.f90
@@ -240 +240 @@ contains
-    if (l) STOP 1
+    if (l) stop 1
diff --git a/libgomp/testsuite/libgomp.fortran/workshare1.f90 b/libgomp/testsuite/libgomp.fortran/workshare1.f90
index 1d2ba7d3ee2..a9baef40979 100644
--- a/libgomp/testsuite/libgomp.fortran/workshare1.f90
+++ b/libgomp/testsuite/libgomp.fortran/workshare1.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -27,3 +28,3 @@ end
-  if (any (a(1:5) .ne. 20)) STOP 1
-  if (any (a(6:10) .ne. 10)) STOP 2
-  if (.not. foo_seen .or. .not. bar_seen) STOP 3
+  if (any (a(1:5) .ne. 20)) stop 1
+  if (any (a(6:10) .ne. 10)) stop 2
+  if (.not. foo_seen .or. .not. bar_seen) stop 3
diff --git a/libgomp/testsuite/libgomp.fortran/workshare2.f90 b/libgomp/testsuite/libgomp.fortran/workshare2.f90
index 655a450885e..299e577732b 100644
--- a/libgomp/testsuite/libgomp.fortran/workshare2.f90
+++ b/libgomp/testsuite/libgomp.fortran/workshare2.f90
@@ -0,0 +1 @@
+! { dg-do run }
@@ -6 +7 @@ subroutine f1
-  if (any (a.ne.17)) STOP 1
+  if (any (a.ne.17)) stop 1
@@ -23,3 +24,3 @@ subroutine f2
-  if (any (a.ne.17)) STOP 2
-  if (c.ne.5.or.b.ne.4) STOP 3
-  if (any(d.ne.0)) STOP 4
+  if (any (a.ne.17)) stop 2
+  if (c.ne.5.or.b.ne.4) stop 3
+  if (any(d.ne.0)) stop 4
@@ -28 +29 @@ subroutine f2
-      if (f(i).ne.8) STOP 5
+      if (f(i).ne.8) stop 5
@@ -30 +31 @@ subroutine f2
-      if (f(i).ne.7) STOP 6
+      if (f(i).ne.7) stop 6

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]