vax.h (VMS_TARGET): Remove.

gcc/
	* config/vax/vax.h (VMS_TARGET): Remove.

cp/
	* decl.c (finish_function): Remove code conditional on VMS_TARGET.

From-SVN: r188729

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e3a8993b15ad1aca7edefed17a3e1aa3ac87954..f1f564fde42a0426407679137c584ea3c3d71b79 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-18  Steven Bosscher  <steven@gcc.gnu.org>
+
+       * config/vax/vax.h (VMS_TARGET): Remove.
+
 2012-06-18  Richard Guenther  <rguenther@suse.de>
 
        * tree-vrp.c (extract_range_from_assert): Split out range

diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h
index a9de79c62fb1b4375b90dec16a72f4bb2168c947..37e3d108f3fd9aca7efb5f4d20fa06ee7e2eabef 100644 (file)
--- a/gcc/config/vax/vax.h
+++ b/gcc/config/vax/vax.h
@@ -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"

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d033bcfbf24fc1da22d5520968072e8025f82fe1..590eadd202fe747463400730909592ddebfcbde6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-18  Steven Bosscher  <steven@gcc.gnu.org>
+
+       * decl.c (finish_function): Remove code conditional on VMS_TARGET.
+
 2012-06-15  Marc Glisse  <marc.glisse@inria.fr>
 
        PR c++/51033

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index da23bda2980d5bafd74755b08c7b948d8226bd57..1346f924c2bb74eb0a255bef83dbc72d3c314d3f 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -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