Changeset d5a89a3 in mainline for uspace/lib/c/arch/arm32/src/tls.c

Timestamp:

2019-02-11T22:31:04Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

File:

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

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

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2007 Pavel Jancik
  * All rights reserved.
@@ -38 +39 @@
 #include <stddef.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
@@ -48 +53 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+int __tls_debug = 0;
+
+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;
+}
+
 /** @}
  */