diff options
| author | gonzo <gonzo@FreeBSD.org> | 2012-02-14 00:16:34 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2012-02-14 00:16:34 +0000 |
| commit | ffed3e927facdeeac2d9422c67edbec8da0e3eee (patch) | |
| tree | be950d107f53a746241ac5ee66e31ecdab066bc4 /libexec/rtld-elf/rtld.c | |
| parent | 28bd45cae8effe3aa5c097eedb91a95fa2da2308 (diff) | |
| download | FreeBSD-src-ffed3e927facdeeac2d9422c67edbec8da0e3eee.zip FreeBSD-src-ffed3e927facdeeac2d9422c67edbec8da0e3eee.tar.gz | |
Add thread-local storage support for ARM to rtld-elf
Reviewed by: cognet
Obtained from: NetBSD
Diffstat (limited to 'libexec/rtld-elf/rtld.c')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 6980857..568d10b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3542,9 +3542,7 @@ tls_get_addr_common(Elf_Addr** dtvp, int index, size_t offset) return (void*) (dtv[index + 1] + offset); } -/* XXX not sure what variants to use for arm. */ - -#if defined(__ia64__) || defined(__powerpc__) || defined(__mips__) +#if defined(__arm__) || defined(__ia64__) || defined(__mips__) || defined(__powerpc__) /* * Allocate Static TLS using the Variant I method. @@ -3625,8 +3623,7 @@ free_tls(void *tcb, size_t tcbsize, size_t tcbalign) #endif -#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) +#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) /* * Allocate Static TLS using the Variant II method. |
