diff options
| author | Julian Brown <julian@codesourcery.com> | 2009-02-25 07:18:01 +0000 |
|---|---|---|
| committer | Doug Kwan <dougkwan@gcc.gnu.org> | 2009-02-25 07:18:01 +0000 |
| commit | 6d2538f5f9eeaf3851c35101c8586ac51c772389 (patch) | |
| tree | 50dd6fbd4b2edde3d4062bcac20c1bb32f2d8b91 /gcc | |
| parent | a2fa6772d2be0384af8b91795afed92222d436ad (diff) | |
| download | gcc-6d2538f5f9eeaf3851c35101c8586ac51c772389.zip gcc-6d2538f5f9eeaf3851c35101c8586ac51c772389.tar.gz gcc-6d2538f5f9eeaf3851c35101c8586ac51c772389.tar.bz2 | |
re PR target/35965 ([4.3 only] -fstack-protector produces segfaulting binaries on arm/armel)
2009-02-24 Julian Brown <julian@codesourcery.com>
PR target/35965
* config/arm/arm.c (require_pic_register): Only set
cfun->machine->pic_reg once per function.
Patch commited by Doug Kwan <dougkwan@google.com>
From-SVN: r144424
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/arm/arm.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fb344c8..64eded2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-02-24 Julian Brown <julian@codesourcery.com> + + PR target/35965 + * config/arm/arm.c (require_pic_register): Only set + cfun->machine->pic_reg once per function. + 2009-02-24 Sandra Loosemore <sandra@codesourcery.com> * doc/invoke.texi (Link Options): Document an easier way to pass diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index c25fc29..662e7de 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3563,7 +3563,8 @@ require_pic_register (void) gcc_assert (can_create_pseudo_p ()); 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 @@ -3575,7 +3576,8 @@ require_pic_register (void) { 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 |