Author: gonzo
Date: Wed Aug 15 03:07:41 2012
New Revision: 239269
URL: http://svn.freebsd.org/changeset/base/239269
Log:
Merging of projects/armv6, part 2
Handle TLS for ARMv6 and ARMv7
Modified:
head/libexec/rtld-elf/arm/reloc.c
Modified: head/libexec/rtld-elf/arm/reloc.c
==============================================================================
--- head/libexec/rtld-elf/arm/reloc.c Wed Aug 15 03:03:03 2012
(r239268)
+++ head/libexec/rtld-elf/arm/reloc.c Wed Aug 15 03:07:41 2012
(r239269)
@@ -433,7 +433,9 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr
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
@@ -443,16 +445,27 @@ 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)
{
- void **_tp = (void **)ARM_TP_ADDRESS;
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);
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
