| From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001 |
| From: Max Filippov <jcmvbkbc@gmail.com> |
| Date: Tue, 4 Sep 2018 00:39:32 -0700 |
| 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 <jcmvbkbc@gmail.com> |
| |
| * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and |
| XOR operations in NAND case. |
| |
| Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> |
| Backported from: r264087 |
| --- |
| gcc/config/xtensa/xtensa.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c |
| index 7cfe64d42895..080bb4ad765d 100644 |
| --- a/gcc/config/xtensa/xtensa.c |
| +++ b/gcc/config/xtensa/xtensa.c |
| @@ -1614,9 +1614,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.11.0 |
| |