mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 05:00:15 +00:00
de071d199a
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/atomic.h to atomic-machine.h to follow that convention. This is the only change in this series that needs to change the filename rather than simply removing a directory level (because both atomic.h and bits/atomic.h exist at present). Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * sysdeps/aarch64/bits/atomic.h: Move to ... * sysdeps/aarch64/atomic-machine.h: ...here. (_AARCH64_BITS_ATOMIC_H): Rename macro to _AARCH64_ATOMIC_MACHINE_H. * sysdeps/alpha/bits/atomic.h: Move to ... * sysdeps/alpha/atomic-machine.h: ...here. * sysdeps/arm/bits/atomic.h: Move to ... * sysdeps/arm/atomic-machine.h: ...here. Update comments. * bits/atomic.h: Move to ... * sysdeps/generic/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/i386/bits/atomic.h: Move to ... * sysdeps/i386/atomic-machine.h: ...here. * sysdeps/ia64/bits/atomic.h: Move to ... * sysdeps/ia64/atomic-machine.h: ...here. * sysdeps/m68k/coldfire/bits/atomic.h: Move to ... * sysdeps/m68k/coldfire/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/m68k/m680x0/m68020/bits/atomic.h: Move to ... * sysdeps/m68k/m680x0/m68020/atomic-machine.h: ...here. * sysdeps/microblaze/bits/atomic.h: Move to ... * sysdeps/microblaze/atomic-machine.h: ...here. * sysdeps/mips/bits/atomic.h: Move to ... * sysdeps/mips/atomic-machine.h: ...here. (_MIPS_BITS_ATOMIC_H): Rename macro to _MIPS_ATOMIC_MACHINE_H. * sysdeps/powerpc/bits/atomic.h: Move to ... * sysdeps/powerpc/atomic-machine.h: ...here. Update comments. * sysdeps/powerpc/powerpc32/bits/atomic.h: Move to ... * sysdeps/powerpc/powerpc32/atomic-machine.h: ...here. Update comments. Include <atomic-machine.h> instead of <bits/atomic.h>. * sysdeps/powerpc/powerpc64/bits/atomic.h: Move to ... * sysdeps/powerpc/powerpc64/atomic-machine.h: ...here. Include <atomic-machine.h> instead of <bits/atomic.h>. * sysdeps/s390/bits/atomic.h: Move to ... * sysdeps/s390/atomic-machine.h: ...here. * sysdeps/sparc/sparc32/bits/atomic.h: Move to ... * sysdeps/sparc/sparc32/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/sparc/sparc32/sparcv9/bits/atomic.h: Move to ... * sysdeps/sparc/sparc32/sparcv9/atomic-machine.h: ...here. * sysdeps/sparc/sparc64/bits/atomic.h: Move to ... * sysdeps/sparc/sparc64/atomic-machine.h: ...here. * sysdeps/tile/bits/atomic.h: Move to ... * sysdeps/tile/atomic-machine.h: ...here. * sysdeps/tile/tilegx/bits/atomic.h: Move to ... * sysdeps/tile/tilegx/atomic-machine.h: ...here. Include <sysdeps/tile/atomic-machine.h> instead of <sysdeps/tile/bits/atomic.h>. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/tile/tilepro/bits/atomic.h: Move to ... * sysdeps/tile/tilepro/atomic-machine.h: ...here. Include <sysdeps/tile/atomic-machine.h> instead of <sysdeps/tile/bits/atomic.h>. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/arm/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/arm/atomic-machine.h: ...here. Include <sysdeps/arm/atomic-machine.h> instead of <sysdeps/arm/bits/atomic.h>. * sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/hppa/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/nios2/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/nios2/atomic-machine.h: ...here. (_NIOS2_BITS_ATOMIC_H): Rename macro to _NIOS2_ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/sh/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/sh/atomic-machine.h: ...here. * sysdeps/x86_64/bits/atomic.h: Move to ... * sysdeps/x86_64/atomic-machine.h: ...here. * include/atomic.h: Include <atomic-machine.h> instead of <bits/atomic.h>.
174 lines
5.7 KiB
C
174 lines
5.7 KiB
C
/* Copyright (C) 2003-2015 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _AARCH64_ATOMIC_MACHINE_H
|
|
#define _AARCH64_ATOMIC_MACHINE_H 1
|
|
|
|
#include <stdint.h>
|
|
|
|
typedef int8_t atomic8_t;
|
|
typedef int16_t atomic16_t;
|
|
typedef int32_t atomic32_t;
|
|
typedef int64_t atomic64_t;
|
|
|
|
typedef uint8_t uatomic8_t;
|
|
typedef uint16_t uatomic16_t;
|
|
typedef uint32_t uatomic32_t;
|
|
typedef uint64_t uatomic64_t;
|
|
|
|
typedef intptr_t atomicptr_t;
|
|
typedef uintptr_t uatomicptr_t;
|
|
typedef intmax_t atomic_max_t;
|
|
typedef uintmax_t uatomic_max_t;
|
|
|
|
#define __HAVE_64B_ATOMICS 1
|
|
#define USE_ATOMIC_COMPILER_BUILTINS 1
|
|
|
|
/* Compare and exchange.
|
|
For all "bool" routines, we return FALSE if exchange succesful. */
|
|
|
|
# define __arch_compare_and_exchange_bool_8_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
!__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
})
|
|
|
|
# define __arch_compare_and_exchange_bool_16_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
!__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
})
|
|
|
|
# define __arch_compare_and_exchange_bool_32_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
!__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
})
|
|
|
|
# define __arch_compare_and_exchange_bool_64_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
!__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
})
|
|
|
|
# define __arch_compare_and_exchange_val_8_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
__oldval; \
|
|
})
|
|
|
|
# define __arch_compare_and_exchange_val_16_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
__oldval; \
|
|
})
|
|
|
|
# define __arch_compare_and_exchange_val_32_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
__oldval; \
|
|
})
|
|
|
|
# define __arch_compare_and_exchange_val_64_int(mem, newval, oldval, model) \
|
|
({ \
|
|
typeof (*mem) __oldval = (oldval); \
|
|
__atomic_compare_exchange_n (mem, (void *) &__oldval, newval, 0, \
|
|
model, __ATOMIC_RELAXED); \
|
|
__oldval; \
|
|
})
|
|
|
|
|
|
/* Compare and exchange with "acquire" semantics, ie barrier after. */
|
|
|
|
# define atomic_compare_and_exchange_bool_acq(mem, new, old) \
|
|
__atomic_bool_bysize (__arch_compare_and_exchange_bool, int, \
|
|
mem, new, old, __ATOMIC_ACQUIRE)
|
|
|
|
# define atomic_compare_and_exchange_val_acq(mem, new, old) \
|
|
__atomic_val_bysize (__arch_compare_and_exchange_val, int, \
|
|
mem, new, old, __ATOMIC_ACQUIRE)
|
|
|
|
/* Compare and exchange with "release" semantics, ie barrier before. */
|
|
|
|
# define atomic_compare_and_exchange_bool_rel(mem, new, old) \
|
|
__atomic_bool_bysize (__arch_compare_and_exchange_bool, int, \
|
|
mem, new, old, __ATOMIC_RELEASE)
|
|
|
|
# define atomic_compare_and_exchange_val_rel(mem, new, old) \
|
|
__atomic_val_bysize (__arch_compare_and_exchange_val, int, \
|
|
mem, new, old, __ATOMIC_RELEASE)
|
|
|
|
|
|
/* Atomic exchange (without compare). */
|
|
|
|
# define __arch_exchange_8_int(mem, newval, model) \
|
|
__atomic_exchange_n (mem, newval, model)
|
|
|
|
# define __arch_exchange_16_int(mem, newval, model) \
|
|
__atomic_exchange_n (mem, newval, model)
|
|
|
|
# define __arch_exchange_32_int(mem, newval, model) \
|
|
__atomic_exchange_n (mem, newval, model)
|
|
|
|
# define __arch_exchange_64_int(mem, newval, model) \
|
|
__atomic_exchange_n (mem, newval, model)
|
|
|
|
# define atomic_exchange_acq(mem, value) \
|
|
__atomic_val_bysize (__arch_exchange, int, mem, value, __ATOMIC_ACQUIRE)
|
|
|
|
# define atomic_exchange_rel(mem, value) \
|
|
__atomic_val_bysize (__arch_exchange, int, mem, value, __ATOMIC_RELEASE)
|
|
|
|
|
|
/* Atomically add value and return the previous (unincremented) value. */
|
|
|
|
# define __arch_exchange_and_add_8_int(mem, value, model) \
|
|
__atomic_fetch_add (mem, value, model)
|
|
|
|
# define __arch_exchange_and_add_16_int(mem, value, model) \
|
|
__atomic_fetch_add (mem, value, model)
|
|
|
|
# define __arch_exchange_and_add_32_int(mem, value, model) \
|
|
__atomic_fetch_add (mem, value, model)
|
|
|
|
# define __arch_exchange_and_add_64_int(mem, value, model) \
|
|
__atomic_fetch_add (mem, value, model)
|
|
|
|
# define atomic_exchange_and_add_acq(mem, value) \
|
|
__atomic_val_bysize (__arch_exchange_and_add, int, mem, value, \
|
|
__ATOMIC_ACQUIRE)
|
|
|
|
# define atomic_exchange_and_add_rel(mem, value) \
|
|
__atomic_val_bysize (__arch_exchange_and_add, int, mem, value, \
|
|
__ATOMIC_RELEASE)
|
|
|
|
/* Barrier macro. */
|
|
#define atomic_full_barrier() __sync_synchronize()
|
|
|
|
#endif
|