From patchwork Mon Jun 18 11:01:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Bosscher X-Patchwork-Id: 165449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id BF337B70F3 for ; Mon, 18 Jun 2012 21:02:06 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1340622128; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=wSTdVa2 RT8GgesibIXtJS4kRun8=; b=biCTFwVUwwHvHFTB0ZskqNSb5wLuatXfSfEaI4d M8Vw1jeFd8QeLkY9NK7E9wnqVx5OphUNzrNFYmS1dMDueSqMp7x1n51tx+7S2gz6 g49z8/TSh/VSgtG6eJTnu3v3JJ5SSkFqK+uayOT1u4DLIDbx9VgQ7nxjoo9rOyRt V+CU= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=ZGB+DUM7uDMm7pKR+jT+ZfS0Qvt+KCVb5mH/jvfB6/K4uhkJlcZ72tcO+q8cfW 02zvAu8zmdmVHGJHiblWCeV831eq1Dry4J0jMAceOaxHXurG2ZLqf89DzaNxma/O 5ryjZA2arBYn+BW/MKLu4T8yi+zp2/y0N5W5Y+2SF1k90=; Received: (qmail 2288 invoked by alias); 18 Jun 2012 11:02:02 -0000 Received: (qmail 2279 invoked by uid 22791); 18 Jun 2012 11:02:02 -0000 X-SWARE-Spam-Status: No, hits=-4.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-lpp01m010-f47.google.com (HELO mail-lpp01m010-f47.google.com) (209.85.215.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 18 Jun 2012 11:01:49 +0000 Received: by lags15 with SMTP id s15so3605294lag.20 for ; Mon, 18 Jun 2012 04:01:48 -0700 (PDT) MIME-Version: 1.0 Received: by 10.112.17.195 with SMTP id q3mr6508392lbd.34.1340017307862; Mon, 18 Jun 2012 04:01:47 -0700 (PDT) Received: by 10.112.4.229 with HTTP; Mon, 18 Jun 2012 04:01:47 -0700 (PDT) Date: Mon, 18 Jun 2012 13:01:47 +0200 Message-ID: Subject: [patch] Remove VMS_TARGET From: Steven Bosscher To: GCC Patches , Tristan Gingold X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hello, There are exactly 2 references to the target macro VMS_TARGET: cp/decl.c:#if VMS_TARGET config/vax/vax.h:#define VMS_TARGET 0 I'm not sure what the macro is for. GCC seems to support a couple of VMS targets, but none of them define VMS_TARGET. This patch remove the macro. I can't test this because I have no access to a VMS machine, but it is pretty obvious that the macro is dead code. OK for trunk? Ciao! Steven gcc/ * config/vax/vax.h (VMS_TARGET): Remove. cp/ * decl.c (finish_function): Remove code conditional on VMS_TARGET. 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