From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sun, 23 Sep 2018 17:16:53 +0000 (+0100)
Subject: u-armel-atomics-nand
X-Git-Tag: archive/raspbian/1.29.0+dfsg1-1+rpi1~1^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=16ed754273695cd565d30867b141c32ac5ec3ca6;p=rustc.git

u-armel-atomics-nand


Gbp-Pq: Name u-armel-atomics-nand.patch
---

diff --git a/src/libcompiler_builtins/src/arm_linux.rs b/src/libcompiler_builtins/src/arm_linux.rs
index 2291edf9f1..5ed379fa1e 100644
--- a/src/libcompiler_builtins/src/arm_linux.rs
+++ b/src/libcompiler_builtins/src/arm_linux.rs
@@ -125,9 +125,9 @@ atomic_rmw!(__sync_fetch_and_xor_1, u8, |a: u8, b: u8| a ^ b);
 atomic_rmw!(__sync_fetch_and_xor_2, u16, |a: u16, b: u16| a ^ b);
 atomic_rmw!(__sync_fetch_and_xor_4, u32, |a: u32, b: u32| a ^ b);
 
-atomic_rmw!(__sync_fetch_and_nand_1, u8, |a: u8, b: u8| !a & b);
-atomic_rmw!(__sync_fetch_and_nand_2, u16, |a: u16, b: u16| !a & b);
-atomic_rmw!(__sync_fetch_and_nand_4, u32, |a: u32, b: u32| !a & b);
+atomic_rmw!(__sync_fetch_and_nand_1, u8, |a: u8, b: u8| !(a & b));
+atomic_rmw!(__sync_fetch_and_nand_2, u16, |a: u16, b: u16| !(a & b));
+atomic_rmw!(__sync_fetch_and_nand_4, u32, |a: u32, b: u32| !(a & b));
 
 atomic_rmw!(__sync_fetch_and_max_1, i8, |a: i8, b: i8| if a > b { a } else { b });
 atomic_rmw!(__sync_fetch_and_max_2, i16, |a: i16, b: i16| if a > b { a } else { b });