Changeset 6adb775f in mainline for uspace/lib/c/arch/ia32/src

Timestamp:

2016-04-25T16:46:31Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

32573ff

Parents:

dc0d8b52

Message:

TLS for dynamically linked executables and initially loaded DSOs (but must not call dlopen or there will be trouble).

Location:

uspace/lib/c/arch/ia32/src

Files:

• rtld/reloc.c (modified) (1 diff)
• tls.c (modified) (3 diffs)

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

@@ -171 +171 @@
                         break;
 
+//              case R_386_TLS_DTPOFF32:
+//                      *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");
+                        *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)
 {
@@ -68 +73 @@
 
         /* Calculate size of TLS block */
-        tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment);
+        tls_size = tls_get_size();
 
         /* 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, tls, ti->ti_module,
+                    ti->ti_offset);
+        }
+#endif
         return tls + ti->ti_offset;
 }