M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #219 - Amanieu:sync_val_compare_and_swap, r=alexcrichton 

Fix argument order for __sync_val_compare_and_swap

Fixes https://github.com/rust-lang/rust/issues/46822#issuecomment-353698138
This commit is contained in:
bors 2017-12-23 15:36:04 +00:00
parent 000d06a57a e8ea848785
commit 3a9ba44406
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arm_linux.rs
View File

@ -71,7 +71,7 @@ unsafe fn atomic_rmw<T, F: Fn(u32) -> u32>(ptr: *mut T, f: F) -> u32 {
} }
// Generic atomic compare-exchange operation // Generic atomic compare-exchange operation
unsafe fn atomic_cmpxchg<T>(oldval: u32, newval: u32, ptr: *mut T) -> u32 { unsafe fn atomic_cmpxchg<T>(ptr: *mut T, oldval: u32, newval: u32) -> u32 {
let aligned_ptr = align_ptr(ptr); let aligned_ptr = align_ptr(ptr);
let (shift, mask) = get_shift_mask(ptr); let (shift, mask) = get_shift_mask(ptr);
@ -99,8 +99,8 @@ macro_rules! atomic_rmw {
macro_rules! atomic_cmpxchg { macro_rules! atomic_cmpxchg {
($name:ident, $ty:ty) => { ($name:ident, $ty:ty) => {
#[cfg_attr(not(feature = "mangled-names"), no_mangle)] #[cfg_attr(not(feature = "mangled-names"), no_mangle)]
pub unsafe extern "C" fn $name(oldval: $ty, newval: $ty, ptr: *mut $ty) -> $ty { pub unsafe extern "C" fn $name(ptr: *mut $ty, oldval: $ty, newval: $ty) -> $ty {
atomic_cmpxchg(oldval as u32, newval as u32, ptr) as $ty atomic_cmpxchg(ptr, oldval as u32, newval as u32) as $ty
} }
} }
} }