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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to