From 32354eaf96bb0c3e2204542d91dc2ec9508dfd9d Mon Sep 17 00:00:00 2001 From: hp Date: Sat, 9 Jun 2012 20:53:39 +0000 Subject: Fix CRIS build errors with --enable-build-with-cxx. * config/cris/cris.c (cris_emit_trap_for_misalignment): Rename variable "and" to "andop". * config/cris/sync.md ("atomic_fetch_"): Use temporary variable for memory model, passing C++-type-correct parameter type to expand_mem_thread_fence. ("atomic_compare_and_swap"): Ditto. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188362 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/config/cris/cris.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/config/cris/cris.c') diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index 947a6a51416..f5bd6dbdb3a 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -1929,7 +1929,7 @@ cris_simple_epilogue (void) void cris_emit_trap_for_misalignment (rtx mem) { - rtx addr, reg, ok_label, and, jmp; + rtx addr, reg, ok_label, andop, jmp; int natural_alignment; gcc_assert (MEM_P (mem)); @@ -1941,8 +1941,8 @@ 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. */ - and = gen_rtx_AND (Pmode, reg, GEN_INT (natural_alignment - 1)); - emit_cmp_and_jump_insns (force_reg (SImode, and), const0_rtx, EQ, + 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)); -- cgit v1.2.1