Module Name: src
Committed By: joerg
Date: Sat Jun 28 20:18:55 UTC 2014
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_swap.S atomic_swap_16.S
atomic_swap_64.S
src/common/lib/libc/arch/m68k/atomic: atomic_swap.S
src/common/lib/libc/atomic: atomic_swap_16_cas.c atomic_swap_32_cas.c
atomic_swap_64_cas.c atomic_swap_8_cas.c
Log Message:
Add aliases for the C11/C++11 spelling of the CAS primitives.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/arch/arm/atomic/atomic_swap.S
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/m68k/atomic/atomic_swap.S
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/atomic/atomic_swap_16_cas.c \
src/common/lib/libc/atomic/atomic_swap_8_cas.c
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/atomic/atomic_swap_32_cas.c
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/atomic/atomic_swap_64_cas.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_swap.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.10 src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.11
--- src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.10 Tue Mar 4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap.S Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap.S,v 1.10 2014/03/04 16:15:28 matt Exp $ */
+/* $NetBSD: atomic_swap.S,v 1.11 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2007,2012 The NetBSD Foundation, Inc.
@@ -79,6 +79,7 @@ ATOMIC_OP_ALIAS(atomic_swap_uint,_atomic
ATOMIC_OP_ALIAS(atomic_swap_ulong,_atomic_swap_32)
ATOMIC_OP_ALIAS(atomic_swap_ptr,_atomic_swap_32)
CRT_ALIAS(__sync_lock_test_and_set_4,_atomic_swap_32)
+CRT_ALIAS(__atomic_exchange_4,_atomic_swap_32)
STRONG_ALIAS(_atomic_swap_uint,_atomic_swap_32)
STRONG_ALIAS(_atomic_swap_ulong,_atomic_swap_32)
STRONG_ALIAS(_atomic_swap_ptr,_atomic_swap_32)
@@ -115,6 +116,7 @@ ATOMIC_OP_ALIAS(atomic_swap_8,_atomic_sw
ATOMIC_OP_ALIAS(atomic_swap_char,_atomic_swap_8)
ATOMIC_OP_ALIAS(atomic_swap_uchar,_atomic_swap_8)
CRT_ALIAS(__sync_lock_test_and_set_1,_atomic_swap_8)
+CRT_ALIAS(__atomic_exchange_1,_atomic_swap_8)
STRONG_ALIAS(_atomic_swap_char,_atomic_swap_8)
STRONG_ALIAS(_atomic_swap_uchar,_atomic_swap_8)
Index: src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.2 src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.3
--- src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.2 Tue Mar 4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_16.S,v 1.2 2014/03/04 16:15:28 matt Exp $ */
+/* $NetBSD: atomic_swap_16.S,v 1.3 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -51,6 +51,7 @@ ATOMIC_OP_ALIAS(atomic_swap_16,_atomic_s
ATOMIC_OP_ALIAS(atomic_swap_short,_atomic_swap_16)
ATOMIC_OP_ALIAS(atomic_swap_ushort,_atomic_swap_16)
CRT_ALIAS(__sync_lock_test_and_set_2,_atomic_swap_16)
+CRT_ALIAS(__atomic_exchange_2,_atomic_swap_16)
STRONG_ALIAS(_atomic_swap_short,_atomic_swap_16)
STRONG_ALIAS(_atomic_swap_ushort,_atomic_swap_16)
Index: src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.8 src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.9
--- src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.8 Tue Mar 4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_64.S,v 1.8 2014/03/04 16:15:28 matt Exp $ */
+/* $NetBSD: atomic_swap_64.S,v 1.9 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -51,6 +51,7 @@ ENTRY_NP(_atomic_swap_64)
END(_atomic_swap_64)
ATOMIC_OP_ALIAS(atomic_swap_64,_atomic_swap_64)
CRT_ALIAS(__sync_lock_test_and_set_8,_atomic_swap_64)
+CRT_ALIAS(__atomic_exchange_8,_atomic_swap_64)
#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STANDALONE)
ENTRY_NP(__sync_lock_release_8)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_swap.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_swap.S:1.8 src/common/lib/libc/arch/m68k/atomic/atomic_swap.S:1.9
--- src/common/lib/libc/arch/m68k/atomic/atomic_swap.S:1.8 Sat Feb 22 17:08:30 2014
+++ src/common/lib/libc/arch/m68k/atomic/atomic_swap.S Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap.S,v 1.8 2014/02/22 17:08:30 martin Exp $ */
+/* $NetBSD: atomic_swap.S,v 1.9 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -51,6 +51,7 @@ STRONG_ALIAS(_atomic_swap_ulong,_atomic_
ATOMIC_OP_ALIAS(atomic_swap_ptr,_atomic_swap_32)
STRONG_ALIAS(_atomic_swap_ptr,_atomic_swap_32)
CRT_ALIAS(__sync_lock_test_and_set_4,_atomic_swap_32)
+CRT_ALIAS(__atomic_exchange_4,_atomic_swap_32)
ENTRY(_atomic_swap_16)
@@ -64,6 +65,7 @@ ENTRY(_atomic_swap_16)
END(_atomic_swap_16)
ATOMIC_OP_ALIAS(atomic_swap_16,_atomic_swap_16)
CRT_ALIAS(__sync_lock_test_and_set_2,_atomic_swap_16)
+CRT_ALIAS(__atomic_exchange_2,_atomic_swap_16)
ENTRY(_atomic_swap_8)
movl 4(%sp), %a0
@@ -76,3 +78,4 @@ ENTRY(_atomic_swap_8)
END(_atomic_swap_8)
ATOMIC_OP_ALIAS(atomic_swap_8,_atomic_swap_8)
CRT_ALIAS(__sync_lock_test_and_set_1,_atomic_swap_8)
+CRT_ALIAS(__atomic_exchange_1,_atomic_swap_8)
Index: src/common/lib/libc/atomic/atomic_swap_16_cas.c
diff -u src/common/lib/libc/atomic/atomic_swap_16_cas.c:1.2 src/common/lib/libc/atomic/atomic_swap_16_cas.c:1.3
--- src/common/lib/libc/atomic/atomic_swap_16_cas.c:1.2 Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_swap_16_cas.c Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_16_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+/* $NetBSD: atomic_swap_16_cas.c,v 1.3 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -48,3 +48,5 @@ atomic_swap_16(volatile uint16_t *addr,
return old;
}
+
+crt_alias(__atomic_exchange_2,__sync_lock_test_and_set_2)
Index: src/common/lib/libc/atomic/atomic_swap_8_cas.c
diff -u src/common/lib/libc/atomic/atomic_swap_8_cas.c:1.2 src/common/lib/libc/atomic/atomic_swap_8_cas.c:1.3
--- src/common/lib/libc/atomic/atomic_swap_8_cas.c:1.2 Fri Feb 21 15:51:07 2014
+++ src/common/lib/libc/atomic/atomic_swap_8_cas.c Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_8_cas.c,v 1.2 2014/02/21 15:51:07 martin Exp $ */
+/* $NetBSD: atomic_swap_8_cas.c,v 1.3 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -48,3 +48,5 @@ atomic_swap_8(volatile uint8_t *addr, ui
return old;
}
+
+crt_alias(__atomic_exchange_1,__sync_lock_test_and_set_1)
Index: src/common/lib/libc/atomic/atomic_swap_32_cas.c
diff -u src/common/lib/libc/atomic/atomic_swap_32_cas.c:1.6 src/common/lib/libc/atomic/atomic_swap_32_cas.c:1.7
--- src/common/lib/libc/atomic/atomic_swap_32_cas.c:1.6 Sat Feb 22 17:08:30 2014
+++ src/common/lib/libc/atomic/atomic_swap_32_cas.c Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_32_cas.c,v 1.6 2014/02/22 17:08:30 martin Exp $ */
+/* $NetBSD: atomic_swap_32_cas.c,v 1.7 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,6 +45,8 @@ atomic_swap_32(volatile uint32_t *addr,
return (old);
}
+crt_alias(__atomic_exchange_4,_atomic_swap_32)
+
#undef atomic_swap_32
atomic_op_alias(atomic_swap_32,_atomic_swap_32)
#undef atomic_swap_uint
Index: src/common/lib/libc/atomic/atomic_swap_64_cas.c
diff -u src/common/lib/libc/atomic/atomic_swap_64_cas.c:1.8 src/common/lib/libc/atomic/atomic_swap_64_cas.c:1.9
--- src/common/lib/libc/atomic/atomic_swap_64_cas.c:1.8 Sat Feb 22 17:08:30 2014
+++ src/common/lib/libc/atomic/atomic_swap_64_cas.c Sat Jun 28 20:18:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_64_cas.c,v 1.8 2014/02/22 17:08:30 martin Exp $ */
+/* $NetBSD: atomic_swap_64_cas.c,v 1.9 2014/06/28 20:18:55 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -47,6 +47,8 @@ atomic_swap_64(volatile uint64_t *addr,
return (old);
}
+crt_alias(__atomic_exchange_8,_atomic_swap_8)
+
#undef atomic_swap_64
atomic_op_alias(atomic_swap_64,_atomic_swap_64)
crt_alias(__sync_lock_test_and_set_8,_atomic_swap_64)
