The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4d9488674f3a36a2d12d11cad170cb1bd1c14a6d
commit 4d9488674f3a36a2d12d11cad170cb1bd1c14a6d
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2021-04-07 10:29:03 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2021-04-08 07:52:54 +0000
Remove the last users of ARM_TP_ADDRESS
This was only needed on 32-bit arm prior to ARMv6. As we only support
ARMv6 or later remove it.
Reviewed by: mannu
Sponsored by: Innovate UK
Differential Revision: https://reviews.freebsd.org/D29624
---
lib/libc/arm/gen/__aeabi_read_tp.S | 10 ----------
lib/libc/arm/gen/_set_tp.c | 4 ----
lib/libc/arm/static_tls.h | 4 ----
lib/libthr/arch/arm/include/pthread_md.h | 8 --------
libexec/rtld-elf/arm/reloc.c | 14 --------------
5 files changed, 40 deletions(-)
diff --git a/lib/libc/arm/gen/__aeabi_read_tp.S
b/lib/libc/arm/gen/__aeabi_read_tp.S
index 224d6a632185..6229c951b344 100644
--- a/lib/libc/arm/gen/__aeabi_read_tp.S
+++ b/lib/libc/arm/gen/__aeabi_read_tp.S
@@ -31,18 +31,8 @@ __FBSDID("$FreeBSD$");
#include <machine/sysarch.h>
ENTRY(__aeabi_read_tp)
-#ifdef ARM_TP_ADDRESS
- ldr r0, .Larm_tp_address
- ldr r0, [r0]
-#else
mrc p15, 0, r0, c13, c0, 3
-#endif
RET
END(__aeabi_read_tp)
-#ifdef ARM_TP_ADDRESS
-.Larm_tp_address:
- .word ARM_TP_ADDRESS
-#endif
-
.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/arm/gen/_set_tp.c b/lib/libc/arm/gen/_set_tp.c
index d0801d7444ba..1346ece5c9ef 100644
--- a/lib/libc/arm/gen/_set_tp.c
+++ b/lib/libc/arm/gen/_set_tp.c
@@ -38,9 +38,5 @@ void
_set_tp(void *tp)
{
-#ifdef ARM_TP_ADDRESS
- *((struct tcb **)ARM_TP_ADDRESS) = tp;
-#else
sysarch(ARM_SET_TP, tp);
-#endif
}
diff --git a/lib/libc/arm/static_tls.h b/lib/libc/arm/static_tls.h
index e6be9adfcff6..9f24cd4aae39 100644
--- a/lib/libc/arm/static_tls.h
+++ b/lib/libc/arm/static_tls.h
@@ -38,11 +38,7 @@ _libc_get_static_tls_base(size_t offset)
{
uintptr_t tlsbase;
-#ifdef ARM_TP_ADDRESS
- tlsbase = *(uintptr_t *)ARM_TP_ADDRESS;
-#else
__asm __volatile("mrc p15, 0, %0, c13, c0, 3" : "=r" (tlsbase));
-#endif
tlsbase += offset;
return (tlsbase);
diff --git a/lib/libthr/arch/arm/include/pthread_md.h
b/lib/libthr/arch/arm/include/pthread_md.h
index 55d93d0853bc..6f99eb7a139b 100644
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.h
@@ -54,11 +54,7 @@ struct tcb {
static __inline void
_tcb_set(struct tcb *tcb)
{
-#ifdef ARM_TP_ADDRESS
- *((struct tcb **)ARM_TP_ADDRESS) = tcb; /* avoids a system call */
-#else
sysarch(ARM_SET_TP, tcb);
-#endif
}
/*
@@ -67,15 +63,11 @@ _tcb_set(struct tcb *tcb)
static __inline struct tcb *
_tcb_get(void)
{
-#ifdef ARM_TP_ADDRESS
- return (*((struct tcb **)ARM_TP_ADDRESS));
-#else
struct tcb *tcb;
__asm __volatile("mrc p15, 0, %0, c13, c0, 3" \
: "=r" (tcb));
return (tcb);
-#endif
}
static __inline struct pthread *
diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c
index 7779169667be..4e551b0948ad 100644
--- a/libexec/rtld-elf/arm/reloc.c
+++ b/libexec/rtld-elf/arm/reloc.c
@@ -491,10 +491,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)]
__unused)
void
allocate_initial_tls(Obj_Entry *objs)
{
-#ifdef ARM_TP_ADDRESS
- void **_tp = (void **)ARM_TP_ADDRESS;
-#endif
-
/*
* Fix the size of the static TLS block by using the maximum
* offset allocated so far and adding a bit for dynamic modules to
@@ -503,27 +499,17 @@ allocate_initial_tls(Obj_Entry *objs)
tls_static_space = tls_last_offset + tls_last_size +
RTLD_STATIC_TLS_EXTRA;
-#ifdef ARM_TP_ADDRESS
- (*_tp) = (void *) allocate_tls(objs, NULL, TLS_TCB_SIZE, 8);
-#else
sysarch(ARM_SET_TP, allocate_tls(objs, NULL, TLS_TCB_SIZE, 8));
-#endif
}
void *
__tls_get_addr(tls_index* ti)
{
char *p;
-#ifdef ARM_TP_ADDRESS
- void **_tp = (void **)ARM_TP_ADDRESS;
-
- p = tls_get_addr_common((Elf_Addr **)(*_tp), ti->ti_module,
ti->ti_offset);
-#else
void *_tp;
__asm __volatile("mrc p15, 0, %0, c13, c0, 3" \
: "=r" (_tp));
p = tls_get_addr_common((Elf_Addr **)(_tp), ti->ti_module,
ti->ti_offset);
-#endif
return (p);
}
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
