From a3bdcd93764ba514ca83ccbc5c85fefaf18d31d7 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 8 Jul 2012 00:05:08 -0400 Subject: [PATCH] remove little-endian assumption from arm atomic.h this hidden endian dependency had left big endian arm badly broken. --- arch/arm/atomic.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/atomic.h b/arch/arm/atomic.h index 8dc31b2e..f434a0c6 100644 --- a/arch/arm/atomic.h +++ b/arch/arm/atomic.h @@ -99,14 +99,16 @@ static inline void a_or(volatile int *p, int v) static inline void a_and_64(volatile uint64_t *p, uint64_t v) { - a_and((int *)p, v); - a_and((int *)p+1, v>>32); + union { uint64_t v; uint32_t r[2]; } u = { v }; + a_and((int *)p, u.r[0]); + a_and((int *)p+1, u.r[1]); } static inline void a_or_64(volatile uint64_t *p, uint64_t v) { - a_or((int *)p, v); - a_or((int *)p+1, v>>32); + union { uint64_t v; uint32_t r[2]; } u = { v }; + a_or((int *)p, u.r[0]); + a_or((int *)p+1, u.r[1]); } #endif -- 2.25.1