From owner-svn-src-head@FreeBSD.ORG  Wed Nov  9 15:59:03 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22F19106566B;
	Wed,  9 Nov 2011 15:59:03 +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 12D638FC14;
	Wed,  9 Nov 2011 15:59:03 +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 pA9Fx2vc089323;
	Wed, 9 Nov 2011 15:59:02 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA9Fx2GY089321;
	Wed, 9 Nov 2011 15:59:02 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201111091559.pA9Fx2GY089321@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Wed, 9 Nov 2011 15:59:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227391 - head/contrib/gcc/config/arm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Nov 2011 15:59:03 -0000

Author: fabient
Date: Wed Nov  9 15:59:02 2011
New Revision: 227391
URL: http://svn.freebsd.org/changeset/base/227391

Log:
  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
  
  PR: 161128
  MFC after: 1 week

Modified:
  head/contrib/gcc/config/arm/arm.c

Modified: head/contrib/gcc/config/arm/arm.c
==============================================================================
--- head/contrib/gcc/config/arm/arm.c	Wed Nov  9 15:21:48 2011	(r227390)
+++ head/contrib/gcc/config/arm/arm.c	Wed Nov  9 15:59:02 2011	(r227391)
@@ -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