Changeset d3e938c in mainline for uspace/lib/c/arch/amd64/src/tls.c

Timestamp:

2019-01-08T13:27:05Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

05cb995, 1567471, 1aa9eff, cdec2a1

Parents:

9c4df21

git-author:

Jiri Svoboda <jiri@…> (2018-01-07 22:27:02)

git-committer:

Jiri Svoboda <jiri@…> (2019-01-08 13:27:05)

Message:

Dynamic linking on amd64 (WIP)

After modifying HelenOS.config, it is possible to build with dynamic
linking support, but an attempt to load a shared library will fail.

File:

• uspace/lib/c/arch/amd64/src/tls.c (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <stddef.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
@@ -48 +52 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+void __attribute__((__regparm__(1)))
+    *__tls_get_addr(tls_index *ti);
+
+void __attribute__((__regparm__(1)))
+    *__tls_get_addr(tls_index *ti)
+{
+        uint8_t *tls;
+
+#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;
+}
+
 /** @}
  */