aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-05-29 18:39:06 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-06-17 09:29:01 -0300
commit112a0ae18b831bf31f44d81b82666980312511d6 (patch)
tree8296ec9b2cf3a21ed1012149c05dadb7fc5738c9 /sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h
parentdee07df1a40533f1f2856111946eafbd45b81dbe (diff)
downloadglibc-112a0ae18b831bf31f44d81b82666980312511d6.tar
glibc-112a0ae18b831bf31f44d81b82666980312511d6.tar.gz
glibc-112a0ae18b831bf31f44d81b82666980312511d6.tar.bz2
glibc-112a0ae18b831bf31f44d81b82666980312511d6.zip
m68k: Remove vDSO support
Although defined in initial TLS/NPTL ABI for m68k and ColdFire [1], kernel support was never pushed upstream. This patch removes the unused m68k vDSO support. Checked with a build against m68k and m68k-coldfire and some basic tests on ARAnyM. * sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines, sysdep-rtld-routines): Remove rules. * sysdeps/unix/sysv/linux/m68k/Versions (libc) [GLIBC_PRIVATE]: Remove __vdso_atomic_cmpxchg_32 and __vdso_atomic_barrier. (ld) [GLIBC_PRIVATE]: __rtld___vdso_read_tp, __rtld___vdso_atomic_cmpxchg_32, and __rtld___vdso_atomic_barrier. * sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h (atomic_compare_and_exchange_val_acq, atomic_full_barrier): Remove vDSO path for SHARED. * sysdeps/unix/sysv/linux/m68k/init-first.c: Remove file. * sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c: Likewise. * sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Likewise. * sysdeps/unix/sysv/linux/m68k/m68k-vdso.c: Likewise. * sysdeps/unix/sysv/linux/m68k/m68k-vdso.h: Likewise. * sysdeps/unix/sysv/linux/m68k/m68k-helpers.c: New file. [1] https://lists.debian.org/debian-68k/2007/11/msg00071.html
Diffstat (limited to 'sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h')
-rw-r--r--sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h45
1 files changed, 1 insertions, 44 deletions
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h b/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h
index 7465a98fef..0a2aa9ffa5 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h
@@ -21,7 +21,6 @@
#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. */
@@ -43,33 +42,7 @@ typedef uintmax_t uatomic_max_t;
#define ATOMIC_EXCHANGE_USES_CAS 1
/* 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) \
+#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
({ \
/* Use temporary variables to workaround call-clobberness of \
the registers. */ \
@@ -86,24 +59,8 @@ typedef uintmax_t uatomic_max_t;
: "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