alpha.h (TARGET_ABI_OSF): New.

        * config/alpha/alpha.h (TARGET_ABI_OSF): New.
        (TARGET_ABI_WINDOWS_NT, TARGET_ABI_OPEN_VMS): Rename; update users.
        * config/alpha/alpha-protos.h: Update TARGET_ABI_* users.
        * config/alpha/alpha.c: Likewise.
        * config/alpha/alpha.md: Likewise.
        * config/alpha/alpha32.h: Likewise.
        * config/alpha/vms.h: Likewise.
        (OPEN_VMS): Remove.

From-SVN: r44016

gcc/ChangeLog

+2001-07-15  Richard Henderson  <rth@redhat.com>
+
+	* config/alpha/alpha.h (TARGET_ABI_OSF): New.
+	(TARGET_ABI_WINDOWS_NT, TARGET_ABI_OPEN_VMS): Rename; update users.
+	* config/alpha/alpha-protos.h: Update TARGET_ABI_* users.
+	* config/alpha/alpha.c: Likewise.
+	* config/alpha/alpha.md: Likewise.
+	* config/alpha/alpha32.h: Likewise.
+	* config/alpha/vms.h: Likewise.
+	(OPEN_VMS): Remove.
+
 2001-07-14  Richard Henderson  <rth@redhat.com>
 
 	* config/alpha/alpha.md: Use define_constants for unspec values.

gcc/config/alpha/alpha-protos.h

@@ -111,7 +111,7 @@ extern int check_float_value PARAMS ((enum machine_mode,
 				     REAL_VALUE_TYPE *, int));
 #endif
 
-#if OPEN_VMS
+#if TARGET_ABI_OPEN_VMS
 #ifdef HAVE_MACHINE_MODES
 extern enum avms_arg_type alpha_arg_type PARAMS ((enum machine_mode));
 #endif
@@ -121,7 +121,7 @@ extern rtx alpha_arg_info_reg_val PARAMS ((CUMULATIVE_ARGS));
 #ifdef BUFSIZ
 extern void alpha_write_linkage PARAMS ((FILE *));
 #endif
-#endif /* OPEN_VMS */
+#endif /* TARGET_ABI_OPEN_VMS */
 
 #ifdef RTX_CODE
 extern rtx alpha_need_linkage PARAMS ((const char *, int));

gcc/config/alpha/alpha.h

@@ -173,12 +173,9 @@ extern enum alpha_fp_trap_mode alpha_fptm;
 #define TARGET_SUPPORT_ARCH	(target_flags & MASK_SUPPORT_ARCH)
 
 /* These are for target os support and cannot be changed at runtime.  */
-#ifndef TARGET_WINDOWS_NT
-#define TARGET_WINDOWS_NT 0
-#endif
-#ifndef TARGET_OPEN_VMS
-#define TARGET_OPEN_VMS 0
-#endif
+#define TARGET_ABI_WINDOWS_NT 0
+#define TARGET_ABI_OPEN_VMS 0
+#define TARGET_ABI_OSF (!TARGET_ABI_WINDOWS_NT && !TARGET_ABI_OPEN_VMS)
 
 #ifndef TARGET_AS_CAN_SUBTRACT_LABELS
 #define TARGET_AS_CAN_SUBTRACT_LABELS TARGET_GAS
@@ -2147,7 +2144,7 @@ literal_section ()						\
 /* This is how to output an element of a case-vector that is relative.  */
 
 #define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, BODY, VALUE, REL) \
-  fprintf (FILE, "\t.%s $L%d\n", TARGET_WINDOWS_NT ? "long" : "gprel32", \
+  fprintf (FILE, "\t.%s $L%d\n", TARGET_ABI_WINDOWS_NT ? "long" : "gprel32", \
 	   (VALUE))
 
 /* This is how to output an assembler line
@@ -2197,7 +2194,7 @@ do {									\
   const char *fn_name = XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0);	\
   int reg;								\
 									\
-  if (! TARGET_OPEN_VMS && ! TARGET_WINDOWS_NT)				\
+  if (TARGET_ABI_OSF)							\
     fprintf (FILE, "\tldgp $29,0($27)\n");				\
 									\
   /* Mark end of prologue.  */						\

gcc/config/alpha/alpha32.h

@@ -30,8 +30,8 @@ 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.  */
 
-#undef TARGET_WINDOWS_NT
-#define TARGET_WINDOWS_NT 1
+#undef TARGET_ABI_WINDOWS_NT
+#define TARGET_ABI_WINDOWS_NT 1
 
 /* WinNT (and thus Interix) use unsigned int */
 #define SIZE_TYPE "unsigned int"

gcc/config/alpha/vms.h

@@ -18,8 +18,6 @@ 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.  */
 
-#define OPEN_VMS 1
-
 #define TARGET_OBJECT_SUFFIX ".obj"
 #define TARGET_EXECUTABLE_SUFFIX ".exe"
 
@@ -69,8 +67,8 @@ Boston, MA 02111-1307, USA.  */
 
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_FP|MASK_FPREGS|MASK_GAS)
-#undef TARGET_OPEN_VMS
-#define TARGET_OPEN_VMS 1
+#undef TARGET_ABI_OPEN_VMS
+#define TARGET_ABI_OPEN_VMS 1
 
 #undef TARGET_NAME   
 #define TARGET_NAME "OpenVMS/Alpha"