From: Iain Sandoe Date: Tue, 29 Oct 2019 20:01:59 +0000 (+0000) Subject: [Darwin] Update machopic_legitimize_pic_address. X-Git-Tag: releases/gcc-7.5.0~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35cd1262dcfb99006bb01b0f481487ccd6dfe437;p=thirdparty%2Fgcc.git [Darwin] Update machopic_legitimize_pic_address. Some changes were missed here in the transition to LRA. The Darwin archs are all using LRA now, testing for reload is not correct. 2019-10-18 Iain Sandoe Backport from mainline 2019-09-21 Iain Sandoe * config/darwin.c (machopic_legitimize_pic_address): Check for lra, rather than reload. From-SVN: r277583 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9d215fd636f9..047de28e51d6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-10-18 Iain Sandoe + + Backport from mainline + 2019-09-21 Iain Sandoe + + * config/darwin.c (machopic_legitimize_pic_address): Check + for lra, rather than reload. + 2019-10-29 Iain Sandoe Backport from mainline diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 26875e97a6c9..17beaf01cf59 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -841,7 +841,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) { if (reg == 0) { - gcc_assert (!reload_in_progress); + gcc_assert (!lra_in_progress); reg = gen_reg_rtx (Pmode); } @@ -925,7 +925,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) emit_use (gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM)); #endif - if (reload_in_progress) + if (lra_in_progress) df_set_regs_ever_live (REGNO (pic), true); pic_ref = gen_rtx_PLUS (Pmode, pic, machopic_gen_offset (XEXP (orig, 0))); @@ -949,7 +949,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) if (reg == 0) { - gcc_assert (!reload_in_progress); + gcc_assert (!lra_in_progress); reg = gen_reg_rtx (Pmode); } @@ -995,7 +995,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) #if 0 emit_use (pic_offset_table_rtx); #endif - if (reload_in_progress) + if (lra_in_progress) df_set_regs_ever_live (REGNO (pic), true); pic_ref = gen_rtx_PLUS (Pmode, pic,