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

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

File:

• uspace/lib/c/arch/ia32/src/tls.c (modified) (3 diffs)

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;
 }