Changeset 91e4567 in mainline for uspace/lib/c/generic/tls.c

Timestamp:

2016-05-06T15:21:22Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0dc9a474

Parents:

7c4b26c

Message:

runtime_env must be set early, before calling fibril_setup.

File:

• uspace/lib/c/generic/tls.c (modified) (2 diffs)

uspace/lib/c/generic/tls.c

@@ -47 +47 @@
 size_t tls_get_size(void)
 {
+#ifdef CONFIG_RTLD
+        if (runtime_env != NULL)
+                return runtime_env->tls_size;
+#endif
         return &_tbss_end - &_tdata_start;
 }
@@ -83 +87 @@
 void tls_free(tcb_t *tcb)
 {
-        size_t tls_size = &_tbss_end - &_tdata_start;
-
-#ifdef CONFIG_RTLD
-        if (runtime_env != NULL)
-                tls_size = runtime_env->tls_size;
-#endif
-        tls_free_arch(tcb, tls_size);
+        tls_free_arch(tcb, tls_get_size());
 }