gcc/
* config/aarch64/aarch64.c (aarch64_load_symref_appropriately):
Strengthen local "insns" from rtx to rtx_insn *.
(aarch64_set_frame_expr): Likewise for local "insn".
(aarch64_save_or_restore_fprs): Likewise.
(aarch64_save_or_restore_callee_save_registers): Likewise.
(aarch64_expand_prologue): Likewise.
(aarch64_expand_epilogue): Likewise.
(aarch64_output_mi_thunk): Likewise.
(aarch64_split_compare_and_swap): Strengthen locals "label1" and
"label2" from rtx to rtx_code_label *.
(aarch64_split_atomic_op): Likewise for local "label".
---
gcc/config/aarch64/aarch64.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index f69457a..4c821f5 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -691,7 +691,7 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm,
case SYMBOL_SMALL_TLSGD:
{
- rtx insns;
+ rtx_insn *insns;
rtx result = gen_rtx_REG (Pmode, R0_REGNUM);
start_sequence ();
@@ -1882,7 +1882,7 @@ aarch64_layout_frame (void)
static void
aarch64_set_frame_expr (rtx frame_pattern)
{
- rtx insn;
+ rtx_insn *insn;
insn = get_last_insn ();
RTX_FRAME_RELATED_P (insn) = 1;
@@ -1906,7 +1906,7 @@ aarch64_save_or_restore_fprs (int start_offset, int
increment,
{
unsigned regno;
unsigned regno2;
- rtx insn;
+ rtx_insn *insn;
rtx (*gen_mem_ref)(enum machine_mode, rtx)
= (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM;
@@ -1990,7 +1990,7 @@ static void
aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset,
bool restore)
{
- rtx insn;
+ rtx_insn *insn;
rtx base_rtx = stack_pointer_rtx;
HOST_WIDE_INT start_offset = offset;
HOST_WIDE_INT increment = UNITS_PER_WORD;
@@ -2128,7 +2128,7 @@ aarch64_expand_prologue (void)
HOST_WIDE_INT original_frame_size; /* local variables + vararg save */
HOST_WIDE_INT frame_size, offset;
HOST_WIDE_INT fp_offset; /* FP offset from SP */
- rtx insn;
+ rtx_insn *insn;
aarch64_layout_frame ();
original_frame_size = get_frame_size () + cfun->machine->saved_varargs_size;
@@ -2293,7 +2293,7 @@ aarch64_expand_epilogue (bool for_sibcall)
{
HOST_WIDE_INT original_frame_size, frame_size, offset;
HOST_WIDE_INT fp_offset;
- rtx insn;
+ rtx_insn *insn;
rtx cfa_reg;
aarch64_layout_frame ();
@@ -2669,7 +2669,8 @@ aarch64_output_mi_thunk (FILE *file, tree thunk
ATTRIBUTE_UNUSED,
to return a pointer to an aggregate. On AArch64 a result value
pointer will be in x8. */
int this_regno = R0_REGNUM;
- rtx this_rtx, temp0, temp1, addr, insn, funexp;
+ rtx this_rtx, temp0, temp1, addr, funexp;
+ rtx_insn *insn;
reload_completed = 1;
emit_note (NOTE_INSN_PROLOGUE_END);
@@ -8294,7 +8295,8 @@ aarch64_split_compare_and_swap (rtx operands[])
rtx rval, mem, oldval, newval, scratch;
enum machine_mode mode;
bool is_weak;
- rtx label1, label2, x, cond;
+ rtx_code_label *label1, *label2;
+ rtx x, cond;
rval = operands[0];
mem = operands[1];
@@ -8304,7 +8306,7 @@ aarch64_split_compare_and_swap (rtx operands[])
scratch = operands[7];
mode = GET_MODE (mem);
- label1 = NULL_RTX;
+ label1 = NULL;
if (!is_weak)
{
label1 = gen_label_rtx ();
@@ -8347,7 +8349,8 @@ aarch64_split_atomic_op (enum rtx_code code, rtx old_out,
rtx new_out, rtx mem,
{
enum machine_mode mode = GET_MODE (mem);
enum machine_mode wmode = (mode == DImode ? DImode : SImode);
- rtx label, x;
+ rtx_code_label *label;
+ rtx x;
label = gen_label_rtx ();
emit_label (label);
--
1.8.5.3
