From patchwork Tue Feb 7 18:41:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Meissner X-Patchwork-Id: 139989 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 A8B30B71AB for ; Wed, 8 Feb 2012 05:42:30 +1100 (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=1329244951; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Received:Received:Received:Date:From:To: Subject:Message-ID:Mail-Followup-To:MIME-Version:Content-Type: Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=tRbbFUxOML2tqHUoAXaZjTkRVb0=; b=PZ9Vv+PESGYUtq0 u6/Qmofhia/p+NHLwmm7Rb+DR/oBJKjC48GPVAv4N1viji4hhijQLFvlcHPEH+pO pIZh6wBP1txnaIHcPKouSiNqrGvCDN0abK3+QYzdQFU8JUvG4RhiyYWviPzX7ALk xyxS13kVbpnkM269fdKjNvbIOhk8= 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:Received:Received:Received:Received:Received:Received:Date:From:To:Subject:Message-ID:Mail-Followup-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:X-Content-Scanned:x-cbid:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=RA+G7VWp67yakVRgCAt94RmI/949bKKIvjnTCSTJgXcNakf3+u62p1Olf7njmL Z3QIkb1fSGHSKGa/xSJboppwnpnLbrbMPDn70gyCuk8DTQ/7Zk6Mpm3IC7Hqwj7B 6LcNf1nz6whuV7j2gLWDKGRw8+sNLfmnuk4S2WhnyptEc=; Received: (qmail 15318 invoked by alias); 7 Feb 2012 18:42:24 -0000 Received: (qmail 15297 invoked by uid 22791); 7 Feb 2012 18:42:22 -0000 X-SWARE-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI X-Spam-Check-By: sourceware.org Received: from e36.co.us.ibm.com (HELO e36.co.us.ibm.com) (32.97.110.154) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 07 Feb 2012 18:42:08 +0000 Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Feb 2012 11:42:05 -0700 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 7 Feb 2012 11:42:02 -0700 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 57A7A1FF004F for ; Tue, 7 Feb 2012 11:42:00 -0700 (MST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q17IfqgH103156 for ; Tue, 7 Feb 2012 11:41:52 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q17IfpmV020131 for ; Tue, 7 Feb 2012 11:41:51 -0700 Received: from ibm-tiger.the-meissners.org ([9.33.37.223]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q17IfoKd019948; Tue, 7 Feb 2012 11:41:51 -0700 Received: by ibm-tiger.the-meissners.org (Postfix, from userid 500) id 07BFA41351; Tue, 7 Feb 2012 13:41:48 -0500 (EST) Date: Tue, 7 Feb 2012 13:41:48 -0500 From: Michael Meissner To: gcc-patches@gcc.gnu.org, dje.gcc@gmail.com Subject: [PATCH, committed] Fix error message for -mno-pointers-to-nested-functions Message-ID: <20120207184148.GA3507@ibm-tiger.the-meissners.org> Mail-Followup-To: Michael Meissner , gcc-patches@gcc.gnu.org, dje.gcc@gmail.com MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12020718-3352-0000-0000-000002741BE5 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 David pointed out that I had not updated the error message for -mno-pointers-to-nested-functions when I changed the name of the switch. I installed the following patch as obvious after making sure it bootstrapped and ran make check. [gcc] 2012-02-07 Michael Meissner * config/rs6000/rs6000.c (rs6000_trampoline_init): Fix error message for -mno-pointers-to-nested-function. [gcc/testsuite] 2012-02-07 Michael Meissner * gcc.target/powerpc/no-r11-3.c (outer_func): Fix error message for -mno-pointers-to-nested-functions. Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 183975) +++ gcc/config/rs6000/rs6000.c (working copy) @@ -24032,7 +24032,8 @@ rs6000_trampoline_init (rtx m_tramp, tre rtx fnmem, fn_reg, toc_reg; if (!TARGET_POINTERS_TO_NESTED_FUNCTIONS) - error ("-mno-r11 must not be used if you have trampolines"); + error ("You cannot take the address of a nested function if you use " + "the -mno-pointers-to-nested-functions option."); fnmem = gen_const_mem (Pmode, force_reg (Pmode, fnaddr)); fn_reg = gen_reg_rtx (Pmode); Index: gcc/testsuite/gcc.target/powerpc/no-r11-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/no-r11-3.c (revision 183975) +++ gcc/testsuite/gcc.target/powerpc/no-r11-3.c (working copy) @@ -5,7 +5,7 @@ extern void ext_call (int (func) (void)); int -outer_func (int init) /* { dg-error "-mno-r11 must not be used if you have trampolines" "" } */ +outer_func (int init) /* { dg-error "-mno-pointers-to-nested-functions option" "" } */ { int value = init;