17 files changed, 31 insertions, 31 deletions
diff --git a/flang/test/Semantics/canondo07.f90 b/flang/test/Semantics/canondo07.f90
index 074ea9df8f98..894950ddf969 100644
--- a/flang/test/Semantics/canondo07.f90
+++ b/flang/test/Semantics/canondo07.f90
@@ -1,7 +1,7 @@
 ! Error test -- DO loop uses obsolete loop termination statement
 ! See R1131 and C1131
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>&1 | FileCheck %s
 ! CHECK: A DO loop should terminate with an END DO or CONTINUE
 
 program endDo
diff --git a/flang/test/Semantics/canondo08.f90 b/flang/test/Semantics/canondo08.f90
index 09a277b53d5a..fd9b2300ac62 100644
--- a/flang/test/Semantics/canondo08.f90
+++ b/flang/test/Semantics/canondo08.f90
@@ -2,10 +2,10 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo09.f90 b/flang/test/Semantics/canondo09.f90
index 6d9efd91f89c..2fded62556d7 100644
--- a/flang/test/Semantics/canondo09.f90
+++ b/flang/test/Semantics/canondo09.f90
@@ -2,10 +2,10 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo10.f90 b/flang/test/Semantics/canondo10.f90
index 2733db6f7c61..dd5c9c358768 100644
--- a/flang/test/Semantics/canondo10.f90
+++ b/flang/test/Semantics/canondo10.f90
@@ -2,10 +2,10 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo11.f90 b/flang/test/Semantics/canondo11.f90
index 267e76ab34a7..190a21b30c27 100644
--- a/flang/test/Semantics/canondo11.f90
+++ b/flang/test/Semantics/canondo11.f90
@@ -2,10 +2,10 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo12.f90 b/flang/test/Semantics/canondo12.f90
index b3bc10cba02a..a3908708907a 100644
--- a/flang/test/Semantics/canondo12.f90
+++ b/flang/test/Semantics/canondo12.f90
@@ -2,9 +2,9 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo13.f90 b/flang/test/Semantics/canondo13.f90
index d75d8b96cebc..9926bd01190b 100644
--- a/flang/test/Semantics/canondo13.f90
+++ b/flang/test/Semantics/canondo13.f90
@@ -2,9 +2,9 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo14.f90 b/flang/test/Semantics/canondo14.f90
index 99a3d25360db..aa1f5618772a 100644
--- a/flang/test/Semantics/canondo14.f90
+++ b/flang/test/Semantics/canondo14.f90
@@ -2,9 +2,9 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo15.f90 b/flang/test/Semantics/canondo15.f90
index 059f06ce6409..87ad9a6dba4c 100644
--- a/flang/test/Semantics/canondo15.f90
+++ b/flang/test/Semantics/canondo15.f90
@@ -2,9 +2,9 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo16.f90 b/flang/test/Semantics/canondo16.f90
index e455fa32b227..68729085da37 100644
--- a/flang/test/Semantics/canondo16.f90
+++ b/flang/test/Semantics/canondo16.f90
@@ -2,9 +2,9 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo17.f90 b/flang/test/Semantics/canondo17.f90
index 6edc67c705b1..1293785b7b95 100644
--- a/flang/test/Semantics/canondo17.f90
+++ b/flang/test/Semantics/canondo17.f90
@@ -2,9 +2,9 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo18.f90 b/flang/test/Semantics/canondo18.f90
index dd9c046e5be6..15d9a3a28620 100644
--- a/flang/test/Semantics/canondo18.f90
+++ b/flang/test/Semantics/canondo18.f90
@@ -2,9 +2,9 @@
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
diff --git a/flang/test/Semantics/canondo19.f90 b/flang/test/Semantics/canondo19.f90
index 1142640267b7..934f8a0d42d2 100644
--- a/flang/test/Semantics/canondo19.f90
+++ b/flang/test/Semantics/canondo19.f90
@@ -1,7 +1,7 @@
 ! Check that if there is a label or a name on an label-do-stmt,
 ! then it is not lost when rewriting it to an non-label-do-stmt.
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>&1 | FileCheck %s
 
 ! CHECK: end do
 ! CHECK: 2 do
diff --git a/flang/test/Semantics/dosemantics03.f90 b/flang/test/Semantics/dosemantics03.f90
index b45dc8ca0c84..51097f6a9be5 100644
--- a/flang/test/Semantics/dosemantics03.f90
+++ b/flang/test/Semantics/dosemantics03.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -Mstandard -Werror
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -pedantic -Werror
 
 ! Issue 458 -- semantic checks for a normal DO loop.  The DO variable
 ! and the initial, final, and step expressions must be INTEGER if the
diff --git a/flang/test/Semantics/io10.f90 b/flang/test/Semantics/io10.f90
index 4b56f51ec550..e037b6ebdf3e 100644
--- a/flang/test/Semantics/io10.f90
+++ b/flang/test/Semantics/io10.f90
@@ -1,4 +1,4 @@
-! RUN: %S/test_errors.sh %s %t %f18 -Mstandard
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -pedantic
 
   write(*, '(B0)')
   write(*, '(B3)')
diff --git a/flang/test/Semantics/label01.F90 b/flang/test/Semantics/label01.F90
index 36a4fa56a543..d43ff5d43430 100644
--- a/flang/test/Semantics/label01.F90
+++ b/flang/test/Semantics/label01.F90
@@ -1,5 +1,5 @@
-! RUN: %f18 -funparse-with-symbols -DSTRICT_F18 -Mstandard %s 2>&1 | FileCheck %s
-! RUN: %f18 -funparse-with-symbols -DARCHAIC_FORTRAN %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -DSTRICT_F18 -pedantic %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -DARCHAIC_FORTRAN %s 2>&1 | FileCheck %s
 ! CHECK-NOT: :{{[[:space:]]}}error:{{[[:space:]]}}
 ! FIXME: the above check line does not work because diags are not emitted with error: in them.
 
@@ -122,7 +122,7 @@ subroutine do_loop09(a,n,j)
   goto 400
 200 print *, "found the index", j
   print *, "value at", j, "is", a(j)
-  goto 300 ! FIXME: emits diagnostic even without -Mstandard
+  goto 300 ! FIXME: emits diagnostic even without -pedantic
 400  do 100 i = 1, n
      if (i .eq. j) then
         goto 200	! extension: extended GOTO ranges
diff --git a/flang/test/Semantics/resolve103.f90 b/flang/test/Semantics/resolve103.f90
index 87f214a524b6..dbc3bca6cbc4 100644
--- a/flang/test/Semantics/resolve103.f90
+++ b/flang/test/Semantics/resolve103.f90
@@ -1,4 +1,4 @@
-! RUN: not %f18 -Mstandard %s 2>&1 | FileCheck %s
+! RUN: not %flang_fc1 -pedantic %s 2>&1 | FileCheck %s
 ! Test extension: allow forward references to dummy arguments
 ! from specification expressions in scopes with IMPLICIT NONE(TYPE),
 ! as long as those symbols are eventually typed later with the
@@ -20,7 +20,7 @@ subroutine foo2(a, n2)
 end
 
 !CHECK: Dummy argument 'n3' was used without being explicitly typed
-!CHECK-NOT: error:
+!CHECK-NOT: error: Dummy argument 'n3'
 subroutine foo3(a, n3)
   implicit none
   real a(n3)