From: pinskia Date: Tue, 28 Apr 2009 14:19:00 +0000 (+0000) Subject: 2009-04-28 Andrew Pinski X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5d1687d374a403b4b0cc72a3154247c35f30423;p=thirdparty%2Fgcc.git 2009-04-28 Andrew Pinski PR target/39929 * config/darwin.c (machopic_gen_offset): Check currently_expanding_to_rtl if current_ir_type returns IR_GIMPLE. * config/arm/arm.c (require_pic_register): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146894 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4de76bdddb31..02662d40277f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-04-28 Andrew Pinski + + PR target/39929 + * config/darwin.c (machopic_gen_offset): Check + currently_expanding_to_rtl if current_ir_type returns IR_GIMPLE. + * config/arm/arm.c (require_pic_register): Likewise. + 2009-04-28 Paolo Bonzini * config/m32c/m32c.c (TARGET_PROMOTE_FUNCTION_RETURN, diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 0b4a06cd84ca..055cb36d75dc 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3565,7 +3565,7 @@ require_pic_register (void) /* Play games to avoid marking the function as needing pic if we are being called as part of the cost-estimation process. */ - if (current_ir_type () != IR_GIMPLE) + if (current_ir_type () != IR_GIMPLE || currently_expanding_to_rtl) crtl->uses_pic_offset_table = 1; } else @@ -3578,7 +3578,7 @@ require_pic_register (void) /* Play games to avoid marking the function as needing pic if we are being called as part of the cost-estimation process. */ - if (current_ir_type () != IR_GIMPLE) + if (current_ir_type () != IR_GIMPLE || currently_expanding_to_rtl) { crtl->uses_pic_offset_table = 1; start_sequence (); diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index f8c982e38429..88d032f2ef6e 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -281,7 +281,7 @@ machopic_gen_offset (rtx orig) { /* Play games to avoid marking the function as needing pic if we are being called as part of the cost-estimation process. */ - if (current_ir_type () != IR_GIMPLE) + if (current_ir_type () != IR_GIMPLE || currently_expanding_to_rtl) crtl->uses_pic_offset_table = 1; orig = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, orig), UNSPEC_MACHOPIC_OFFSET);