Page MenuHomeFreeBSD
Files F149144960

D29624.id87012.diff
No OneTemporary
Actions

D29624.id87012.diff
View Options

diff --git a/lib/libc/arm/gen/__aeabi_read_tp.S b/lib/libc/arm/gen/__aeabi_read_tp.S
--- a/lib/libc/arm/gen/__aeabi_read_tp.S
+++ b/lib/libc/arm/gen/__aeabi_read_tp.S
@@ -31,18 +31,8 @@
#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
--- a/lib/libc/arm/gen/_set_tp.c
+++ b/lib/libc/arm/gen/_set_tp.c
@@ -38,9 +38,5 @@
_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
--- a/lib/libc/arm/static_tls.h
+++ b/lib/libc/arm/static_tls.h
@@ -38,11 +38,7 @@
{
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
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.h
@@ -54,11 +54,7 @@
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 @@
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
--- a/libexec/rtld-elf/arm/reloc.c
+++ b/libexec/rtld-elf/arm/reloc.c
@@ -491,10 +491,6 @@
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 @@
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);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 23, 1:30 PM (4 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30164179
Default Alt Text
D29624.id87012.diff (2 KB)

Event Timeline