* config/vax/vax.h (MASK_UNIX_ASM, MASK_VAXC_ALIGNMENT)

(MASK_G_FLOAT): Define.
(TARGET_UNIX_ASM, TARGET_VAXC_ALIGNMENT, TARGET_G_FLOAT): Use them.
(TARGET_SWITCHES): Likewise.
(TARGET_DEFAULT): Likewise.

From-SVN: r54561

gcc/ChangeLog

+2002-06-12  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config/vax/vax.h (MASK_UNIX_ASM, MASK_VAXC_ALIGNMENT)
+	(MASK_G_FLOAT): Define. 
+	(TARGET_UNIX_ASM, TARGET_VAXC_ALIGNMENT, TARGET_G_FLOAT): Use them.
+	(TARGET_SWITCHES): Likewise.
+	(TARGET_DEFAULT): Likewise.
+
 2002-06-12  Daniel Jacobowitz  <drow@mvista.com>
 
 	* config/mips/elf.h (DWARF2_DEBUG_INFO): Define.

gcc/config/vax/vax.h

@@ -62,16 +62,21 @@ Boston, MA 02111-1307, USA.  */
 
 extern int target_flags;
 
+#define MASK_UNIX_ASM		1
+#define MASK_VAXC_ALIGNMENT	2
+#define MASK_G_FLOAT		4
+
+
 /* Macros used in the machine description to test the flags.  */
 
 /* Nonzero if compiling code that Unix assembler can assemble.  */
-#define TARGET_UNIX_ASM (target_flags & 1)
+#define TARGET_UNIX_ASM (target_flags & MASK_UNIX_ASM)
 
 /* Nonzero if compiling with VAX-11 "C" style structure alignment */
-#define	TARGET_VAXC_ALIGNMENT (target_flags & 2)
+#define	TARGET_VAXC_ALIGNMENT (target_flags & MASK_VAXC_ALIGNMENT)
 
 /* Nonzero if compiling with `G'-format floating point */
-#define TARGET_G_FLOAT (target_flags & 4)
+#define TARGET_G_FLOAT (target_flags & MASK_G_FLOAT)
 
 /* Macro to define tables used to set the flags.
    This is a list in braces of pairs in braces,
@@ -80,19 +85,26 @@ extern int target_flags;
    An empty string NAME is used to identify the default VALUE.  */
 
 #define TARGET_SWITCHES						\
-  { {"unix", 1, "Generate code for UNIX assembler"},  		\
-    {"gnu", -1, "Generate code for GNU assembler (gas)"},  	\
-    {"vaxc-alignment", 2, "Use VAXC structure conventions"}, 	\
-    {"g", 4, "Generate GFLOAT double precision code"},		\
-    {"g-float", 4, "Generate GFLOAT double precision code"},	\
-    {"d", -4, "Generate DFLOAT double precision code"},		\
-    {"d-float", -4, "Generate DFLOAT double precision code"},	\
+  { {"unix", MASK_UNIX_ASM,					\
+     "Generate code for UNIX assembler"},  			\
+    {"gnu", -MASK_UNIX_ASM,					\
+     "Generate code for GNU assembler (gas)"},  		\
+    {"vaxc-alignment", MASK_VAXC_ALIGNMENT,			\
+     "Use VAXC structure conventions"}, 			\
+    {"g", MASK_G_FLOAT,						\
+     "Generate GFLOAT double precision code"},			\
+    {"g-float", MASK_G_FLOAT,					\
+     "Generate GFLOAT double precision code"},			\
+    {"d", -MASK_G_FLOAT,					\
+     "Generate DFLOAT double precision code"},			\
+    {"d-float", -MASK_G_FLOAT,					\
+     "Generate DFLOAT double precision code"},			\
     { "", TARGET_DEFAULT, 0}}
 
 /* Default target_flags if no switches specified.  */
 
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 1
+#define TARGET_DEFAULT (MASK_UNIX_ASM)
 #endif
 
 /* Target machine storage layout */