ChangeLog: follow spelling conventions.

	* ChangeLog: follow spelling conventions.
	* g++.old-deja/g++.abi/ptrmem.C: Likewise.
	* g++.old-deja/g++.bugs/900210_05.C: Likewise.
	* g++.old-deja/g++.bugs/900211_04.C: Likewise.
	* g++.old-deja/g++.bugs/900321_02.C: Likewise.
	* g++.old-deja/g++.bugs/900404_02.C: Likewise.
	* g++.old-deja/g++.bugs/900520_06.C: Likewise.
	* g++.old-deja/g++.law/global-init1.C: Likewise.
	* g++.old-deja/g++.other/delete4.C: Likewise.
	* g++.old-deja/g++.other/inline21.C: Likewise.
	* g++.old-deja/g++.other/singleton.C: Likewise.
	* g77.dg/strlen0.f: Likewise.
	* g77.f-torture/compile/20010519-1.f: Likewise.
	* g77.f-torture/compile/980310-4.f: Likewise.
	* gcc.c-torture/compile/20000605-1.c: Likewise.
	* gcc.c-torture/execute/20020225-1.c: Likewise.
	* gcc.dg/c90-hexfloat-2.c: Likewise.
	* gcc.dg/c99-bool-1.c: Likewise.
	* gcc.dg/c99-hexfloat-2.c: Likewise.
	* gcc.dg/dll-2.c: Likewise.
	* gcc.dg/wtr-union-init-1.c: Likewise.
	* gcc.dg/wtr-union-init-2.c: Likewise.
	* gcc.dg/wtr-union-init-3.c: Likewise.
	* gcc.dg/cpp/avoidpaste1.c: Likewise.
	* gcc.dg/cpp/defined.c: Likewise.
	* gcc.dg/cpp/macsyntx.c: Likewise.
	* gcc.dg/cpp/paste2.c: Likewise.
	* gcc.dg/cpp/trad/defined.c: Likewise.
	* gcc.dg/format/c90-printf-1.c: Likewise.
	* gcc.dg/format/c90-scanf-1.c: Likewise.
	* gcc.dg/format/c99-printf-1.c: Likewise.
	* gcc.dg/format/c99-scanf-1.c: Likewise.
	* gcc.misc-tests/gcov-8.c: Likewise.
	* lib/profopt.exp: Likewise.

From-SVN: r57189

34 files changed, 80 insertions, 43 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6fd143d..9d1aadd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,40 @@
+2002-09-16  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* ChangeLog: follow spelling conventions.
+	* g++.old-deja/g++.abi/ptrmem.C: Likewise.
+	* g++.old-deja/g++.bugs/900210_05.C: Likewise.
+	* g++.old-deja/g++.bugs/900211_04.C: Likewise.
+	* g++.old-deja/g++.bugs/900321_02.C: Likewise.
+	* g++.old-deja/g++.bugs/900404_02.C: Likewise.
+	* g++.old-deja/g++.bugs/900520_06.C: Likewise.
+	* g++.old-deja/g++.law/global-init1.C: Likewise.
+	* g++.old-deja/g++.other/delete4.C: Likewise.
+	* g++.old-deja/g++.other/inline21.C: Likewise.
+	* g++.old-deja/g++.other/singleton.C: Likewise.
+	* g77.dg/strlen0.f: Likewise.
+	* g77.f-torture/compile/20010519-1.f: Likewise.
+	* g77.f-torture/compile/980310-4.f: Likewise.
+	* gcc.c-torture/compile/20000605-1.c: Likewise.
+	* gcc.c-torture/execute/20020225-1.c: Likewise.
+	* gcc.dg/c90-hexfloat-2.c: Likewise.
+	* gcc.dg/c99-bool-1.c: Likewise.
+	* gcc.dg/c99-hexfloat-2.c: Likewise.
+	* gcc.dg/dll-2.c: Likewise.
+	* gcc.dg/wtr-union-init-1.c: Likewise.
+	* gcc.dg/wtr-union-init-2.c: Likewise.
+	* gcc.dg/wtr-union-init-3.c: Likewise.
+	* gcc.dg/cpp/avoidpaste1.c: Likewise.
+	* gcc.dg/cpp/defined.c: Likewise.
+	* gcc.dg/cpp/macsyntx.c: Likewise.
+	* gcc.dg/cpp/paste2.c: Likewise.
+	* gcc.dg/cpp/trad/defined.c: Likewise.
+	* gcc.dg/format/c90-printf-1.c: Likewise.
+	* gcc.dg/format/c90-scanf-1.c: Likewise.
+	* gcc.dg/format/c99-printf-1.c: Likewise.
+	* gcc.dg/format/c99-scanf-1.c: Likewise.
+	* gcc.misc-tests/gcov-8.c: Likewise.
+	* lib/profopt.exp: Likewise.
+
 2002-09-15  Krister Walfridsson  <cato@df.lth.se>
 
 	* lib/old-dejagnu.exp (old-dejagnu) Improve test for ICE.
@@ -310,7 +347,7 @@ Tue Aug 27 22:23:22 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 2002-07-26  Neil Booth  <neil@daikokuya.cop.uk>
 
 	* gcc.dg/cpp/trad/Wunused.c, gcc.dg/cpp/Wunused.c: Add test
-	for documented behaviour.
+	for documented behavior.
 
 2002-07-25  Roger Sayle  <roger@eyesopen.com>
 
@@ -2741,7 +2778,7 @@ Wed Jan  9 14:03:20 2002  Jeffrey A Law  (law@redhat.com)
 
 2001-12-28  Jakub Jelinek  <jakub@redhat.com>
 
-	* gcc.dg/gnu89-init-1.c: Adjust for the new behaviour, add some
+	* gcc.dg/gnu89-init-1.c: Adjust for the new behavior, add some
 	additional tests.
 
 2001-12-27  Roger Sayle <roger@eyesopen.com>
diff --git a/gcc/testsuite/g++.old-deja/g++.abi/ptrmem.C b/gcc/testsuite/g++.old-deja/g++.abi/ptrmem.C
index 2944d17..c9efd04 100644
--- a/gcc/testsuite/g++.old-deja/g++.abi/ptrmem.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/ptrmem.C
@@ -37,7 +37,7 @@ struct S
 };
 
 // Because S does not have a VPTR, it will not be a primary base of T,
-// and will therefore end up at a non-zero offset.
+// and will therefore end up at a nonzero offset.
 
 struct T : public S 
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900210_05.C b/gcc/testsuite/g++.old-deja/g++.bugs/900210_05.C
index fc0ead9..c053c2a 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900210_05.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900210_05.C
@@ -12,8 +12,8 @@
 // options come to mind.)
 
 // The use of errors rather than warnings is important because errors
-// usually result in non-zero exit status codes for language processors
-// and these non-zero exit stati can be automatically checked during
+// usually result in nonzero exit status codes for language processors
+// and these nonzero exit stati can be automatically checked during
 // normal execution of a Makefile.
 
 // cfront 2.0 provides the +p option which causes errors to be generated for
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900211_04.C b/gcc/testsuite/g++.old-deja/g++.bugs/900211_04.C
index 81bea9e..e2bd8fd 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900211_04.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900211_04.C
@@ -1,7 +1,7 @@
 // g++ 1.36.1 bug 900211_04
 
 // g++ fails to flag as errors attempts to compare pointer values against
-// (non-zero) integer values;
+// (nonzero) integer values;
 
 // Since implicit conversions of pointer to integers (or vise versa) are
 // illegal, these comparisons are also illegal.
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900321_02.C b/gcc/testsuite/g++.old-deja/g++.bugs/900321_02.C
index d635ba3..e54a02d 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900321_02.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900321_02.C
@@ -1,6 +1,6 @@
 // g++ 1.37.1 bug 900321_02
 
-// The following program exits with a non-zero status because the constructor
+// The following program exits with a nonzero status because the constructor
 // is not called 3 times as it should be.  This program exits with a zero
 // status when compiled with cfront 2.0.
 
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900404_02.C b/gcc/testsuite/g++.old-deja/g++.bugs/900404_02.C
index 4099daa..b48eb8a 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900404_02.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900404_02.C
@@ -3,7 +3,7 @@
 // g++ fails to treat multicharacter literals as type "int" as required by
 // section 2.5.2 of the C++ Reference Manual.
 
-// The result is that the following program will exit with a non-zero
+// The result is that the following program will exit with a nonzero
 // exit status.
 
 // keywords: character literals, multi-character literals, int type
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900520_06.C b/gcc/testsuite/g++.old-deja/g++.bugs/900520_06.C
index aa4ec9a..2fda6ca 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900520_06.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900520_06.C
@@ -9,7 +9,7 @@
 // the class type when a parameter of the class type is passed as an
 // actual parameter.
 
-// This causes the following program to exit with a non-zero exit status.
+// This causes the following program to exit with a nonzero exit status.
 
 // cfront 2.0 passes this test.
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/global-init1.C b/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
index 5807b19..3a67158 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
@@ -2,7 +2,7 @@
 // global-init file
 // Message-Id: <9212021756.AA12639@grumpy.pocs.com>
 // From: wp@pocs.com (Wolfgang Polak)
-// Subject: Initializers - gcc 2.2.2 (g++), Sparc, SunOS 4.1.1
+// Subject: Initializers - gcc 2.2.2 (g++), SPARC, SunOS 4.1.1
 // Date: Wed, 2 Dec 92 09:56:01 PST
 
 #include <stdio.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.other/delete4.C b/gcc/testsuite/g++.old-deja/g++.other/delete4.C
index 74ddcdd..e729ea2 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/delete4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/delete4.C
@@ -3,7 +3,7 @@
 // Copyright (C) 1999 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 15 Apr 1999 <nathan@acm.org>
 
-// delete (void *)e and delete[] (void *)e result in undefined behaviour
+// delete (void *)e and delete[] (void *)e result in undefined behavior
 // [expr.delete/3]. Check we warn about them
 // operator new functions can only return NULL, if their exceptions
 // specification is `throw()'. All other cases must return a non-null pointer
diff --git a/gcc/testsuite/g++.old-deja/g++.other/inline21.C b/gcc/testsuite/g++.old-deja/g++.other/inline21.C
index 1f3dd0e..b7edf01 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/inline21.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/inline21.C
@@ -18,7 +18,7 @@ struct Container {
 };
 
 
-// TEST FOR CORRECT BEHAVIOUR
+// TEST FOR CORRECT BEHAVIOR
 
 int myArray[3];
 int * intp = myArray;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/singleton.C b/gcc/testsuite/g++.old-deja/g++.other/singleton.C
index 075d83a..36d00f9 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/singleton.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/singleton.C
@@ -4,7 +4,7 @@
 // egcs fails to see that there is a public static accessor function.
 // 2. the program crashes, because apparently the static variable s in
 // singleton::instance() is considered constructed although the ctor
-// exited via an exception. (crash changed to non-zero return here)
+// exited via an exception. (crash changed to nonzero return here)
 
 class singleton {
 public:
diff --git a/gcc/testsuite/g77.dg/strlen0.f b/gcc/testsuite/g77.dg/strlen0.f
index 7943951..765c8b6 100644
--- a/gcc/testsuite/g77.dg/strlen0.f
+++ b/gcc/testsuite/g77.dg/strlen0.f
@@ -28,7 +28,7 @@ C     written for null values of str1 and/or str2.
 C
 C     This code compiles and runs without error on
 C       SunOS 4.1.3 f77 (-C option)
-C       SUNWspro SparcCompiler 4.2 f77 (-C option)
+C       SUNWspro SPARCcompiler 4.2 f77 (-C option)
 C       (and with proposed patches, gcc-2.9.2 -fbounds-check except for test 6,
 C        which is a genuine, deliberate error - comment out to make further
 C        tests)
diff --git a/gcc/testsuite/g77.f-torture/compile/20010519-1.f b/gcc/testsuite/g77.f-torture/compile/20010519-1.f
index 5690580..4da86e8 100644
--- a/gcc/testsuite/g77.f-torture/compile/20010519-1.f
+++ b/gcc/testsuite/g77.f-torture/compile/20010519-1.f
@@ -15,7 +15,7 @@ C     See: L.Mouawad and D.Perahia, Biopolymers (1993), 33, 599,
 C     and: D.Perahia and L.Mouawad, Comput. Chem. (1995), 19, 241.
 C     The method iteratively solves the diagonalization of the
 C     Hessian matrix. To save memory space, it uses a compressed
-C     form of the Hessian, which only contains the non-zero elements.
+C     form of the Hessian, which only contains the nonzero elements.
 C     In the diagonalization process, approximate eigenvectors are
 C     mixed with Cartesian coordinates to form a reduced basis. The
 C     Hessian is then diagonalized in the reduced basis. By iterating
diff --git a/gcc/testsuite/g77.f-torture/compile/980310-4.f b/gcc/testsuite/g77.f-torture/compile/980310-4.f
index b169845..802e303 100644
--- a/gcc/testsuite/g77.f-torture/compile/980310-4.f
+++ b/gcc/testsuite/g77.f-torture/compile/980310-4.f
@@ -121,7 +121,7 @@ c                             difficulty involved.
 c                         = 2 the occurrence of roundoff error is
 c                             detected, which prevents the requested
 c                             tolerance from being achieved.
-c                         = 3 extremely bad integrand behaviour occurs
+c                         = 3 extremely bad integrand behavior occurs
 c                             at some points of the integration
 c                             interval.
 c                         = 6 the input is invalid, because
@@ -303,7 +303,7 @@ c           equals limit.
 c
         if(last.eq.limit) ier = 1
 c
-c           set error flag in the case of bad integrand behaviour
+c           set error flag in the case of bad integrand behavior
 c           at a point of the integration range.
 c
         if(dmax1(dabs(a1),dabs(b2)).le.(0.1d+01+0.1d+03*
diff --git a/gcc/testsuite/gcc.c-torture/compile/20000605-1.c b/gcc/testsuite/gcc.c-torture/compile/20000605-1.c
index 931c582..1fe5882 100644
--- a/gcc/testsuite/gcc.c-torture/compile/20000605-1.c
+++ b/gcc/testsuite/gcc.c-torture/compile/20000605-1.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 2000 Free Software Foundation */
 
-/* make sure we don't get confused by various flavours of void */
+/* make sure we don't get confused by various flavors of void */
 
 /* Origin:  Jakub Jelinek  <jakub@redhat.com>
  *          Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/gcc/testsuite/gcc.c-torture/execute/20020225-1.c b/gcc/testsuite/gcc.c-torture/execute/20020225-1.c
index 61724a1..514730a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20020225-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20020225-1.c
@@ -1,5 +1,5 @@
 /* This testcase failed at -O2 on powerpc64 due to andsi3 writing
-   non-zero bits to the high 32 bits of a 64 bit register.  */
+   nonzero bits to the high 32 bits of a 64 bit register.  */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/c90-hexfloat-2.c b/gcc/testsuite/gcc.dg/c90-hexfloat-2.c
index d1a048d..259471c 100644
--- a/gcc/testsuite/gcc.dg/c90-hexfloat-2.c
+++ b/gcc/testsuite/gcc.dg/c90-hexfloat-2.c
@@ -20,5 +20,5 @@ main (void)
   if (strcmp (s, "0x1p+( 0x1p+)"))
     abort ();
   else
-    return 0; /* Correct C90 behaviour.  */
+    return 0; /* Correct C90 behavior.  */
 }
diff --git a/gcc/testsuite/gcc.dg/c99-bool-1.c b/gcc/testsuite/gcc.dg/c99-bool-1.c
index 8a45988..1037eb5 100644
--- a/gcc/testsuite/gcc.dg/c99-bool-1.c
+++ b/gcc/testsuite/gcc.dg/c99-bool-1.c
@@ -54,7 +54,7 @@ main (void)
     abort ();
   if (a != 1 || b != 0 || c != 1)
     abort ();
-  /* Casts to _Bool have a specified behaviour.  */
+  /* Casts to _Bool have a specified behavior.  */
   if ((int)(_Bool)2 != 1)
     abort ();
   if ((int)(_Bool)0.2 != 1)
diff --git a/gcc/testsuite/gcc.dg/c99-hexfloat-2.c b/gcc/testsuite/gcc.dg/c99-hexfloat-2.c
index 589f440..3ca15c3 100644
--- a/gcc/testsuite/gcc.dg/c99-hexfloat-2.c
+++ b/gcc/testsuite/gcc.dg/c99-hexfloat-2.c
@@ -20,5 +20,5 @@ main (void)
   if (strcmp (s, "0x1p+f 0x1p+l"))
     abort ();
   else
-    return 0; /* Correct C99 behaviour.  */
+    return 0; /* Correct C99 behavior.  */
 }
diff --git a/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c b/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c
index 952d54e..f2905c3 100644
--- a/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c
+++ b/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c
@@ -18,7 +18,7 @@
 : : : .. . 0 0 .
 
 It relies on the fact that even when preprocessing C we bother to separate
-the colons of C++'s :: operator.  If we confine this behaviour to C++
+the colons of C++'s :: operator.  If we confine this behavior to C++
 in future, this test needs to change.  */
 
 :: :g: :f(): :f(^): tricky
diff --git a/gcc/testsuite/gcc.dg/cpp/defined.c b/gcc/testsuite/gcc.dg/cpp/defined.c
index 864ef1d..9a60bdd 100644
--- a/gcc/testsuite/gcc.dg/cpp/defined.c
+++ b/gcc/testsuite/gcc.dg/cpp/defined.c
@@ -2,7 +2,7 @@
 
 /* { dg-do preprocess } */
 
-/* Tests behaviour of the defined operator.  */
+/* Tests behavior of the defined operator.  */
 
 /*  Source: Neil Booth, 29 Oct 2000, Zack Weinberg 11 Dec 2000.  */
 
@@ -19,7 +19,7 @@
 #error Z is not defined
 #endif
 
-/* The behaviour of "defined" when it comes from a macro expansion is
+/* The behavior of "defined" when it comes from a macro expansion is
    now documented.  */
 #if is_Z_defined
 #error Macro expanding into defined operator test 1
@@ -51,7 +51,7 @@
 #error Z is not defined
 #endif
 
-/* The behaviour of "defined" when it comes from a macro expansion is
+/* The behavior of "defined" when it comes from a macro expansion is
    now documented.  */
 #if is_Z_defined
 #error Macro expanding into defined operator test 1
diff --git a/gcc/testsuite/gcc.dg/cpp/macsyntx.c b/gcc/testsuite/gcc.dg/cpp/macsyntx.c
index d028ebd..495921e 100644
--- a/gcc/testsuite/gcc.dg/cpp/macsyntx.c
+++ b/gcc/testsuite/gcc.dg/cpp/macsyntx.c
@@ -7,7 +7,7 @@
 
    o Full range of macro definition semantics.
    o No. of arguments supplied to function-like macros.
-   o Odd GNU rest args behaviour.
+   o Odd GNU rest args behavior.
    o Macro arguments do not flow into the rest of the file.  */
 
 
diff --git a/gcc/testsuite/gcc.dg/cpp/paste2.c b/gcc/testsuite/gcc.dg/cpp/paste2.c
index 1958918d..788e4eb5 100644
--- a/gcc/testsuite/gcc.dg/cpp/paste2.c
+++ b/gcc/testsuite/gcc.dg/cpp/paste2.c
@@ -3,7 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-std=c99 -pedantic-errors" } */
 
-/* Test ## behaviour and corner cases thoroughly.  The macro expander
+/* Test ## behavior and corner cases thoroughly.  The macro expander
    failed many of these during development.  */
 
 #ifndef __WCHAR_TYPE__
diff --git a/gcc/testsuite/gcc.dg/cpp/trad/defined.c b/gcc/testsuite/gcc.dg/cpp/trad/defined.c
index a24ecd5..5fa1d93 100644
--- a/gcc/testsuite/gcc.dg/cpp/trad/defined.c
+++ b/gcc/testsuite/gcc.dg/cpp/trad/defined.c
@@ -29,7 +29,7 @@
 #error Z is not defined
 #endif
 
-/* The behaviour of "defined" when it comes from a macro expansion is
+/* The behavior of "defined" when it comes from a macro expansion is
    now documented.  */
 #if is_Z_defined
 #error Macro expanding into defined operator test 1
@@ -61,7 +61,7 @@
 #error Z is not defined
 #endif
 
-/* The behaviour of "defined" when it comes from a macro expansion is
+/* The behavior of "defined" when it comes from a macro expansion is
    now documented.  */
 #if is_Z_defined
 #error Macro expanding into defined operator test 1
diff --git a/gcc/testsuite/gcc.dg/dll-2.c b/gcc/testsuite/gcc.dg/dll-2.c
index c55e920..bf91707 100644
--- a/gcc/testsuite/gcc.dg/dll-2.c
+++ b/gcc/testsuite/gcc.dg/dll-2.c
@@ -1,5 +1,5 @@
 /* These dllimport and dllexport appearing for a symbol.
-   The desired behaviour is that if both dllimport
+   The desired behavior is that if both dllimport
    and dllexport appear (in either order) the result is dllexport.
 
    Microsoft's MSVC 2.0 allows dllimport followed by dllexport for variables,
diff --git a/gcc/testsuite/gcc.dg/format/c90-printf-1.c b/gcc/testsuite/gcc.dg/format/c90-printf-1.c
index da7bb52..e4c18f7 100644
--- a/gcc/testsuite/gcc.dg/format/c90-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c90-printf-1.c
@@ -1,6 +1,6 @@
 /* Test for printf formats.  Formats using C90 features, including cases
    where C90 specifies some aspect of the format to be ignored or where
-   the behaviour is undefined.
+   the behavior is undefined.
 */
 /* Origin: Joseph Myers <jsm28@cam.ac.uk> */
 /* { dg-do compile } */
@@ -203,14 +203,14 @@ foo (int i, int i1, int i2, unsigned int u, double d, char *s, void *p,
   printf ("%p%p%p%p", s, ss, us, css);
   /* %s allows any character type.  */
   printf ("%s%s%s%s", s, ss, us, css);
-  /* Warning for void * arguments for %s is GCC's historical behaviour,
+  /* Warning for void * arguments for %s is GCC's historical behavior,
      and seems useful to keep, even if some standard versions might be
      read to permit it.
   */
   printf ("%s", p); /* { dg-warning "format" "bad argument types" } */
-  /* The historical behaviour is to allow signed / unsigned types
+  /* The historical behavior is to allow signed / unsigned types
      interchangably as arguments.  For values representable in both types,
-     such usage may be correct.  For now preserve the behaviour of GCC
+     such usage may be correct.  For now preserve the behavior of GCC
      in such cases.
   */
   printf ("%d", u);
diff --git a/gcc/testsuite/gcc.dg/format/c90-scanf-1.c b/gcc/testsuite/gcc.dg/format/c90-scanf-1.c
index 813b79d..ea42f1e 100644
--- a/gcc/testsuite/gcc.dg/format/c90-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c90-scanf-1.c
@@ -1,6 +1,6 @@
 /* Test for scanf formats.  Formats using C90 features, including cases
    where C90 specifies some aspect of the format to be ignored or where
-   the behaviour is undefined.
+   the behavior is undefined.
 */
 /* Origin: Joseph Myers <jsm28@cam.ac.uk> */
 /* { dg-do compile } */
diff --git a/gcc/testsuite/gcc.dg/format/c99-printf-1.c b/gcc/testsuite/gcc.dg/format/c99-printf-1.c
index e99015c..729e41c 100644
--- a/gcc/testsuite/gcc.dg/format/c99-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c99-printf-1.c
@@ -1,6 +1,6 @@
 /* Test for printf formats.  Formats using C99 features, including cases
    where C99 specifies some aspect of the format to be ignored or where
-   the behaviour is undefined.
+   the behavior is undefined.
 */
 /* Origin: Joseph Myers <jsm28@cam.ac.uk> */
 /* { dg-do compile } */
diff --git a/gcc/testsuite/gcc.dg/format/c99-scanf-1.c b/gcc/testsuite/gcc.dg/format/c99-scanf-1.c
index 7910ece..7a8b3e2 100644
--- a/gcc/testsuite/gcc.dg/format/c99-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c99-scanf-1.c
@@ -1,6 +1,6 @@
 /* Test for scanf formats.  Formats using C99 features, including cases
    where C99 specifies some aspect of the format to be ignored or where
-   the behaviour is undefined.
+   the behavior is undefined.
 */
 /* Origin: Joseph Myers <jsm28@cam.ac.uk> */
 /* { dg-do compile } */
diff --git a/gcc/testsuite/gcc.dg/wtr-union-init-1.c b/gcc/testsuite/gcc.dg/wtr-union-init-1.c
index 1886981..b6a814d 100644
--- a/gcc/testsuite/gcc.dg/wtr-union-init-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-union-init-1.c
@@ -13,7 +13,7 @@ union foo
 void
 testfunc ()
 {
-  /* Note we only warn for non-zero initializers.  */
+  /* Note we only warn for nonzero initializers.  */
   static union foo f1 = { 0 };
   static union foo f2 = { 1 }; /* { dg-warning "traditional C rejects initialization of unions" "initialization of unions" } */
 
diff --git a/gcc/testsuite/gcc.dg/wtr-union-init-2.c b/gcc/testsuite/gcc.dg/wtr-union-init-2.c
index 3112ba27..bea26f1 100644
--- a/gcc/testsuite/gcc.dg/wtr-union-init-2.c
+++ b/gcc/testsuite/gcc.dg/wtr-union-init-2.c
@@ -21,7 +21,7 @@ union foo2
 void
 testfunc ()
 {
-  /* Note we only warn for non-zero initializers.  */
+  /* Note we only warn for nonzero initializers.  */
   static union foo1 f1 = {0};
   static union foo2 f2 = {0};
   static union foo1 f3 = {1}; /* { dg-warning "traditional C rejects initialization of unions" "initialization of unions" } */
diff --git a/gcc/testsuite/gcc.dg/wtr-union-init-3.c b/gcc/testsuite/gcc.dg/wtr-union-init-3.c
index bb8e300..407554a 100644
--- a/gcc/testsuite/gcc.dg/wtr-union-init-3.c
+++ b/gcc/testsuite/gcc.dg/wtr-union-init-3.c
@@ -40,7 +40,7 @@ struct baz2
 void
 testfunc ()
 {
-  /* Note we only warn for non-zero initializers.  Xfail on substructures. */
+  /* Note we only warn for nonzero initializers.  Xfail on substructures. */
   static union foo f1 = {{0,0}}; /* { dg-bogus "traditional C rejects initialization of unions" "initialization of unions" { xfail *-*-* } } */
   static union foo f2 = {{1,1}}; /* { dg-warning "traditional C rejects initialization of unions" "initialization of unions" } */
 
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-8.c b/gcc/testsuite/gcc.misc-tests/gcov-8.c
index 58eec64..4c95b3d 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-8.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-8.c
@@ -1,4 +1,4 @@
-/* Check that gcov correctly rounds nearly zero to non-zero and nearly
+/* Check that gcov correctly rounds nearly zero to nonzero and nearly
    100 to not-100.
 
    Copyright (C) 2002 Free Software Foundation, Inc.
diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp
index ca62c67..57d79e9 100644
--- a/gcc/testsuite/lib/profopt.exp
+++ b/gcc/testsuite/lib/profopt.exp
@@ -27,7 +27,7 @@
 # addition to the profiling and feedback options.
 
 # If perf_ext is defined and the performance value for the
-# profile-directed test run is non-zero then the performance check will
+# profile-directed test run is nonzero then the performance check will
 # be done.
 
 global PROFOPT_OPTIONS perf_delta