Changeset e2f26002 in mainline for uspace/lib/c/arch/ia32/src/tls.c

Timestamp:

2016-05-17T17:15:13Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d2bb25e7

Parents:

bab0f42

Message:

symbol_get_addr() must treat thread-local variables differently than normal variables.

File:

• uspace/lib/c/arch/ia32/src/tls.c (modified) (1 diff)

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

@@ -69 +69 @@
     *___tls_get_addr(tls_index *ti)
 {
-        size_t tls_size;
         uint8_t *tls;
-
-        /* Calculate size of TLS block */
-        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,
+                return rtld_tls_get_addr(runtime_env, ti->ti_module,
                     ti->ti_offset);
         }
 #endif
+        /* Get address of static TLS block */
+        tls = tls_get();
         return tls + ti->ti_offset;
 }