From eb561d66286923fca8cc46dcda11fd005ee6a5a3 Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Thu, 28 May 2015 01:17:52 +0000 Subject: [PATCH] re PR target/66148 (build/genpreds: Internal error: abort in choose_enum_order, at genpreds.c:1006) PR target/66148 * config/pa/pa.c (pa_emit_move_sequence): Correct placement of REG_EQUAL note when doing insert. From-SVN: r223794 --- gcc/ChangeLog | 6 ++++++ gcc/config/pa/pa.c | 20 ++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 29b1662716d0..075d1a71da44 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-05-27 John David Anglin + + PR target/66148 + * config/pa/pa.c (pa_emit_move_sequence): Correct placement of + REG_EQUAL note when doing insert. + 2015-05-26 Rohit Arul Raj Backported from mainline diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index e17451f424a8..5aad9fdbc654 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -2203,11 +2203,11 @@ pa_emit_move_sequence (rtx *operands, enum machine_mode mode, rtx scratch_reg) gen_rtx_HIGH (mode, operand1))); emit_move_insn (temp, gen_rtx_LO_SUM (mode, temp, operand1)); if (mode == DImode) - emit_insn (gen_insvdi (operand0, GEN_INT (32), - const0_rtx, temp)); + insn = emit_insn (gen_insvdi (operand0, GEN_INT (32), + const0_rtx, temp)); else - emit_insn (gen_insvsi (operand0, GEN_INT (32), - const0_rtx, temp)); + insn = emit_insn (gen_insvsi (operand0, GEN_INT (32), + const0_rtx, temp)); } else { @@ -2229,11 +2229,15 @@ pa_emit_move_sequence (rtx *operands, enum machine_mode mode, rtx scratch_reg) } if (mode == DImode) - emit_insn (gen_insvdi (operand0, GEN_INT (len), - GEN_INT (pos), GEN_INT (v5))); + insn = emit_insn (gen_insvdi (operand0, + GEN_INT (len), + GEN_INT (pos), + GEN_INT (v5))); else - emit_insn (gen_insvsi (operand0, GEN_INT (len), - GEN_INT (pos), GEN_INT (v5))); + insn = emit_insn (gen_insvsi (operand0, + GEN_INT (len), + GEN_INT (pos), + GEN_INT (v5))); len = pos > 0 && pos < 5 ? pos : 5; pos -= len; -- 2.47.2