From patchwork Wed Feb 12 10:30:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Vogt X-Patchwork-Id: 319602 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9A3462C00BB for ; Wed, 12 Feb 2014 21:30:52 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=jU/1fIOakHV4ZfQ5a GNb3QeKD8ZksmEcMKJ9LtgymMa/j6J/K6yaqxM4DA9yBXcSszc77kyz3aWIjASJW HseRY1Yo4SgznrBp7ywU8JPGJ0nxcC8+xJTz8Q+fwPsSNMt/F8H0ZJsWaGJdgDmh d/TPTCliLOa9GpCs9hdknYcjtA= 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:date :from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:in-reply-to; s=default; bh=6zDKR6l6ZjAkCBUb5aSQxxY frdk=; b=gVuYsch4aNXBG1w+Pctz17xiMpA6freNkCCyuEkbZPckslb4BWvbSKs XSI2JH7vHstBT953sOw4eal0V8ZZKRo85rTgOt+xIBfaWmv3R1DTGwgscCR+XQkA AD7kK+PpCDGbKA29Mp3cHXEpMHRhGljmEdXvzOzb1vVMXGS4RPNQ= Received: (qmail 24887 invoked by alias); 12 Feb 2014 10:30:43 -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 24874 invoked by uid 89); 12 Feb 2014 10:30:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_SEMBACKSCATTER, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp11.uk.ibm.com Received: from e06smtp11.uk.ibm.com (HELO e06smtp11.uk.ibm.com) (195.75.94.107) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 12 Feb 2014 10:30:37 +0000 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Feb 2014 10:30:34 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 12 Feb 2014 10:30:31 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2902B1B08066 for ; Wed, 12 Feb 2014 10:30:06 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1CAUJ8465536254 for ; Wed, 12 Feb 2014 10:30:19 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1CAUUJL025723 for ; Wed, 12 Feb 2014 03:30:31 -0700 Received: from bl3ahm9f.de.ibm.com (dyn-9-152-212-163.boeblingen.de.ibm.com [9.152.212.163]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s1CAUUWC025691 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Wed, 12 Feb 2014 03:30:30 -0700 Received: from dvogt by bl3ahm9f.de.ibm.com with local (Exim 4.76) (envelope-from ) id 1WDX5K-00033v-Ci; Wed, 12 Feb 2014 11:30:30 +0100 Date: Wed, 12 Feb 2014 11:30:30 +0100 From: Dominik Vogt To: gcc-patches@gcc.gnu.org Cc: Andreas Krebbel Subject: [PATCH] (gcc-4.8) S390: Fix crash with -mhotpatch and gfortran Message-ID: <20140212103030.GA11561@linux.vnet.ibm.com> Reply-To: vogt@linux.vnet.ibm.com References: <20140212102838.GA10947@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140212102838.GA10947@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14021210-5024-0000-0000-000008B6A79E On Wed, Feb 12, 2014 at 11:28:38AM +0100, Dominik Vogt wrote: > The attached patch fixes a crash if gfortran encounters a nested > function when -mhotpatch is enabled. (It slightly improves the > warning message too.) > > This patch affects s390 only. Andreas Krebbel will commit the > patch soon, if there are no objections. Same patch for gcc-4.8. Ciao Dominik ^_^ ^_^ From 0d9acbc61fa99ace25bc26d8af4f252d1c8c792d Mon Sep 17 00:00:00 2001 From: Dominik Vogt Date: Wed, 12 Feb 2014 05:53:34 +0000 Subject: [PATCH 1/2] S390: Fix crash when -mhotpatch encounters nested functions (e.g. with gfortran). --- gcc/config/s390/s390.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 2ba1d8a..88c97c6 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -5475,9 +5475,8 @@ s390_asm_output_function_label (FILE *asm_out_file, const char *fname, if (hotpatch_trampoline_halfwords >= 0 && decl_function_context (decl) != NULL_TREE) { - warning_at (0, DECL_SOURCE_LOCATION (decl), - "hotpatch_prologue is not compatible with nested" - " function"); + warning_at (0, OPT_mhotpatch, + "hotpatching is not compatible with nested functions"); hotpatch_trampoline_halfwords = -1; } } -- 1.8.3.1