From 6d447fc0b9d29d39525d458904ae90b7f3025842 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 4 Sep 2018 17:59:04 +0000 Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic 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 Backport from mainline 2018-09-04 Max Filippov * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and XOR operations in NAND case. From-SVN: r264090 --- gcc/ChangeLog | 8 ++++++++ gcc/config/xtensa/xtensa.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5d0115f5f64c..2b1bb83986ba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-09-04 Max Filippov + + Backport from mainline + 2018-09-04 Max Filippov + + * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and + XOR operations in NAND case. + 2018-09-04 Jonathan Wakely * doc/invoke.texi (Option Summary): Add -Waligned-new. diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c index 9bdf870a0fd1..db561e8feb78 100644 --- a/gcc/config/xtensa/xtensa.c +++ b/gcc/config/xtensa/xtensa.c @@ -1591,9 +1591,9 @@ 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, + tmp = expand_simple_binop (SImode, AND, old, val, NULL_RTX, 1, OPTAB_DIRECT); - tmp = expand_simple_binop (SImode, AND, tmp, val, + tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask, new_rtx, 1, OPTAB_DIRECT); break; -- 2.47.2