mirror of
https://sourceware.org/git/glibc.git
synced 2025-05-07 07:21:47 +03:00
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>.
107 lines
3.7 KiB
C
107 lines
3.7 KiB
C
/* Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
|
|
|
|
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 _ATOMIC_MACHINE_H
|
|
#define _ATOMIC_MACHINE_H 1
|
|
|
|
#include <stdint.h>
|
|
#include <sysdep.h>
|
|
#include <m68k-vdso.h>
|
|
|
|
/* Coldfire has no atomic compare-and-exchange operation, but the
|
|
kernel provides userspace atomicity operations. Use them. */
|
|
|
|
typedef int32_t atomic32_t;
|
|
typedef uint32_t uatomic32_t;
|
|
typedef int_fast32_t atomic_fast32_t;
|
|
typedef uint_fast32_t uatomic_fast32_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 0
|
|
#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
|
/* The only basic operation needed is compare and exchange. */
|
|
/* For ColdFire we'll have to trap into the kernel mode anyway,
|
|
so trap from the library rather then from the kernel wrapper. */
|
|
#ifdef SHARED
|
|
# define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
|
|
({ \
|
|
/* Use temporary variables to workaround call-clobberness of \
|
|
the registers. */ \
|
|
__typeof (mem) _mem = mem; \
|
|
__typeof (oldval) _oldval = oldval; \
|
|
__typeof (newval) _newval = newval; \
|
|
register uint32_t *_a0 asm ("a0") = (uint32_t *) _mem; \
|
|
register uint32_t _d0 asm ("d0") = (uint32_t) _oldval; \
|
|
register uint32_t _d1 asm ("d1") = (uint32_t) _newval; \
|
|
void *tmp; \
|
|
\
|
|
asm ("movel #_GLOBAL_OFFSET_TABLE_@GOTPC, %2\n\t" \
|
|
"lea (-6, %%pc, %2), %2\n\t" \
|
|
"movel " STR_M68K_VDSO_SYMBOL (__vdso_atomic_cmpxchg_32) \
|
|
"@GOT(%2), %2\n\t" \
|
|
"movel (%2), %2\n\t" \
|
|
"jsr (%2)\n\t" \
|
|
: "+d" (_d0), "+m" (*_a0), "=&a" (tmp) \
|
|
: "a" (_a0), "d" (_d1)); \
|
|
(__typeof (oldval)) _d0; \
|
|
})
|
|
#else
|
|
# define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
|
|
({ \
|
|
/* Use temporary variables to workaround call-clobberness of \
|
|
the registers. */ \
|
|
__typeof (mem) _mem = mem; \
|
|
__typeof (oldval) _oldval = oldval; \
|
|
__typeof (newval) _newval = newval; \
|
|
register uint32_t _d0 asm ("d0") = SYS_ify (atomic_cmpxchg_32); \
|
|
register uint32_t *_a0 asm ("a0") = (uint32_t *) _mem; \
|
|
register uint32_t _d2 asm ("d2") = (uint32_t) _oldval; \
|
|
register uint32_t _d1 asm ("d1") = (uint32_t) _newval; \
|
|
\
|
|
asm ("trap #0" \
|
|
: "+d" (_d0), "+m" (*_a0) \
|
|
: "a" (_a0), "d" (_d2), "d" (_d1)); \
|
|
(__typeof (oldval)) _d0; \
|
|
})
|
|
#endif
|
|
|
|
#ifdef SHARED
|
|
# define atomic_full_barrier() \
|
|
({ \
|
|
void *tmp; \
|
|
\
|
|
asm ("movel #_GLOBAL_OFFSET_TABLE_@GOTPC, %0\n\t" \
|
|
"lea (-6, %pc, %0), %0\n\t" \
|
|
"movel " STR_M68K_VDSO_SYMBOL (__vdso_atomic_barrier) \
|
|
"@GOT(%0), %0\n\t" \
|
|
"movel (%0), %0\n\t" \
|
|
"jsr (%0)\n\t" \
|
|
: "=&a" (tmp)); \
|
|
})
|
|
#else
|
|
# define atomic_full_barrier() \
|
|
(INTERNAL_SYSCALL (atomic_barrier, , 0), (void) 0)
|
|
#endif
|
|
|
|
#endif
|