Index: config/vax/vax.h
===================================================================
--- config/vax/vax.h    (revision 188724)
+++ config/vax/vax.h    (working copy)
@@ -35,8 +35,6 @@ along with GCC; see the file COPYING3.  If not see
     }                                          \
   while (0)

-#define VMS_TARGET 0
-
 /* Use -J option for long branch support with Unix assembler.  */

 #define ASM_SPEC "-J"
Index: cp/decl.c
===================================================================
--- cp/decl.c   (revision 188724)
+++ cp/decl.c   (working copy)
@@ -13461,16 +13461,9 @@ finish_function (int flags)
      there's no need to add any extra bits.  */
   if (!DECL_CLONED_FUNCTION_P (fndecl))
     {
+      /* Make it so that `main' always returns 0 by default.  */
       if (DECL_MAIN_P (current_function_decl))
-       {
-         /* Make it so that `main' always returns 0 by default (or
-            1 for VMS).  */
-#if VMS_TARGET
-         finish_return_stmt (integer_one_node);
-#else
-         finish_return_stmt (integer_zero_node);
-#endif
-       }
+       finish_return_stmt (integer_zero_node);

       if (use_eh_spec_block (current_function_decl))
        finish_eh_spec_block (TYPE_RAISES_EXCEPTIONS