From: Hans-Peter Nilsson Date: Sun, 27 Oct 2013 14:42:53 +0000 (+0000) Subject: cris.c (cris_emit_trap_for_misalignment): Replace the removed PRED_MUDFLAP with PRED_... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f02827cdb38015958a89c977081f4b698bde7a02;p=gcc.git cris.c (cris_emit_trap_for_misalignment): Replace the removed PRED_MUDFLAP with PRED_NORETURN. * config/cris/cris.c (cris_emit_trap_for_misalignment): Replace the removed PRED_MUDFLAP with PRED_NORETURN. Correct file-path in comment. From-SVN: r204106 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f533d9addb9..585e6ce856a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2013-10-27 Hans-Peter Nilsson + + * config/cris/cris.c (cris_emit_trap_for_misalignment): Replace the + removed PRED_MUDFLAP with PRED_NORETURN. Correct file-path in comment. + 2013-10-26 Oleg Endo * config/sh/sh.md (movmemsi): Remove empty constraints and predicates. diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index a9117d76611..7432251b950 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -1989,17 +1989,14 @@ cris_emit_trap_for_misalignment (rtx mem) /* This will yield a btstq without a separate register used, usually - with the exception for PRE hoisting the "and" but not the branch - around the trap: see gcc.dg/target/cris/sync-3s.c. */ + around the trap: see testsuite/gcc.target/cris/sync-3s.c. */ andop = gen_rtx_AND (Pmode, reg, GEN_INT (natural_alignment - 1)); emit_cmp_and_jump_insns (force_reg (SImode, andop), const0_rtx, EQ, NULL_RTX, Pmode, 1, ok_label); jmp = get_last_insn (); gcc_assert (JUMP_P (jmp)); - /* While this isn't mudflap, it is a similar kind of assertion. - If PRED_MUDFLAP stops working, use something else or introduce a - more suitable assertion predication type. */ - predict_insn_def (jmp, PRED_MUDFLAP, TAKEN); + predict_insn_def (jmp, PRED_NORETURN, TAKEN); expand_builtin_trap (); emit_label (ok_label); }