diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2019-10-18 07:54:12 +0000 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2019-10-18 07:54:12 +0000 |
| commit | 16fcc2ed83267ec5320878f92a5a978be16ff5eb (patch) | |
| tree | e0b60ede265c1ccc92220208f91083c8edc68a33 | |
| parent | d2949ff4e4b942856c5590e2ea48eb32f5c75883 (diff) | |
[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 <iain@sandoe.co.uk>
Backport from mainline
2019-09-21 Iain Sandoe <iain@sandoe.co.uk>
* config/darwin.c (machopic_legitimize_pic_address): Check
for lra, rather than reload.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@277144 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/darwin.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7d4bed99ba7..ae17be5a74c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-10-18 Iain Sandoe <iain@sandoe.co.uk> + + Backport from mainline + 2019-09-21 Iain Sandoe <iain@sandoe.co.uk> + + * config/darwin.c (machopic_legitimize_pic_address): Check + for lra, rather than reload. + 2019-10-17 John David Anglin <danglin@gcc.gnu.org> * config/pa/pa.c (pa_output_indirect_call): Fix typos in last change. diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index b9862353843..5e0110c48d9 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -844,7 +844,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); } @@ -928,7 +928,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))); @@ -952,7 +952,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); } @@ -998,7 +998,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, |