From patchwork Tue Jun 11 15:16:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 250562 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 1A7072C0095 for ; Wed, 12 Jun 2013 01:16:43 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:subject:from:to:date:content-type:mime-version; q= dns; s=default; b=d6wySQjq8g88VITzqIrk3Z7OiQRxIcN9HYNsyTvuZrHH93 SIflFoPL9VrnUPyU7TQSmRBh+Y0nKfRbIVlY9525T4dYGOR4JIcaNIcq+UqRX8Ir JYO+wgo5R5Lr93XtI/cZS2tCxE47RRPhfginJX8Pjy3aS9xG1scqUmbPCEzGc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:subject:from:to:date:content-type:mime-version; s= default; bh=Yqta5VQOhaykEfEQyYNX96eVXdo=; b=LqpGT/etii/mJUVTKEt2 fJNiPlRJCZ+1ssERAG8lPlmSjT17WsraaUs6XKJwO4prpkre76Xvczn3qVSTWbYz 2hk958zoLLUahTO1QBGJqR5Kki1t8NTjoh5zSnVzmbACxNuUo2qYppm5lL09RC5y 2izr9kXx8la+ScAQy2V2snA= Received: (qmail 32217 invoked by alias); 11 Jun 2013 15:16:37 -0000 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 Received: (qmail 32208 invoked by uid 89); 11 Jun 2013 15:16:36 -0000 X-Spam-SWARE-Status: No, score=-6.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 11 Jun 2013 15:16:36 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5BFGYtx012621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Jun 2013 11:16:35 -0400 Received: from [10.16.189.4] (dhcp-189-4.bos.redhat.com [10.16.189.4]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r5BFGYU5006866 for ; Tue, 11 Jun 2013 11:16:34 -0400 Message-ID: <1370963798.28429.16.camel@surprise> Subject: [PATCH] function.c: Remove stray copy of initial_trampoline From: David Malcolm To: gcc patches Date: Tue, 11 Jun 2013 11:16:38 -0400 Mime-Version: 1.0 X-Virus-Found: No Both function.c and varasm.c contain their own copies of this declaration: static GTY(()) rtx initial_trampoline; Only the one in varasm.c is used; the one in function.c appears to be a missing removal from this move: 2004-05-13 Diego Novillo Merge from tree-ssa-20020619-branch. (...snip...) * function.c (...snip...) (initial_trampoline): Move to varasm.c. * varasm.c (...snip...) (initial_trampoline): Move from function.c. as part of this commit on that branch: 2004-02-16 Richard Henderson * tree-nested.c: New file. (...snip...) (I'm not sure if the error occurred on the branch or during merger). I'm attaching a patch to remove the stray copy from function.c Successfully bootstrapped on x86_64-unknown-linux-gnu OK for trunk? 2013-06-11 David Malcolm * function.c (initial_trampoline): Remove stray copy; see varasm.c for the real copy. Index: gcc/function.c =================================================================== --- gcc/function.c (revision 199957) +++ gcc/function.c (working copy) @@ -4980,8 +4980,6 @@ warning (OPT_Wunused_parameter, "unused parameter %q+D", decl); } -static GTY(()) rtx initial_trampoline; - /* Generate RTL for the end of the current function. */ void