NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
That fixes libatomic tests atomic-op-{1,2}.

gcc/
2018-09-04  Max Filippov  <jcmvb...@gmail.com>

        * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
        XOR operations in NAND case.
---
 gcc/config/xtensa/xtensa.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index 7cfe64d42895..b88556625223 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -1614,10 +1614,10 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, 
rtx mem, rtx val,
       break;
 
     case MULT: /* NAND */
-      tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
-                                NULL_RTX, 1, OPTAB_DIRECT);
-      tmp = expand_simple_binop (SImode, AND, tmp, val,
+      tmp = expand_simple_binop (SImode, AND, old, val,
                                 new_rtx, 1, OPTAB_DIRECT);
+      tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
+                                NULL_RTX, 1, OPTAB_DIRECT);
       break;
 
     default:
-- 
2.11.0

Reply via email to