From d421b10cd17c92b2705aeb4f279792dced9f896d Mon Sep 17 00:00:00 2001 From: Steven Bosscher Date: Mon, 18 Jun 2012 11:34:28 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 4 ++++ gcc/config/vax/vax.h | 2 -- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 11 ++--------- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3e3a8993b15..f1f564fde42 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-06-18 Steven Bosscher + + * config/vax/vax.h (VMS_TARGET): Remove. + 2012-06-18 Richard Guenther * 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 a9de79c62fb..37e3d108f3f 100644 --- 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 d033bcfbf24..590eadd202f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2012-06-18 Steven Bosscher + + * decl.c (finish_function): Remove code conditional on VMS_TARGET. + 2012-06-15 Marc Glisse PR c++/51033 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index da23bda2980..1346f924c2b 100644 --- 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 -- 2.30.2