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

Timestamp:

2011-05-17T07:44:17Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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 mainline changes

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

File:

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

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

@@ -37 +37 @@
 #include <tls.h>
 #include <sys/types.h>
+#include <align.h>
 
 tcb_t * __alloc_tls(void **data, size_t size)
@@ -48 +49 @@
 }
 
+/*
+ * 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)
+{
+        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;
+
+        return tls + ti->ti_offset;
+}
+
 /** @}
  */