aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIain Sandoe <iain@sandoe.co.uk>2019-09-21 19:48:27 +0000
committerIain Sandoe <iains@gcc.gnu.org>2019-09-21 19:48:27 +0000
commit6bd2a4f3d173deaa06680904dd368292208cb95e (patch)
tree367c2ffdef781a56d3f731764f9474a881fbdd13 /gcc
parent296580b640a8161ae25037b01cc4f8e45bc73a30 (diff)
downloadgcc-6bd2a4f3d173deaa06680904dd368292208cb95e.zip
gcc-6bd2a4f3d173deaa06680904dd368292208cb95e.tar.gz
gcc-6bd2a4f3d173deaa06680904dd368292208cb95e.tar.bz2
[Darwin] Update machopic_legitimize_pic_address.
Some changes were missed here in the transition to LRA. The Darwin archs are all using LRA now. gcc/ChangeLog: 2019-09-21 Iain Sandoe <iain@sandoe.co.uk> * config/darwin.c (machopic_legitimize_pic_address): Check for lra not reload. From-SVN: r276020
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/darwin.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f22714e..014dd8d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-21 Iain Sandoe <iain@sandoe.co.uk>
+
+ * config/darwin.c (machopic_legitimize_pic_address): Check
+ for lra not reload.
+
2019-09-21 Richard Sandiford <richard.sandiford@arm.com>
* ira-conflicts.c (can_use_same_reg_p): New function.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index e1017be..3e4bbff 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -842,7 +842,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);
}
@@ -926,7 +926,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)));
@@ -950,7 +950,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);
}
@@ -996,7 +996,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,