optabs.c (maybe_emit_atomic_test_and_set): Mark model unused.

        * optabs.c (maybe_emit_atomic_test_and_set): Mark model unused.
        Allow non-QImode mem inputs.

From-SVN: r183497

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53d51d2161094c53aa4aa66969195e40849646dd..3581f4b593be74b964c729169d08c33c96f1865a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-25  Richard Henderson  <rth@redhat.com>
+
+       * optabs.c (maybe_emit_atomic_test_and_set): Allow non-QImode
+       mem inputs.
+
 2012-01-24  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * optabs.c (gen_atomic_test_and_set): Use each argument.

diff --git a/gcc/optabs.c b/gcc/optabs.c
index d9a93cc62908412b627adfe6d33100fb11636dd3..fb0132046535daca8fb376c4e1d0776ebcc17214 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -1,7 +1,7 @@
 /* Expand the basic unary and binary arithmetic operations, for GNU compiler.
    Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-   2011  Free Software Foundation, Inc.
+   2011, 2012  Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -7330,7 +7330,13 @@ maybe_emit_atomic_test_and_set (rtx target, rtx mem, enum memmodel model)
   /* ??? We only support test-and-set on single bytes at the moment.
      We'd have to change the builtin to allow wider memories.  */
   gcc_checking_assert (id->operand[1].mode == QImode);
-  gcc_checking_assert (GET_MODE (mem) == QImode);
+
+  /* While we always get QImode from __atomic_test_and_set, we get
+     other memory modes from __sync_lock_test_and_set.  Note that we
+     use no endian adjustment here.  This matches the 4.6 behavior
+     in the Sparc backend.  */
+  if (GET_MODE (mem) != QImode)
+    mem = adjust_address_nv (mem, QImode, 0);
 
   if (target == NULL || GET_MODE (target) != pat_bool_mode)
     target = gen_reg_rtx (pat_bool_mode);