Changeset 3e828ea in mainline for uspace/lib/c/arch/ia64/src/tls.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

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

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
@@ -37 +38 @@
 #include <tls.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
@@ -47 +52 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+void *__tls_get_addr(tls_index *ti);
+
+void *__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;
+}
+
 /** @}
  */