* combine.c, config.gcc, cse.c, defaults.h, real.c, reload.c,

	simplify-rtx.c, config/alpha/alpha.h, config/avr/avr.h,
	config/convex/convex.h, config/d30v/d30v.c,
	config/d30v/d30v.h, config/dsp16xx/dsp16xx.h,
	config/elxsi/elxsi.h, config/fr30/fr30.h, config/m88k/m88k.c,
	config/mips/mips.h, config/mn10200/mn10200.h,
	config/mn10300/mn10300.h, config/pdp11/pdp11.md,
	config/v850/v850.h, config/vax/openbsd.h,
	config/vax/openbsd1.h, config/vax/ultrix.h,
	config/vax/vax-protos.h, config/vax/vax.c, config/vax/vax.h,
	config/vax/vax.md, config/vax/vaxv.h, config/vax/xm-vms.h,
	cp/decl2.c, doc/contrib.texi, doc/cpp.texi, doc/gcc.texi,
	doc/install.texi, doc/invoke.texi, doc/md.texi, doc/rtl.texi,
	doc/tm.texi: consistently use "VAX", "VAXen", and "MicroVAX"
        in comments and documentation.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44589 138bc75d-0d04-0410-961f-82ee72b054a4

23 files changed, 79 insertions, 79 deletions

diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 47cc003b662..9a724edd2cf 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -2097,7 +2097,7 @@ literal_section ()						\
 	      fprintf (asm_out_file, "\\%o", c);			      \
 	      /* After an octal-escape, if a digit follows,		      \
 		 terminate one string constant and start another.	      \
-		 The Vax assembler fails to stop reading the escape	      \
+		 The VAX assembler fails to stop reading the escape	      \
 		 after three digits, so this is the only way we		      \
 		 can get it to parse the data properly.  */		      \
 	      if (i < thissize - 1					      \
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 6ebb93ce70f..dfb588231ec 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -1132,7 +1132,7 @@ enum reg_class {
    argument popping will always be the responsibility of the calling
    function.
 
-   On the Vax, all functions always pop their arguments, so the
+   On the VAX, all functions always pop their arguments, so the
    definition of this macro is STACK-SIZE.  On the 68000, using the
    standard calling convention, no functions pop their arguments, so
    the value of the macro is always 0 in this case.  But an
@@ -1157,7 +1157,7 @@ enum reg_class {
    hard register in which to pass the argument, or zero to pass the
    argument on the stack.
 
-   For machines like the Vax and 68000, where normally all arguments
+   For machines like the VAX and 68000, where normally all arguments
    are pushed, zero suffices as a definition.
 
    The value of the expression can also be a `parallel' RTX.  This is
diff --git a/gcc/config/convex/convex.h b/gcc/config/convex/convex.h
index 88bb2b115ca..c0615e41ace 100644
--- a/gcc/config/convex/convex.h
+++ b/gcc/config/convex/convex.h
@@ -1144,11 +1144,11 @@ enum reg_class {
     }									\
 }
 
-/* Convex uses Vax or IEEE floats.
+/* Convex uses VAX or IEEE floats.
    Follow the host format. */
 #define TARGET_FLOAT_FORMAT HOST_FLOAT_FORMAT
 
-/* But must prevent real.c from constructing Vax dfloats */
+/* But must prevent real.c from constructing VAX dfloats */
 #define REAL_VALUE_ATOF(X,S) atof (X)
 
 /* Check a `double' value for validity for a particular machine mode.  */
diff --git a/gcc/config/d30v/d30v.c b/gcc/config/d30v/d30v.c
index b0709e82f86..cf5918fe9f9 100644
--- a/gcc/config/d30v/d30v.c
+++ b/gcc/config/d30v/d30v.c
@@ -1966,7 +1966,7 @@ d30v_function_arg_boundary (mode, type)
    register in which to pass the argument, or zero to pass the argument on the
    stack.
 
-   For machines like the Vax and 68000, where normally all arguments are
+   For machines like the VAX and 68000, where normally all arguments are
    pushed, zero suffices as a definition.
 
    The usual way to make the ANSI library `stdarg.h' work on a machine where
diff --git a/gcc/config/d30v/d30v.h b/gcc/config/d30v/d30v.h
index ba874d8ce41..5e0f0b0a02b 100644
--- a/gcc/config/d30v/d30v.h
+++ b/gcc/config/d30v/d30v.h
@@ -869,7 +869,7 @@ do {									\
         there is no need to define this macro when the format is IEEE.
 
    VAX_FLOAT_FORMAT'
-        This code indicates the peculiar format used on the Vax.
+        This code indicates the peculiar format used on the VAX.
 
    UNKNOWN_FLOAT_FORMAT'
         This code indicates any other format.
@@ -2290,7 +2290,7 @@ typedef struct d30v_stack {
    variable number of bytes is passed, it is zero, and argument popping will
    always be the responsibility of the calling function.
 
-   On the Vax, all functions always pop their arguments, so the definition of
+   On the VAX, all functions always pop their arguments, so the definition of
    this macro is STACK-SIZE.  On the 68000, using the standard calling
    convention, no functions pop their arguments, so the value of the macro is
    always 0 in this case.  But an alternative calling convention is available
@@ -2317,7 +2317,7 @@ typedef struct d30v_stack {
    register in which to pass the argument, or zero to pass the argument on the
    stack.
 
-   For machines like the Vax and 68000, where normally all arguments are
+   For machines like the VAX and 68000, where normally all arguments are
    pushed, zero suffices as a definition.
 
    The usual way to make the ANSI library `stdarg.h' work on a machine where
diff --git a/gcc/config/dsp16xx/dsp16xx.h b/gcc/config/dsp16xx/dsp16xx.h
index 1910e1db6ae..f98d6789d24 100644
--- a/gcc/config/dsp16xx/dsp16xx.h
+++ b/gcc/config/dsp16xx/dsp16xx.h
@@ -1643,7 +1643,7 @@ const_section ()                                                   \
 	      fprintf (asm_out_file, "%d", c);			              \
 	      /* After an octal-escape, if a digit follows,		      \
 		 terminate one string constant and start another.	      \
-		 The Vax assembler fails to stop reading the escape	      \
+		 The VAX assembler fails to stop reading the escape	      \
 		 after three digits, so this is the only way we		      \
 		 can get it to parse the data properly.  		      \
 	      if (i < thissize - 1					      \
diff --git a/gcc/config/elxsi/elxsi.h b/gcc/config/elxsi/elxsi.h
index dacefd4c1d1..8d138238191 100644
--- a/gcc/config/elxsi/elxsi.h
+++ b/gcc/config/elxsi/elxsi.h
@@ -62,7 +62,7 @@ extern int target_flags;
 
 /* Define this if most significant bit is lowest numbered
    in instructions that operate on numbered bit-fields.
-   This is not true on the vax.  */
+   This is not true on the VAX.  */
 #define BITS_BIG_ENDIAN 0
 
 /* Define this if most significant byte of a word is the lowest numbered.  */
@@ -151,7 +151,7 @@ extern int target_flags;
    to hold something of mode MODE.
    This is ordinarily the length in words of a value of mode MODE
    but can be less for certain modes in special long registers.
-   On the vax, all registers are one word long.  */
+   On the VAX, all registers are one word long.  */
 #define HARD_REGNO_NREGS(REGNO, MODE)   \
  ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
 
@@ -219,7 +219,7 @@ extern int target_flags;
    For any two classes, it is very desirable that there be another
    class that represents their union.  */
    
-/* The vax has only one kind of registers, so NO_REGS and ALL_REGS
+/* The VAX has only one kind of registers, so NO_REGS and ALL_REGS
    are the only classes.  */
 
 enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
@@ -276,7 +276,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
 
 /* Return the maximum number of consecutive registers
    needed to represent mode MODE in a register of class CLASS.  */
-/* On the vax, this is always the size of MODE in words,
+/* On the VAX, this is always the size of MODE in words,
    since all registers are the same size.  */
 #define CLASS_MAX_NREGS(CLASS, MODE)	\
  ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
@@ -308,7 +308,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
    FUNTYPE is the data type of the function (as a tree),
    or for a library call it is an identifier node for the subroutine name.
 
-   On the Vax, the RET insn always pops all the args for any function.  */
+   On the VAX, the RET insn always pops all the args for any function.  */
 
 #define RETURN_POPS_ARGS(FUNDECL,FUNTYPE,SIZE) (SIZE)
 
@@ -317,7 +317,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
    If the precise function being called is known, FUNC is its FUNCTION_DECL;
    otherwise, FUNC is 0.  */
 
-/* On the Vax the return value is in R0 regardless.  */   
+/* On the VAX the return value is in R0 regardless.  */   
 
 #define FUNCTION_VALUE(VALTYPE, FUNC)  \
   gen_rtx_REG (TYPE_MODE (VALTYPE), 0)
@@ -325,7 +325,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
 /* Define how to find the value returned by a library function
    assuming the value has mode MODE.  */
 
-/* On the Vax the return value is in R0 regardless.  */   
+/* On the VAX the return value is in R0 regardless.  */   
 
 #define LIBCALL_VALUE(MODE)  gen_rtx_REG (MODE, 0)
 
@@ -335,12 +335,12 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
 #define PCC_STATIC_STRUCT_RETURN
 
 /* 1 if N is a possible register number for a function value.
-   On the Vax, R0 is the only register thus used.  */
+   On the VAX, R0 is the only register thus used.  */
 
 #define FUNCTION_VALUE_REGNO_P(N) ((N) == 0)
 
 /* 1 if N is a possible register number for function argument passing.
-   On the Vax, no registers are used in this way.  */
+   On the VAX, no registers are used in this way.  */
 
 #define FUNCTION_ARG_REGNO_P(N) 0
 
@@ -350,7 +350,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
    and about the args processed so far, enough to enable macros
    such as FUNCTION_ARG to determine where the next arg should go.
 
-   On the vax, this is a single integer, which is a number of bytes
+   On the VAX, this is a single integer, which is a number of bytes
    of arguments scanned so far.  */
 
 #define CUMULATIVE_ARGS int
@@ -359,7 +359,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
    for a call to a function whose data type is FNTYPE.
    For a library call, FNTYPE is 0.
 
-   On the vax, the offset starts at 0.  */
+   On the VAX, the offset starts at 0.  */
 
 #define INIT_CUMULATIVE_ARGS(CUM,FNTYPE,x,INDIRECT)	\
  ((CUM) = 0)
@@ -386,7 +386,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
    NAMED is nonzero if this argument is a named parameter
     (otherwise it is an extra parameter matching an ellipsis).  */
 
-/* On the vax all args are pushed.  */   
+/* On the VAX all args are pushed.  */   
 
 #define FUNCTION_ARG(CUM, MODE, TYPE, NAMED) 0
 
@@ -545,7 +545,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
    It is always safe for this macro to do nothing.  It exists to recognize
    opportunities to optimize the output.
 
-   For the vax, nothing needs to be done.  */
+   For the VAX, nothing needs to be done.  */
 
 #define LEGITIMIZE_ADDRESS(X,OLDX,MODE,WIN)  {}
 
@@ -634,7 +634,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
 /* Tell final.c how to eliminate redundant test instructions.  */
 
 /* Here we define machine-dependent flags and fields in cc_status
-   (see `conditions.h').  No extra ones are needed for the vax.  */
+   (see `conditions.h').  No extra ones are needed for the VAX.  */
 
 /* Store in cc_status the expressions
    that the condition codes will describe
@@ -687,7 +687,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
 /* #define DBX_DEBUGGING_INFO */
 
 /* How to renumber registers for dbx and gdb.
-   Vax needs no change in the numeration.  */
+   VAX needs no change in the numeration.  */
 
 #define DBX_REGISTER_NUMBER(REGNO) (REGNO)
 
@@ -807,7 +807,7 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES };
   fprintf (FILE, "\tld.32\t%s,[.sp]\n\taddi.64\t4,.sp\n", reg_names[REGNO])
 
 /* This is how to output an element of a case-vector that is absolute.
-   (The Vax does not use such vectors,
+   (The VAX does not use such vectors,
    but we must define this macro anyway.)  */
 
 #define ASM_OUTPUT_ADDR_VEC_ELT(FILE, VALUE)  \
diff --git a/gcc/config/fr30/fr30.h b/gcc/config/fr30/fr30.h
index 9f41a55263e..57d56613ee4 100644
--- a/gcc/config/fr30/fr30.h
+++ b/gcc/config/fr30/fr30.h
@@ -297,7 +297,7 @@ extern int target_flags;
         there is no need to define this macro when the format is IEEE.
 
    VAX_FLOAT_FORMAT'
-        This code indicates the peculiar format used on the Vax.
+        This code indicates the peculiar format used on the VAX.
 
    UNKNOWN_FLOAT_FORMAT'
         This code indicates any other format.
@@ -842,7 +842,7 @@ enum reg_class
    variable number of bytes is passed, it is zero, and argument popping will
    always be the responsibility of the calling function.
 
-   On the Vax, all functions always pop their arguments, so the definition of
+   On the VAX, all functions always pop their arguments, so the definition of
    this macro is STACK-SIZE.  On the 68000, using the standard calling
    convention, no functions pop their arguments, so the value of the macro is
    always 0 in this case.  But an alternative calling convention is available
diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c
index 9ac034919c4..4ece2d6052e 100644
--- a/gcc/config/m88k/m88k.c
+++ b/gcc/config/m88k/m88k.c
@@ -1653,7 +1653,7 @@ output_ascii (file, opcode, max, p, size)
 	}
       else if (in_escape && c >= '0' && c <= '9')
 	{
-	  /* If a digit follows an octal-escape, the Vax assembler fails
+	  /* If a digit follows an octal-escape, the VAX assembler fails
 	     to stop reading the escape after three digits.  Continue to
 	     output the values as an octal-escape until a non-digit is
 	     found.  */
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index e87177f6239..0d47c087b66 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -2314,7 +2314,7 @@ extern struct mips_frame_info current_frame_info;
 
 /* If we generate an insn to push BYTES bytes,
    this says how many the stack pointer really advances by.
-   On the vax, sp@- in a byte insn really pushes a word.  */
+   On the VAX, sp@- in a byte insn really pushes a word.  */
 
 /* #define PUSH_ROUNDING(BYTES) 0 */
 
diff --git a/gcc/config/mn10200/mn10200.h b/gcc/config/mn10200/mn10200.h
index 997f1aabcc1..10b76f16cbe 100644
--- a/gcc/config/mn10200/mn10200.h
+++ b/gcc/config/mn10200/mn10200.h
@@ -726,7 +726,7 @@ struct cum_arg { int nbytes; };
 /* Tell final.c how to eliminate redundant test instructions.  */
 
 /* Here we define machine-dependent flags and fields in cc_status
-   (see `conditions.h').  No extra ones are needed for the vax.  */
+   (see `conditions.h').  No extra ones are needed for the VAX.  */
 
 /* Store in cc_status the expressions
    that the condition codes will describe
diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index 143f3bf771c..7835c0f0893 100644
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -793,7 +793,7 @@ struct cum_arg {int nbytes; };
 /* Tell final.c how to eliminate redundant test instructions.  */
 
 /* Here we define machine-dependent flags and fields in cc_status
-   (see `conditions.h').  No extra ones are needed for the vax.  */
+   (see `conditions.h').  No extra ones are needed for the VAX.  */
 
 /* Store in cc_status the expressions
    that the condition codes will describe
diff --git a/gcc/config/pdp11/pdp11.md b/gcc/config/pdp11/pdp11.md
index 98a10c01e48..bbc2b9bf74d 100644
--- a/gcc/config/pdp11/pdp11.md
+++ b/gcc/config/pdp11/pdp11.md
@@ -1148,7 +1148,7 @@
   [(set_attr "length" "1,2,2,3")])
 
 ;;;;- and instructions
-;; Bit-and on the pdp (like on the vax) is done with a clear-bits insn.
+;; Bit-and on the pdp (like on the VAX) is done with a clear-bits insn.
 (define_expand "andsi3"
   [(set (match_operand:SI 0 "general_operand" "=g")
 	(and:SI (match_operand:SI 1 "general_operand" "0")
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index fae5c16e20f..ae7098ad244 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -975,7 +975,7 @@ do {									\
 /* Tell final.c how to eliminate redundant test instructions.  */
 
 /* Here we define machine-dependent flags and fields in cc_status
-   (see `conditions.h').  No extra ones are needed for the vax.  */
+   (see `conditions.h').  No extra ones are needed for the VAX.  */
 
 /* Store in cc_status the expressions
    that the condition codes will describe
diff --git a/gcc/config/vax/openbsd.h b/gcc/config/vax/openbsd.h
index 777ae33d08c..84f4c8e4bc4 100644
--- a/gcc/config/vax/openbsd.h
+++ b/gcc/config/vax/openbsd.h
@@ -1,4 +1,4 @@
-/* Configuration fragment for a vax OpenBSD target.
+/* Configuration fragment for a VAX OpenBSD target.
    Copyright (C) 2000 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -18,7 +18,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Amend common OpenBSD definitions for vax target.  */
+/* Amend common OpenBSD definitions for VAX target.  */
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__unix__ -D__vax__ -D__OpenBSD__ -Asystem=unix -Asystem=OpenBSD -Acpu=vax -Amachine=vax"
diff --git a/gcc/config/vax/openbsd1.h b/gcc/config/vax/openbsd1.h
index ad687d1c9a4..3a72ef88049 100644
--- a/gcc/config/vax/openbsd1.h
+++ b/gcc/config/vax/openbsd1.h
@@ -1,4 +1,4 @@
-/* Configuration fragment for a vax OpenBSD target.
+/* Configuration fragment for a VAX OpenBSD target.
    Copyright (C) 2000 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
diff --git a/gcc/config/vax/ultrix.h b/gcc/config/vax/ultrix.h
index 9cc8bd61943..0be135c4c4d 100644
--- a/gcc/config/vax/ultrix.h
+++ b/gcc/config/vax/ultrix.h
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_PREDEFINES " -Dvax -Dunix -Dultrix -Dbsd4_2 -D__vax -D__unix -D__ultrix -D__bsd4_2 -Asystem=unix -Asystem=bsd -Acpu=vax -Amachine=vax"
 
 /* These are as defined in /usr/include/sys/stdtypes.h.
-   These values are for ultrix 4.2 on the vax.  */
+   These values are for ultrix 4.2 on the VAX.  */
 #define SIZE_TYPE "unsigned int"
 #define PTRDIFF_TYPE "int"
 #define WCHAR_TYPE "unsigned int"
diff --git a/gcc/config/vax/vax-protos.h b/gcc/config/vax/vax-protos.h
index f770871957f..a1498381001 100644
--- a/gcc/config/vax/vax-protos.h
+++ b/gcc/config/vax/vax-protos.h
@@ -1,4 +1,4 @@
-/* Definitions of target machine for GNU compiler.  Vax version.
+/* Definitions of target machine for GNU compiler.  VAX version.
    Copyright (C) 2000 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index bfb1cdf22fb..e8a13dcb7f4 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -1,4 +1,4 @@
-/* Subroutines for insn-output.c for Vax.
+/* Subroutines for insn-output.c for VAX.
    Copyright (C) 1987, 1994, 1995, 1997, 1998, 1999, 2000
    Free Software Foundation, Inc.
 
diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h
index 286822eb06b..903e627840a 100644
--- a/gcc/config/vax/vax.h
+++ b/gcc/config/vax/vax.h
@@ -1,4 +1,4 @@
-/* Definitions of target machine for GNU compiler.  Vax version.
+/* Definitions of target machine for GNU compiler.  VAX version.
    Copyright (C) 1987, 1988, 1991, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -95,16 +95,16 @@ extern int target_flags;
 
 /* Define this if most significant bit is lowest numbered
    in instructions that operate on numbered bit-fields.
-   This is not true on the vax.  */
+   This is not true on the VAX.  */
 #define BITS_BIG_ENDIAN 0
 
 /* Define this if most significant byte of a word is the lowest numbered.  */
-/* That is not true on the vax.  */
+/* That is not true on the VAX.  */
 #define BYTES_BIG_ENDIAN 0
 
 /* Define this if most significant word of a multiword number is the lowest
    numbered.  */
-/* This is not true on the vax.  */
+/* This is not true on the VAX.  */
 #define WORDS_BIG_ENDIAN 0
 
 /* Number of bits in an addressable storage unit */
@@ -166,7 +166,7 @@ extern int target_flags;
 
 /* 1 for registers that have pervasive standard uses
    and are not available for the register allocator.
-   On the vax, these are the AP, FP, SP and PC.  */
+   On the VAX, these are the AP, FP, SP and PC.  */
 #define FIXED_REGISTERS {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1}
 
 /* 1 for registers not available across function calls.
@@ -181,12 +181,12 @@ extern int target_flags;
    to hold something of mode MODE.
    This is ordinarily the length in words of a value of mode MODE
    but can be less for certain modes in special long registers.
-   On the vax, all registers are one word long.  */
+   On the VAX, all registers are one word long.  */
 #define HARD_REGNO_NREGS(REGNO, MODE)   \
  ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
 
 /* Value is 1 if hard register REGNO can hold a value of machine-mode MODE.
-   On the vax, all registers can hold all modes.  */
+   On the VAX, all registers can hold all modes.  */
 #define HARD_REGNO_MODE_OK(REGNO, MODE) 1
 
 /* Value is 1 if it is a good idea to tie two pseudo registers
@@ -198,7 +198,7 @@ extern int target_flags;
 /* Specify the registers used for certain standard purposes.
    The values of these macros are register numbers.  */
 
-/* Vax pc is overloaded on a register.  */
+/* VAX pc is overloaded on a register.  */
 #define PC_REGNUM 15
 
 /* Register to use for pushing function arguments.  */
@@ -243,7 +243,7 @@ extern int target_flags;
    For any two classes, it is very desirable that there be another
    class that represents their union.  */
    
-/* The vax has only one kind of registers, so NO_REGS and ALL_REGS
+/* The VAX has only one kind of registers, so NO_REGS and ALL_REGS
    are the only classes.  */
 
 enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
@@ -323,7 +323,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 
 /* Return the maximum number of consecutive registers
    needed to represent mode MODE in a register of class CLASS.  */
-/* On the vax, this is always the size of MODE in words,
+/* On the VAX, this is always the size of MODE in words,
    since all registers are the same size.  */
 #define CLASS_MAX_NREGS(CLASS, MODE)	\
  ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
@@ -357,7 +357,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 
 /* If we generate an insn to push BYTES bytes,
    this says how many the stack pointer really advances by.
-   On the vax, -(sp) pushes only the bytes of the operands.  */
+   On the VAX, -(sp) pushes only the bytes of the operands.  */
 #define PUSH_ROUNDING(BYTES) (BYTES)
 
 /* Offset of first parameter from the argument pointer register value.  */
@@ -370,7 +370,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
    or for a library call it is an identifier node for the subroutine name.
    SIZE is the number of bytes of arguments passed on the stack.
 
-   On the Vax, the RET insn pops a maximum of 255 args for any function.  */
+   On the VAX, the RET insn pops a maximum of 255 args for any function.  */
 
 #define RETURN_POPS_ARGS(FUNDECL,FUNTYPE,SIZE) \
   ((SIZE) > 255*4 ? 0 : (SIZE))
@@ -380,7 +380,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
    If the precise function being called is known, FUNC is its FUNCTION_DECL;
    otherwise, FUNC is 0.  */
 
-/* On the Vax the return value is in R0 regardless.  */   
+/* On the VAX the return value is in R0 regardless.  */   
 
 #define FUNCTION_VALUE(VALTYPE, FUNC)  \
   gen_rtx_REG (TYPE_MODE (VALTYPE), 0)
@@ -388,7 +388,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 /* Define how to find the value returned by a library function
    assuming the value has mode MODE.  */
 
-/* On the Vax the return value is in R0 regardless.  */   
+/* On the VAX the return value is in R0 regardless.  */   
 
 #define LIBCALL_VALUE(MODE)  gen_rtx_REG (MODE, 0)
 
@@ -398,12 +398,12 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 #define PCC_STATIC_STRUCT_RETURN
 
 /* 1 if N is a possible register number for a function value.
-   On the Vax, R0 is the only register thus used.  */
+   On the VAX, R0 is the only register thus used.  */
 
 #define FUNCTION_VALUE_REGNO_P(N) ((N) == 0)
 
 /* 1 if N is a possible register number for function argument passing.
-   On the Vax, no registers are used in this way.  */
+   On the VAX, no registers are used in this way.  */
 
 #define FUNCTION_ARG_REGNO_P(N) 0
 
@@ -413,7 +413,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
    and about the args processed so far, enough to enable macros
    such as FUNCTION_ARG to determine where the next arg should go.
 
-   On the vax, this is a single integer, which is a number of bytes
+   On the VAX, this is a single integer, which is a number of bytes
    of arguments scanned so far.  */
 
 #define CUMULATIVE_ARGS int
@@ -422,7 +422,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
    for a call to a function whose data type is FNTYPE.
    For a library call, FNTYPE is 0.
 
-   On the vax, the offset starts at 0.  */
+   On the VAX, the offset starts at 0.  */
 
 #define INIT_CUMULATIVE_ARGS(CUM,FNTYPE,LIBNAME,INDIRECT)	\
  ((CUM) = 0)
@@ -449,7 +449,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
    NAMED is nonzero if this argument is a named parameter
     (otherwise it is an extra parameter matching an ellipsis).  */
 
-/* On the vax all args are pushed.  */   
+/* On the VAX all args are pushed.  */   
 
 #define FUNCTION_ARG(CUM, MODE, TYPE, NAMED) 0
 
@@ -491,7 +491,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
    as of the start of the function body.  This depends on the layout
    of the fixed parts of the stack frame and on how registers are saved.
 
-   On the Vax, FRAME_POINTER_REQUIRED is always 1, so the definition of this
+   On the VAX, FRAME_POINTER_REQUIRED is always 1, so the definition of this
    macro doesn't matter.  But it must be defined.  */
 
 #define INITIAL_FRAME_POINTER_OFFSET(DEPTH) (DEPTH) = 0;
@@ -499,7 +499,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 /* Output assembler code for a block containing the constant parts
    of a trampoline, leaving space for the variable parts.  */
 
-/* On the vax, the trampoline contains an entry mask and two instructions:
+/* On the VAX, the trampoline contains an entry mask and two instructions:
      .word NN
      movl $STATIC,r0   (store the functions static chain)
      jmp  *$FUNCTION   (jump to function code at address FUNCTION)  */
@@ -767,7 +767,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
    It is always safe for this macro to do nothing.  It exists to recognize
    opportunities to optimize the output.
 
-   For the vax, nothing needs to be done.  */
+   For the VAX, nothing needs to be done.  */
 
 #define LEGITIMIZE_ADDRESS(X,OLDX,MODE,WIN)  {}
 
@@ -835,7 +835,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 #define TRULY_NOOP_TRUNCATION(OUTPREC, INPREC) 1
 
 /* When a prototype says `char' or `short', really pass an `int'.
-   (On the vax, this is required for system-library compatibility.)  */
+   (On the VAX, this is required for system-library compatibility.)  */
 #define PROMOTE_PROTOTYPES 1
 
 /* Specify the machine mode that pointers have.
@@ -942,7 +942,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 /* Tell final.c how to eliminate redundant test instructions.  */
 
 /* Here we define machine-dependent flags and fields in cc_status
-   (see `conditions.h').  No extra ones are needed for the vax.  */
+   (see `conditions.h').  No extra ones are needed for the VAX.  */
 
 /* Store in cc_status the expressions
    that the condition codes will describe
@@ -1056,7 +1056,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 #define DBX_DEBUGGING_INFO
 
 /* How to renumber registers for dbx and gdb.
-   Vax needs no change in the numeration.  */
+   VAX needs no change in the numeration.  */
 
 #define DBX_REGISTER_NUMBER(REGNO) (REGNO)
 
@@ -1077,7 +1077,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 /* Output the .stabs for a C `static' variable in the data section.  */
 #define DBX_STATIC_STAB_DATA_SECTION
 
-/* Vax specific: which type character is used for type double?  */
+/* VAX specific: which type character is used for type double?  */
 
 #define ASM_DOUBLE_CHAR (TARGET_G_FLOAT ? 'g' : 'd')
 
@@ -1165,7 +1165,7 @@ do { char dstr[30];							\
   fprintf (FILE, "\tmovl (sp)+,%s\n", reg_names[REGNO])
 
 /* This is how to output an element of a case-vector that is absolute.
-   (The Vax does not use such vectors,
+   (The VAX does not use such vectors,
    but we must define this macro anyway.)  */
 
 #define ASM_OUTPUT_ADDR_VEC_ELT(FILE, VALUE)  \
@@ -1247,7 +1247,7 @@ VAX operand formatting codes:
    h	the low 16 bits of a negated constant operand
    #	'd' or 'g' depending on whether dfloat or gfloat is used  */
 
-/* The purpose of D is to get around a quirk or bug in vax assembler
+/* The purpose of D is to get around a quirk or bug in VAX assembler
    whereby -1 in a 64-bit immediate operand means 0x00000000ffffffff,
    which is not a 64-bit minus one.  */
 
diff --git a/gcc/config/vax/vax.md b/gcc/config/vax/vax.md
index 182a6edc80d..efff55aa59e 100644
--- a/gcc/config/vax/vax.md
+++ b/gcc/config/vax/vax.md
@@ -1,4 +1,4 @@
-;; Machine description for GNU compiler, Vax Version
+;; Machine description for GNU compiler, VAX Version
 ;; Copyright (C) 1987, 1988, 1991, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 ;; Free Software Foundation, Inc.
 
@@ -122,7 +122,7 @@
   ""
   "bitb %0,%1")
 
-;; The vax has no sCOND insns.  It does have add/subtract with carry
+;; The VAX has no sCOND insns.  It does have add/subtract with carry
 ;; which could be used to implement the sltu and sgeu patterns.  However,
 ;; to do this properly requires a complete rewrite of the compare insns
 ;; to keep them together with the sltu/sgeu insns until after the
@@ -146,7 +146,7 @@
    clrf %0
    movf %1,%0")
 
-;; Some vaxes don't support this instruction.
+;; Some VAXen don't support this instruction.
 ;;(define_insn "movti"
 ;;  [(set (match_operand:TI 0 "general_operand" "=g")
 ;;	(match_operand:TI 1 "general_operand" "g"))]
@@ -161,7 +161,7 @@
    clrq %0
    movq %D1,%0")
 
-;; The VAX move instructions have space-time tradeoffs.  On a microVAX
+;; The VAX move instructions have space-time tradeoffs.  On a MicroVAX
 ;; register-register mov instructions take 3 bytes and 2 CPU cycles.  clrl
 ;; takes 2 bytes and 3 cycles.  mov from constant to register takes 2 cycles
 ;; if the constant is smaller than 4 bytes, 3 cycles for a longword
@@ -525,7 +525,7 @@
    but it not faster on other models.
 
    "movab #(r1),r2" is usually shorter than "addl3 #,r1,r2", and is
-   faster on a VAX 3, but some VAXes (e.g. VAX 9000) will stall if
+   faster on a VAX 3, but some VAXen (e.g. VAX 9000) will stall if
    a register is used in an address too soon after it is set.
    Compromise by using movab only when it is shorter than the add
    or the base register in the address is one of sp, ap, and fp,
@@ -920,7 +920,7 @@
 ;  ""
 ;  "ediv %2,%1,%0,%3")
 
-;; Bit-and on the vax is done with a clear-bits insn.
+;; Bit-and on the VAX is done with a clear-bits insn.
 (define_expand "andsi3"
   [(set (match_operand:SI 0 "general_operand" "=g")
 	(and:SI (not:SI (match_operand:SI 1 "general_operand" "g"))
@@ -1159,7 +1159,7 @@
   ""
   "mcomb %1,%0")
 
-;; Arithmetic right shift on the vax works by negating the shift count,
+;; Arithmetic right shift on the VAX works by negating the shift count,
 ;; then emitting a right shift with the shift count negated.  This means
 ;; that all actual shift counts in the RTL will be positive.  This 
 ;; prevents converting shifts to ZERO_EXTRACTs with negative positions,
@@ -1212,7 +1212,7 @@
   return \"ashl %2,%1,%0\";
 }")
 
-;; Arithmetic right shift on the vax works by negating the shift count.
+;; Arithmetic right shift on the VAX works by negating the shift count.
 (define_expand "ashrdi3"
   [(set (match_operand:DI 0 "general_operand" "=g")
 	(ashiftrt:DI (match_operand:DI 1 "general_operand" "g")
@@ -1257,7 +1257,7 @@
   operands[4] = gen_lowpart (QImode, operands[2]);
 }")
 
-;; Rotate right on the vax works by negating the shift count.
+;; Rotate right on the VAX works by negating the shift count.
 (define_expand "rotrsi3"
   [(set (match_operand:SI 0 "general_operand" "=g")
 	(rotatert:SI (match_operand:SI 1 "general_operand" "g")
diff --git a/gcc/config/vax/vaxv.h b/gcc/config/vax/vaxv.h
index 3d5de76b8bd..fe5c74649bb 100644
--- a/gcc/config/vax/vaxv.h
+++ b/gcc/config/vax/vaxv.h
@@ -1,4 +1,4 @@
-/* Definitions of target machine for GNU compiler.  Vax sysV version.
+/* Definitions of target machine for GNU compiler.  VAX sysV version.
    Copyright (C) 1988, 1993, 1996, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
diff --git a/gcc/config/vax/xm-vms.h b/gcc/config/vax/xm-vms.h
index 8433990523f..ba88d25736f 100644
--- a/gcc/config/vax/xm-vms.h
+++ b/gcc/config/vax/xm-vms.h
@@ -1,4 +1,4 @@
-/* Configuration for GNU C-compiler for Vax.
+/* Configuration for GNU C-compiler for VAX.
    Copyright (C) 1987, 1994, 1995, 1996, 1997, 2001
    Free Software Foundation, Inc.