Changeset f570cdf in mainline for uspace/lib/c/arch

Timestamp:

2016-05-24T15:32:57Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c170438

Parents:

dcc150cb (diff), 0a981e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Location:

uspace/lib/c/arch/ia32

Files:

• _link.ld.in (modified) (2 diffs)
• include/libarch/rtld/elf_dyn.h (modified) (2 diffs)
• include/libarch/tls.h (modified) (1 diff)
• src/rtld/reloc.c (modified) (4 diffs)
• src/tls.c (modified) (3 diffs)

uspace/lib/c/arch/ia32/_link.ld.in

@@ -12 +12 @@
 #endif
         data PT_LOAD FLAGS(6);
+        tls PT_TLS;
 #if defined(SHLIB) || defined(DLEXE)
         dynamic PT_DYNAMIC;
@@ -95 +96 @@
 #endif
         
+        .tdata : {
 #ifndef DLEXE
-        .tdata : {
                 _tdata_start = .;
+#endif
                 *(.tdata);
                 *(.gnu.linkonce.tb.*);
+#ifndef DLEXE
                 _tdata_end = .;
+#endif
+        } :data :tls
+        .tbss : {
+#ifndef DLEXE
                 _tbss_start = .;
+#endif
                 *(.tbss);
+#ifndef DLEXE
                 _tbss_end = .;
-        } :data
+#endif
+        } :data :tls
         
-        _tls_alignment = ALIGNOF(.tdata);
+#ifndef DLEXE
+        _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
 #endif
         

uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h

@@ -36 +36 @@
 #define LIBC_ia32_RTLD_ELF_DYN_H_
 
-/* 
+/*
  * ia32 dynamic relocation types
  */
@@ -47 +47 @@
 #define R_386_RELATIVE  8
 
+#define R_386_TLS_TPOFF    14
 #define R_386_TLS_DTPMOD32 35
+#define R_386_TLS_DTPOFF32 36
 
 #endif

uspace/lib/c/arch/ia32/include/libarch/tls.h

@@ -43 +43 @@
         void *self;
         void *fibril_data;
+        void **dtv;
 } tcb_t;
 

uspace/lib/c/arch/ia32/src/rtld/reloc.c

@@ -101 +101 @@
                         sym_def = symbol_def_find(str_tab + sym->st_name,
                             m, ssf_none, &dest);
-//                      DPRINTF("dest name: '%s'\n", dest->dyn.soname);
+                        DPRINTF("dest name: '%s'\n", dest->dyn.soname);
 //                      DPRINTF("dest bias: 0x%x\n", dest->bias);
                         if (sym_def) {
                                 sym_addr = (uint32_t)
-                                    symbol_get_addr(sym_def, dest);
+                                    symbol_get_addr(sym_def, dest, NULL);
 //                              DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
                         } else {
@@ -115 +115 @@
                         sym_addr = 0;
                         sym_def = NULL;
+
+                        /*
+                         * DTPMOD with null st_name should return the index
+                         * of the current module.
+                         */
+                        dest = m;
                 }
 
@@ -148 +154 @@
                         if (sym_def) {
                                 sym_addr = (uint32_t)
-                                    symbol_get_addr(sym_def, dest);
+                                    symbol_get_addr(sym_def, dest, NULL);
                         } else {
                                 printf("Source definition of '%s' not found.\n",
@@ -171 +177 @@
                         break;
 
+                case R_386_TLS_TPOFF:
+                        DPRINTF("fixup R_386_TLS_TPOFF\n");
+                        *r_ptr = (dest->ioffs + sym_def->st_value) - dest->rtld->tls_size;
+                        break;
+
+                case R_386_TLS_DTPOFF32:
+                        DPRINTF("fixup R_386_TLS_DTPOFF32\n");
+                        *r_ptr = sym_def->st_value;
+                        break;
+
                 case R_386_TLS_DTPMOD32:
-                        /*
-                         * We can ignore this as long as the only module
-                         * with TLS variables is libc.so.
-                         */
-                        DPRINTF("Ignoring R_386_TLS_DTPMOD32\n");
+                        DPRINTF("fixup R_386_TLS_DTPMOD32\n");
+                        *r_ptr = dest->id;
                         break;
 

uspace/lib/c/arch/ia32/src/tls.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2016 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +40 @@
 #include <align.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(void **data, size_t size)
 {
@@ -64 +69 @@
     *___tls_get_addr(tls_index *ti)
 {
-        size_t tls_size;
         uint8_t *tls;
 
-        /* Calculate size of TLS block */
-        tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment);
-
-        /* The TLS block is just before TCB */
-        tls = (uint8_t *)__tcb_get() - tls_size;
-
+#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;
 }