From 04ef80ce924df919d1f8232dca5d0880f3e831f1 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Tue, 28 Apr 2009 07:19:00 -0700 Subject: [PATCH] re PR bootstrap/39929 (Bootstrapping fails at stage 1 on powerpc-ibm-aix) 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. From-SVN: r146894 --- gcc/ChangeLog | 7 +++++++ gcc/config/arm/arm.c | 4 ++-- gcc/config/darwin.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4de76bdddb3..02662d40277 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 0b4a06cd84c..055cb36d75d 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 f8c982e3842..88d032f2ef6 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);