From 6534ecbd51e764aac27967e2ab16206071b65aec Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 17 Sep 2019 18:33:38 +0000 Subject: [PATCH] Pull up following revision(s) (requested by skrll in ticket #1375): common/lib/libc/arch/arm/atomic/atomic_xor_64.S: revision 1.4 common/lib/libc/arch/arm/atomic/atomic_or_64.S: revision 1.11 __sync_{,x}or_and_fetch_8 should return new value... make it so. --- common/lib/libc/arch/arm/atomic/atomic_or_64.S | 4 ++-- common/lib/libc/arch/arm/atomic/atomic_xor_64.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/lib/libc/arch/arm/atomic/atomic_or_64.S b/common/lib/libc/arch/arm/atomic/atomic_or_64.S index 818cde3cb027..d6724fa2fc40 100644 --- a/common/lib/libc/arch/arm/atomic/atomic_or_64.S +++ b/common/lib/libc/arch/arm/atomic/atomic_or_64.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_64.S,v 1.10 2014/03/04 16:15:28 matt Exp $ */ +/* $NetBSD: atomic_or_64.S,v 1.10.18.1 2019/09/17 18:33:38 martin Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -57,6 +57,6 @@ END(_atomic_or_64_nv) STRONG_ALIAS(_atomic_or_64,_atomic_or_64_nv) ATOMIC_OP_ALIAS(atomic_or_64_nv,_atomic_or_64_nv) ATOMIC_OP_ALIAS(atomic_or_64,_atomic_or_64) -CRT_ALIAS(__sync_or_and_fetch_8,_atomic_or_64) +CRT_ALIAS(__sync_or_and_fetch_8,_atomic_or_64_nv) #endif /* _ARM_ARCH_6 */ diff --git a/common/lib/libc/arch/arm/atomic/atomic_xor_64.S b/common/lib/libc/arch/arm/atomic/atomic_xor_64.S index 1c28a0e3b565..56af9449a6cb 100644 --- a/common/lib/libc/arch/arm/atomic/atomic_xor_64.S +++ b/common/lib/libc/arch/arm/atomic/atomic_xor_64.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_xor_64.S,v 1.3 2014/03/04 16:15:28 matt Exp $ */ +/* $NetBSD: atomic_xor_64.S,v 1.3.22.1 2019/09/17 18:33:38 martin Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. @@ -57,6 +57,6 @@ END(_atomic_xor_64_nv) STRONG_ALIAS(_atomic_xor_64,_atomic_xor_64_nv) ATOMIC_OP_ALIAS(atomic_xor_64_nv,_atomic_xor_64_nv) ATOMIC_OP_ALIAS(atomic_xor_64,_atomic_xor_64) -CRT_ALIAS(__sync_xor_and_fetch_8,_atomic_xor_64) +CRT_ALIAS(__sync_xor_and_fetch_8,_atomic_xor_64_nv) #endif /* _ARM_ARCH_6 */