config/aarch64/aarch64.c: Use rtx_insn

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".

From-SVN: r214428

2 files changed, 27 insertions, 10 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e4b593..7743325 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2014-08-25  David Malcolm  <dmalcolm@redhat.com>
+
+	* 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".
+
 2014-08-25  Martin Liska  <mliska@suse.cz>
 
 	* cgraph.h (symtab_node):
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index c3c871e..d809d4c 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 ();
@@ -1924,7 +1924,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;
@@ -2004,7 +2004,7 @@ static void
 aarch64_pushwb_pair_reg (enum machine_mode mode, unsigned regno1,
 			 unsigned regno2, HOST_WIDE_INT adjustment)
 {
-  rtx insn;
+  rtx_insn *insn;
   rtx reg1 = gen_rtx_REG (mode, regno1);
   rtx reg2 = gen_rtx_REG (mode, regno2);
 
@@ -2095,7 +2095,7 @@ static void
 aarch64_save_callee_saves (enum machine_mode mode, HOST_WIDE_INT start_offset,
 			   unsigned start, unsigned limit, bool skip_wb)
 {
-  rtx insn;
+  rtx_insn *insn;
   rtx (*gen_mem_ref) (enum machine_mode, rtx) = (frame_pointer_needed
 						 ? gen_frame_mem : gen_rtx_MEM);
   unsigned regno;
@@ -2263,7 +2263,7 @@ aarch64_expand_prologue (void)
   */
   HOST_WIDE_INT frame_size, offset;
   HOST_WIDE_INT fp_offset;		/* Offset from hard FP to SP.  */
-  rtx insn;
+  rtx_insn *insn;
 
   aarch64_layout_frame ();
 
@@ -2417,7 +2417,7 @@ aarch64_expand_epilogue (bool for_sibcall)
 {
   HOST_WIDE_INT frame_size, offset;
   HOST_WIDE_INT fp_offset;
-  rtx insn;
+  rtx_insn *insn;
   rtx cfa_reg;
 
   aarch64_layout_frame ();
@@ -2758,7 +2758,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);
@@ -8543,7 +8544,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];
@@ -8553,7 +8555,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 ();
@@ -8596,7 +8598,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);