Index: uspace/lib/c/arch/amd64/src/rtld/dynamic.c =================================================================== --- uspace/lib/c/arch/amd64/src/rtld/dynamic.c (revision 8e3bc063a5dfbd66eac8ef26b7c6c10ca0924663) +++ uspace/lib/c/arch/amd64/src/rtld/dynamic.c (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -27,5 +27,5 @@ */ -/** @addtogroup libcia32 +/** @addtogroup libcamd64 * @brief * @{ Index: uspace/lib/c/arch/sparc64/Makefile.common =================================================================== --- uspace/lib/c/arch/sparc64/Makefile.common (revision 8e3bc063a5dfbd66eac8ef26b7c6c10ca0924663) +++ uspace/lib/c/arch/sparc64/Makefile.common (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -52,3 +52,6 @@ ifeq ($(PROCESSOR),sun4v) DEFS += -DSUN4V + COMMON_CFLAGS += -Wl,-z,max-page-size=0x2000 +else + COMMON_CFLAGS += -Wl,-z,max-page-size=0x4000 endif Index: uspace/lib/c/arch/sparc64/Makefile.inc =================================================================== --- uspace/lib/c/arch/sparc64/Makefile.inc (revision 8e3bc063a5dfbd66eac8ef26b7c6c10ca0924663) +++ uspace/lib/c/arch/sparc64/Makefile.inc (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -33,5 +33,7 @@ arch/$(UARCH)/src/tls.c \ arch/$(UARCH)/src/stacktrace.c \ - arch/$(UARCH)/src/stacktrace_asm.S + arch/$(UARCH)/src/stacktrace_asm.S \ + arch/$(UARCH)/src/rtld/dynamic.c \ + arch/$(UARCH)/src/rtld/reloc.c ARCH_AUTOCHECK_HEADERS = \ Index: uspace/lib/c/arch/sparc64/include/libarch/rtld/dynamic.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/rtld/dynamic.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) +++ uspace/lib/c/arch/sparc64/include/libarch/rtld/dynamic.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2019 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_RTLD_DYNAMIC_H_ +#define LIBC_sparc64_RTLD_DYNAMIC_H_ + +typedef struct { + /* Empty. */ +} dyn_info_arch_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/rtld/elf_dyn.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/rtld/elf_dyn.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) +++ uspace/lib/c/arch/sparc64/include/libarch/rtld/elf_dyn.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2019 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file sparc64 dynamic relocation types + */ + +#ifndef LIBC_sparc64_RTLD_ELF_DYN_H_ +#define LIBC_sparc64_RTLD_ELF_DYN_H_ + +#define R_SPARC_COPY 19 +#define R_SPARC_GLOB_DAT 20 +#define R_SPARC_JMP_SLOT 21 +#define R_SPARC_RELATIVE 22 +#define R_SPARC_64 32 +#define R_SPARC_TLS_DTPMOD64 75 +#define R_SPARC_TLS_DTPOFF64 77 +#define R_SPARC_TLS_TPOFF64 79 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/rtld/module.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/rtld/module.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) +++ uspace/lib/c/arch/sparc64/include/libarch/rtld/module.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2019 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_RTLD_MODULE_H_ +#define LIBC_sparc64_RTLD_MODULE_H_ + +#include + +/** ELF module load flags */ +#define RTLD_MODULE_LDF 0 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/tls.h (revision 8e3bc063a5dfbd66eac8ef26b7c6c10ca0924663) +++ uspace/lib/c/arch/sparc64/include/libarch/tls.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -46,4 +46,6 @@ void *self; void *fibril_data; + void **dtv; + void *pad; } tcb_t; Index: uspace/lib/c/arch/sparc64/src/rtld/dynamic.c =================================================================== --- uspace/lib/c/arch/sparc64/src/rtld/dynamic.c (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) +++ uspace/lib/c/arch/sparc64/src/rtld/dynamic.c (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2019 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @brief + * @{ + */ +/** + * @file + */ + +#include +#include + +#include +#include + +void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info) +{ + (void) dp; + (void) bias; + (void) info; +} + +/** @} + */ Index: uspace/lib/c/arch/sparc64/src/rtld/reloc.c =================================================================== --- uspace/lib/c/arch/sparc64/src/rtld/reloc.c (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) +++ uspace/lib/c/arch/sparc64/src/rtld/reloc.c (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -0,0 +1,303 @@ +/* + * Copyright (c) 2019 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @brief + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +static void fill_plt_entry_generic(uint32_t *, uintptr_t); + +void module_process_pre_arch(module_t *m) +{ + /* Unused */ +} + +/** + * Process (fixup) all relocations in a relocation table with implicit addends. + */ +void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size) +{ + + DPRINTF("rel table address: 0x%zx, size: %zd\n", (uintptr_t)rt, rt_size); + /* Unused */ + (void)m; + (void)rt; + (void)rt_size; +} + +/** + * Process (fixup) all relocations in a relocation table with explicit addends. + */ +void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size) +{ + unsigned i; + + size_t rt_entries; + size_t r_offset; + size_t r_addend; + elf_xword r_info; + unsigned rel_type; + elf_word sym_idx; + uintptr_t sym_addr; + + elf_symbol_t *sym_table; + elf_symbol_t *sym; + uintptr_t *r_ptr; + uintptr_t sym_size; + char *str_tab; + + elf_symbol_t *sym_def; + module_t *dest; + + DPRINTF("parse relocation table\n"); + + sym_table = m->dyn.sym_tab; + rt_entries = rt_size / sizeof(elf_rela_t); + str_tab = m->dyn.str_tab; + + DPRINTF("rel table address: 0x%zx, entries: %zd\n", (uintptr_t)rt, rt_entries); + + for (i = 0; i < rt_entries; ++i) { +#if 0 + DPRINTF("symbol %d: ", i); +#endif + r_offset = rt[i].r_offset; + r_info = rt[i].r_info; + r_addend = rt[i].r_addend; + + sym_idx = ELF64_R_SYM(r_info); + sym = &sym_table[sym_idx]; + +#if 0 + DPRINTF("name '%s', value 0x%x, size 0x%x\n", + str_tab + sym->st_name, + sym->st_value, + sym->st_size); +#endif + rel_type = ELF64_R_TYPE(r_info); + r_ptr = (uintptr_t *)(r_offset + m->bias); + + if (sym->st_name != 0) { + DPRINTF("rel_type: %x, rel_offset: 0x%zx\n", rel_type, r_offset); + sym_def = symbol_def_find(str_tab + sym->st_name, + m, ssf_none, &dest); + DPRINTF("dest name: '%s'\n", dest->dyn.soname); + DPRINTF("dest bias: 0x%zx\n", dest->bias); + if (sym_def) { + sym_addr = (uintptr_t) + symbol_get_addr(sym_def, dest, NULL); + DPRINTF("symbol definition found, value=0x%zx addr=0x%zx\n", sym_def->st_value, sym_addr); + } else { + printf("Definition of '%s' not found.\n", + str_tab + sym->st_name); + continue; + } + } else { + sym_addr = 0; + sym_def = NULL; + + /* + * DTPMOD with null st_name should return the index + * of the current module. + */ + dest = m; + } + + switch (rel_type) { + case R_SPARC_COPY: + /* + * Copy symbol data from shared object to specified + * location. Need to find the 'source', i.e. the + * other instance of the object than the one in the + * executable program. + */ + DPRINTF("fixup R_SPARC_COPY (s)\n"); + + sym_def = symbol_def_find(str_tab + sym->st_name, + m, ssf_noexec, &dest); + + if (sym_def) { + sym_addr = (uintptr_t) + symbol_get_addr(sym_def, dest, NULL); + } else { + printf("Source definition of '%s' not found.\n", + str_tab + sym->st_name); + continue; + } + + sym_size = sym->st_size; + if (sym_size != sym_def->st_size) { + printf("Warning: Mismatched symbol sizes.\n"); + /* Take the lower value. */ + if (sym_size > sym_def->st_size) + sym_size = sym_def->st_size; + } + + memcpy(r_ptr, (const void *)sym_addr, sym_size); + DPRINTF("OK\n"); + break; + + case R_SPARC_GLOB_DAT: + DPRINTF("fixup R_SPARC_GLOB_DAT (S+A)\n"); + DPRINTF("*0x%zx = 0x%zx\n", (uintptr_t)r_ptr, sym_addr); + *r_ptr = sym_addr + r_addend; + DPRINTF("OK\n"); + break; + + case R_SPARC_JMP_SLOT: + DPRINTF("fixup R_SPARC_JMP_SLOT (S)\n"); + DPRINTF("r_offset=0x%zx r_addend=0x%zx\n", + r_offset, r_addend); + + sym_def = symbol_def_find(str_tab + sym->st_name, + m, ssf_noexec, &dest); + + if (sym_def) { + sym_addr = (uintptr_t) + symbol_get_addr(sym_def, dest, NULL); + } else { + printf("Source definition of '%s' not found.\n", + str_tab + sym->st_name); + continue; + } + + sym_size = sym->st_size; + if (sym_size != sym_def->st_size) { + printf("Warning: Mismatched symbol sizes.\n"); + /* Take the lower value. */ + if (sym_size > sym_def->st_size) + sym_size = sym_def->st_size; + } + + DPRINTF("sym_addr = 0x%zx\n", sym_addr); + DPRINTF("r_offset=0x%zx\n", r_offset); + + /* + * Fill PLT entry with jump to symbol address. + * r_ptr points to the PLT entry, sym_addr contains + * address of the symbol. + */ + fill_plt_entry_generic((uint32_t *)r_ptr, sym_addr); + smc_coherence(r_ptr, 32); + + DPRINTF("OK\n"); + break; + + case R_SPARC_RELATIVE: + DPRINTF("fixup R_SPARC_RELATIVE (B+A)\n"); + DPRINTF("*0x%zx = 0x%zx\n", (uintptr_t)r_ptr, m->bias + r_addend); + *r_ptr = m->bias + r_addend; + DPRINTF("OK\n"); + break; + + case R_SPARC_64: + DPRINTF("fixup R_SPARC_64 (S+A)\n"); + DPRINTF("*0x%zx = 0x%zx\n", (uintptr_t)r_ptr, sym_addr); + *r_ptr = sym_addr + r_addend; + DPRINTF("OK\n"); + break; + + case R_SPARC_TLS_DTPMOD64: + DPRINTF("fixup R_SPARC_TLS_DTPMOD64\n"); + DPRINTF("*0x%zx = 0x%zx\n", (uintptr_t)r_ptr, (size_t)dest->id); + *r_ptr = dest->id; + DPRINTF("OK\n"); + break; + + case R_SPARC_TLS_DTPOFF64: + DPRINTF("fixup R_SPARC_TLS_DTPOFF64\n"); + DPRINTF("*0x%zx = 0x%zx\n", (uintptr_t)r_ptr, sym_def->st_value); + *r_ptr = sym_def->st_value; + DPRINTF("OK\n"); + break; + + case R_SPARC_TLS_TPOFF64: + DPRINTF("fixup R_SPARC_TLS_TPOFF64\n"); + *r_ptr = sym_def->st_value + dest->tpoff; + break; + + default: + printf("Error: Unknown relocation type %d\n", + rel_type); + exit(1); + } + + } +} + +/** Fill in generic PLT entry. + * + * Fill a PLT entry with SPARC instructions to jump to the specified + * address. + * + * @param plte Pointer to PLT entry to fill in + * @param ta Target address of the jump + */ +static void fill_plt_entry_generic(uint32_t *plte, uintptr_t ta) +{ + uint32_t hh, lm, hm, lo; + + hh = BIT_RANGE_EXTRACT(uintptr_t, 63, 42, ta); + hm = BIT_RANGE_EXTRACT(uintptr_t, 41, 32, ta); + lm = BIT_RANGE_EXTRACT(uintptr_t, 31, 10, ta); + lo = BIT_RANGE_EXTRACT(uintptr_t, 9, 0, ta); + + plte[0] = 0x01000000; /* nop */ + plte[1] = 0x03000000 | hh; /* sethi %hh(target), %g1 */ + plte[2] = 0x0b000000 | lm; /* sethi %lm(target), %g5 */ + plte[3] = 0x82106000 | hm; /* or %g1, %hm(target), %g1 */ + plte[4] = 0x83287020; /* sllx %g1, 32, %g1 */ + plte[5] = 0x8a104005; /* or %g1, %g5, %g5 */ + plte[6] = 0x81c16000 | lo; /* jmpl %g5+lo(target),%g0 */ + plte[7] = 0x01000000; /* nop */ + + DPRINTF("Fill PTL entry at %p (target=0x%zx)\n", + plte, ta); + for (unsigned i = 0; i < 8; i++) { + DPRINTF(" - [%d] = 0x%08x\n", i, plte[i]); + } +} + +/** @} + */ Index: uspace/lib/c/arch/sparc64/src/tls.c =================================================================== --- uspace/lib/c/arch/sparc64/src/tls.c (revision 8e3bc063a5dfbd66eac8ef26b7c6c10ca0924663) +++ uspace/lib/c/arch/sparc64/src/tls.c (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -38,4 +38,8 @@ #include +#ifdef CONFIG_RTLD +#include +#endif + tcb_t *tls_alloc_arch(size_t size, size_t align) { @@ -48,4 +52,30 @@ } +/* + * Rtld TLS support + */ + +typedef struct { + unsigned long int ti_module; + unsigned long int ti_offset; +} tls_index; + +void *__tls_get_addr(tls_index *ti); + +void *__tls_get_addr(tls_index *ti) +{ + uint8_t *tls; + +#ifdef CONFIG_RTLD + if (runtime_env != NULL) { + return rtld_tls_get_addr(runtime_env, __tcb_get(), + ti->ti_module, ti->ti_offset); + } +#endif + /* Get address of static TLS block */ + tls = tls_get(); + return tls + ti->ti_offset; +} + /** @} */ Index: uspace/lib/c/generic/elf/elf_mod.c =================================================================== --- uspace/lib/c/generic/elf/elf_mod.c (revision 8e3bc063a5dfbd66eac8ef26b7c6c10ca0924663) +++ uspace/lib/c/generic/elf/elf_mod.c (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -420,5 +420,7 @@ seg_ptr = (void *) seg_addr; - DPRINTF("Load segment at addr %p, size 0x%zx, flags %c%c%c\n", (void *) seg_addr, + DPRINTF("Load segment v_addr=0x%zx at addr %p, size 0x%zx, flags %c%c%c\n", + entry->p_vaddr, + (void *) seg_addr, entry->p_memsz, (entry->p_flags & PF_R) ? 'r' : '-', @@ -430,7 +432,7 @@ (seg_addr % entry->p_align)) { DPRINTF("Align check 1 failed offset%%align=0x%zx, " - "vaddr%%align=0x%zx\n", + "vaddr%%align=0x%zx align=0x%zx\n", entry->p_offset % entry->p_align, - seg_addr % entry->p_align); + seg_addr % entry->p_align, entry->p_align); return EE_INVALID; } Index: uspace/lib/c/include/smc.h =================================================================== --- uspace/lib/c/include/smc.h (revision 8e3bc063a5dfbd66eac8ef26b7c6c10ca0924663) +++ uspace/lib/c/include/smc.h (revision 1c3c287faa0cdc5e3cedcbfc47dc2ffd4b4e73bd) @@ -36,4 +36,5 @@ #define LIBC_SMC_H_ +#include #include