testsuite: fix typos in comments

This fixes some 'scan-tree-dump-times' (vs '-time') typos and one or
two others I noticed in passing.

gcc/testsuite/ChangeLog:

	* g++.dg/warn/Winvalid-memory-model.C: Fix typo in comment.
	* gcc.dg/builtin-dynamic-object-size-19.c: Ditto.
	* gcc.dg/builtin-object-size-19.c: Ditto.
	* gcc.dg/strlenopt-40.c: Ditto.
	* gcc.dg/strlenopt-44.c: Ditto.
	* gcc.dg/strlenopt-45.c: Ditto.
	* gcc.dg/strlenopt-50.c: Ditto.
	* gcc.dg/strlenopt-51.c: Ditto.
	* gcc.dg/strlenopt-52.c: Ditto.
	* gcc.dg/strlenopt-53.c: Ditto.
	* gcc.dg/strlenopt-54.c: Ditto.
	* gcc.dg/strlenopt-55.c: Ditto.
	* gcc.dg/strlenopt-58.c: Ditto.
	* gcc.dg/strlenopt-59.c: Ditto.
	* gcc.dg/strlenopt-62.c: Ditto.
	* gcc.dg/strlenopt-65.c: Ditto.
	* gcc.dg/strlenopt-70.c: Ditto.
	* gcc.dg/strlenopt-72.c: Ditto.
	* gcc.dg/strlenopt-73.c: Ditto.
	* gcc.dg/strlenopt-77.c: Ditto.
	* gcc.dg/strlenopt-82.c: Ditto.
	* gcc.dg/tree-ssa/builtin-snprintf-4.c: Ditto.
	* gcc.dg/tree-ssa/builtin-snprintf-6.c: Ditto.
	* gcc.dg/tree-ssa/builtin-snprintf-7.c: Ditto.
	* gcc.dg/tree-ssa/builtin-sprintf-10.c: Ditto.
	* gcc.dg/tree-ssa/builtin-sprintf-9.c: Ditto.
	* gcc.dg/tree-ssa/phi-opt-value-5.c: Ditto.
	* lib/multiline.exp: Ditto.
	* lib/target-supports.exp: Ditto.

29 files changed, 39 insertions, 39 deletions

diff --git a/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C b/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C
index 5357d54..0ef2c75 100644
--- a/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C
+++ b/gcc/testsuite/g++.dg/warn/Winvalid-memory-model.C
@@ -1,6 +1,6 @@
 /* PR middle-end/99612 - Missing warning on incorrect memory order without
    -Wsystem-headers
-   Verify warings for basic atomic functions with no optimization.
+   Verify warnings for basic atomic functions with no optimization.
    { dg-do compile { target c++11 } }
    { dg-options "-O0 -Wall" } */
 
diff --git a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-19.c b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-19.c
index 44141a3..950466b 100644
--- a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-19.c
+++ b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-19.c
@@ -20,7 +20,7 @@ typedef __SIZE_TYPE__ size_t;
 /* Macro to emit a call to function named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)							\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-19.c b/gcc/testsuite/gcc.dg/builtin-object-size-19.c
index 1aab1ef..090d422 100644
--- a/gcc/testsuite/gcc.dg/builtin-object-size-19.c
+++ b/gcc/testsuite/gcc.dg/builtin-object-size-19.c
@@ -17,7 +17,7 @@ typedef __SIZE_TYPE__ size_t;
 /* Macro to emit a call to function named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)							\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-40.c b/gcc/testsuite/gcc.dg/strlenopt-40.c
index 7a97ebb..3e61c71 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-40.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-40.c
@@ -19,7 +19,7 @@
 /* Macros to emit a call to funcation named
      call_in_{true,false}_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM_TRUE(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
@@ -30,7 +30,7 @@
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define KEEP(expr)				\
diff --git a/gcc/testsuite/gcc.dg/strlenopt-44.c b/gcc/testsuite/gcc.dg/strlenopt-44.c
index 0af78ac..239695c 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-44.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-44.c
@@ -17,7 +17,7 @@
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ASSERT_ELIM(expr)						\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
@@ -25,7 +25,7 @@
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define ASSERT_KEEP(expr)			\
diff --git a/gcc/testsuite/gcc.dg/strlenopt-45.c b/gcc/testsuite/gcc.dg/strlenopt-45.c
index 31c1e53..61637b9 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-45.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-45.c
@@ -26,7 +26,7 @@ extern size_t strnlen (const char *, size_t);
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
@@ -34,7 +34,7 @@ extern size_t strnlen (const char *, size_t);
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define KEEP(expr)				\
diff --git a/gcc/testsuite/gcc.dg/strlenopt-50.c b/gcc/testsuite/gcc.dg/strlenopt-50.c
index 8e7c9db..b78ffba 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-50.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-50.c
@@ -17,7 +17,7 @@
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-51.c b/gcc/testsuite/gcc.dg/strlenopt-51.c
index 22a8938..7b5d261 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-51.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-51.c
@@ -17,7 +17,7 @@
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated, __COUNTER__); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-52.c b/gcc/testsuite/gcc.dg/strlenopt-52.c
index 97b3da7..29727dd 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-52.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-52.c
@@ -16,7 +16,7 @@
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-53.c b/gcc/testsuite/gcc.dg/strlenopt-53.c
index 489c22b..298665c 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-53.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-53.c
@@ -17,7 +17,7 @@
 /* Macro to emit a call to funcation named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)							\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-54.c b/gcc/testsuite/gcc.dg/strlenopt-54.c
index d4e57ff..1044162 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-54.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-54.c
@@ -16,7 +16,7 @@
 /* Macro to emit a call to function named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)							\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-55.c b/gcc/testsuite/gcc.dg/strlenopt-55.c
index ca89ecd..6b54db8 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-55.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-55.c
@@ -157,7 +157,7 @@ const char ax_100_3[] = { '1', '2', '3', [100] = '\0' };
 /* Macro to emit a call to funcation named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)							\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-58.c b/gcc/testsuite/gcc.dg/strlenopt-58.c
index 034961c..6bfc389 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-58.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-58.c
@@ -24,7 +24,7 @@ extern void* memchr (const void*, int, size_t);
 /* Macro to emit a call to funcation named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)							\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-59.c b/gcc/testsuite/gcc.dg/strlenopt-59.c
index 9bacf87..58bb74b 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-59.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-59.c
@@ -20,7 +20,7 @@ extern __SIZE_TYPE__ strlen (const char*);
 /* Macros to emit a call to funcation named
      call_failed_to_be_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if ((expr)) FAIL (test_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-62.c b/gcc/testsuite/gcc.dg/strlenopt-62.c
index 0e09a7a..38edfde 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-62.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-62.c
@@ -21,7 +21,7 @@ typedef __INT32_TYPE__   int32_t;
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated, __COUNTER__); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-65.c b/gcc/testsuite/gcc.dg/strlenopt-65.c
index 521d7ac..23c69ef 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-65.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-65.c
@@ -17,7 +17,7 @@
 /* Macro to emit a call to function named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM_IF_TRUE(expr)						\
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
@@ -25,7 +25,7 @@
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define TEST_KEEP(expr)				\
diff --git a/gcc/testsuite/gcc.dg/strlenopt-70.c b/gcc/testsuite/gcc.dg/strlenopt-70.c
index 0853023..b2dac9a 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-70.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-70.c
@@ -28,7 +28,7 @@ typedef __UINT64_TYPE__  uint64_t;
 /* Macros to emit a call to function named
      call_failed_to_be_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)					\
   if ((expr)) FAIL (not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-72.c b/gcc/testsuite/gcc.dg/strlenopt-72.c
index 9c00a95..b1ae20d 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-72.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-72.c
@@ -26,7 +26,7 @@
 /* Macros to emit a call to function named
      call_failed_to_be_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)					\
   if ((expr)) FAIL (not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-73.c b/gcc/testsuite/gcc.dg/strlenopt-73.c
index 6e15303..f439247 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-73.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-73.c
@@ -26,7 +26,7 @@
 /* Macros to emit a call to function named
      call_failed_to_be_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)				\
   if ((expr)) FAIL (not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-77.c b/gcc/testsuite/gcc.dg/strlenopt-77.c
index 76cd11d..44d2bc6 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-77.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-77.c
@@ -17,7 +17,7 @@
 /* Macro to emit a call to function named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ASSERT_ELIM(expr)						\
   if (!!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
diff --git a/gcc/testsuite/gcc.dg/strlenopt-82.c b/gcc/testsuite/gcc.dg/strlenopt-82.c
index 8070f6c..e1e60f4 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-82.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-82.c
@@ -21,7 +21,7 @@
 /* Macro to emit a call to function named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
@@ -29,7 +29,7 @@
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define KEEP(expr)				\
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-4.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-4.c
index 97a385e..d25a960 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-4.c
@@ -26,7 +26,7 @@ extern int vsnprintf (char*, size_t, const char*, va_list);
 /* Macro to emit a call to function named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each expression that's expected to fold to false but that
-   GCC does not fold.  The dg-final scan-tree-dump-time directive
+   GCC does not fold.  The dg-final scan-tree-dump-times directive
    at the bottom of the test verifies that no such call appears
    in output.  */
 #define ELIM(expr)							\
@@ -35,7 +35,7 @@ extern int vsnprintf (char*, size_t, const char*, va_list);
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define KEEP(expr)				\
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-6.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-6.c
index df09c81..806a1f4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-6.c
@@ -23,7 +23,7 @@ int snprintf (char * restrict, size_t, const char *restrict, ...);
 /* Macro to emit a call to funcation named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr)							\
   if (!(expr)) FAIL (in_true_branch_not_eliminated, __COUNTER__); else (void)0
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-7.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-7.c
index bf5072e..f7cb280 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-snprintf-7.c
@@ -25,7 +25,7 @@ void sink (void*, ...);
 /* Macro to emit a call to funcation named
    call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define VERIFY_ELIM(expr)						\
   if (!(expr)) FAIL (in_true_branch_not_eliminated, __COUNTER__); else (void)0
@@ -33,7 +33,7 @@ void sink (void*, ...);
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define VERIFY_KEEP(expr)			\
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-10.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-10.c
index 489af62..73e807f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-10.c
@@ -21,7 +21,7 @@ extern int snprintf (char*, size_t, const char*, ...);
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each call that's expected to be eliminated.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that no such call appears in output.  */
 #define ELIM(expr) \
   if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
@@ -29,7 +29,7 @@ extern int snprintf (char*, size_t, const char*, ...);
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define KEEP(expr)				\
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-9.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-9.c
index 3be18c7..fca7800 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-9.c
@@ -20,7 +20,7 @@ extern int snprintf (char*, size_t, const char*, ...);
 /* Macro to emit a call to funcation named
      call_in_true_branch_not_eliminated_on_line_NNN()
    for each expression that's expected to fold to false but that
-   GCC does not fold.  The dg-final scan-tree-dump-time directive
+   GCC does not fold.  The dg-final scan-tree-dump-times directive
    at the bottom of the test verifies that no such call appears
    in output.  */
 #define ELIM(expr)							\
@@ -29,7 +29,7 @@ extern int snprintf (char*, size_t, const char*, ...);
 /* Macro to emit a call to a function named
      call_made_in_{true,false}_branch_on_line_NNN()
    for each call that's expected to be retained.  The dg-final
-   scan-tree-dump-time directive at the bottom of the test verifies
+   scan-tree-dump-times directive at the bottom of the test verifies
    that the expected number of both kinds of calls appears in output
    (a pair for each line with the invocation of the KEEP() macro.  */
 #define KEEP(expr)				\
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-value-5.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-value-5.c
index 8062eb1..12ba475 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-value-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-value-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* PR treee-optimization/114894 */
+/* PR tree-optimization/114894 */
 /* Phi-OPT should be able to optimize these without sinking being invoked. */
 /* { dg-options "-O -fdump-tree-phiopt2 -fdump-tree-phiopt3 -fdump-tree-optimized -fno-tree-sink" } */
 
diff --git a/gcc/testsuite/lib/multiline.exp b/gcc/testsuite/lib/multiline.exp
index 22b5e0e..08fd969 100644
--- a/gcc/testsuite/lib/multiline.exp
+++ b/gcc/testsuite/lib/multiline.exp
@@ -17,7 +17,7 @@
 # Testing of multiline output
 
 # We have pre-existing testcases like this:
-#   |typedef struct _GMutex GMutex; // { dg-message "previously declared here"}
+#   |typedef struct _GMutex GMutex; // { dg-message "previously declared here" }
 # (using "|" here to indicate the start of a line),
 # generating output like this:
 #   |gcc/testsuite/g++.dg/diagnostic/wrong-tag-1.C:4:16: note: 'struct _GMutex' was previously declared here
@@ -27,7 +27,7 @@
 # To handle rich error-reporting, we want to be able to verify that we
 # get output like this:
 #   |gcc/testsuite/g++.dg/diagnostic/wrong-tag-1.C:4:16: note: 'struct _GMutex' was previously declared here
-#   | typedef struct _GMutex GMutex; // { dg-message "previously declared here"}
+#   | typedef struct _GMutex GMutex; // { dg-message "previously declared here" }
 #   |                ^~~~~~~
 # where the compiler's first line of output is as before, but in
 # which it then echoes the source lines, adding annotations.
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index e90c090..ee4138a 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -2078,7 +2078,7 @@ proc check_effective_target_riscv_zvfh { } {
 
 # Return 1 if the target arch supports half float, 0 otherwise.
 # Note, this differs from the test performed by
-# /* dg-skip-if "" { *-*-* } { "*" } { "-march=rv*zfh*" } */
+# /* { dg-skip-if "" { *-*-* } { "*" } { "-march=rv*zfh*" } } */
 # in that it takes default behaviour into account.
 # Cache the result.