aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorSteven Bosscher <steven@gcc.gnu.org>2012-06-18 11:34:28 +0000
committerSteven Bosscher <steven@gcc.gnu.org>2012-06-18 11:34:28 +0000
commitd421b10cd17c92b2705aeb4f279792dced9f896d (patch)
treed03da07b33fc2fd14539628639eb6098c9f35257 /gcc
parent3928c098e48c1066da265b0c840be1cc38e17b3e (diff)
downloadgcc-d421b10cd17c92b2705aeb4f279792dced9f896d.zip
gcc-d421b10cd17c92b2705aeb4f279792dced9f896d.tar.gz
gcc-d421b10cd17c92b2705aeb4f279792dced9f896d.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config/vax/vax.h2
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/decl.c11
4 files changed, 10 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e3a899..f1f564f 100644
--- 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 a9de79c..37e3d10 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 d033bcf..590eadd 100644
--- 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 da23bda..1346f92 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