From owner-svn-src-all@FreeBSD.ORG Fri Nov 18 14:56:07 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15ED9106567B; Fri, 18 Nov 2011 14:56:07 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 04F1F8FC08; Fri, 18 Nov 2011 14:56:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAIEu6nH080989; Fri, 18 Nov 2011 14:56:06 GMT (envelope-from fabient@svn.freebsd.org) Received: (from fabient@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAIEu6VW080987; Fri, 18 Nov 2011 14:56:06 GMT (envelope-from fabient@svn.freebsd.org) Message-Id: <201111181456.pAIEu6VW080987@svn.freebsd.org> From: Fabien Thomas Date: Fri, 18 Nov 2011 14:56:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227665 - releng/9.0/contrib/gcc/config/arm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Nov 2011 14:56:07 -0000 Author: fabient Date: Fri Nov 18 14:56:06 2011 New Revision: 227665 URL: http://svn.freebsd.org/changeset/base/227665 Log: MFC r227391: Import gcc fix for -fstack-protector that produces segfaulting binaries on arm/armel. Related gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35965 Author kindly accepted that all of his patches can be use as GPLv2. PR: 161128 Approved by: re (kib) Modified: releng/9.0/contrib/gcc/config/arm/arm.c Directory Properties: releng/9.0/contrib/gcc/ (props changed) Modified: releng/9.0/contrib/gcc/config/arm/arm.c ============================================================================== --- releng/9.0/contrib/gcc/config/arm/arm.c Fri Nov 18 14:41:48 2011 (r227664) +++ releng/9.0/contrib/gcc/config/arm/arm.c Fri Nov 18 14:56:06 2011 (r227665) @@ -3217,7 +3217,8 @@ legitimize_pic_address (rtx orig, enum m gcc_assert (!no_new_pseudos); if (arm_pic_register != INVALID_REGNUM) { - cfun->machine->pic_reg = gen_rtx_REG (Pmode, arm_pic_register); + if (!cfun->machine->pic_reg) + cfun->machine->pic_reg = gen_rtx_REG (Pmode, arm_pic_register); /* Play games to avoid marking the function as needing pic if we are being called as part of the cost-estimation @@ -3229,7 +3230,8 @@ legitimize_pic_address (rtx orig, enum m { rtx seq; - cfun->machine->pic_reg = gen_reg_rtx (Pmode); + if (!cfun->machine->pic_reg) + cfun->machine->pic_reg = gen_reg_rtx (Pmode); /* Play games to avoid marking the function as needing pic if we are being called as part of the cost-estimation