Changeset 118a872 in mainline

Timestamp:

2016-05-23T17:34:27Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0a981e3

Parents:

b3364b7c

Message:

Fix amd64 not working properly. Clearly there is something to this alignment.

File:

• uspace/lib/c/generic/tls.c (modified) (3 diffs)

uspace/lib/c/generic/tls.c

@@ -36 +36 @@
  */
 
+#include <align.h>
 #include <tls.h>
 #include <malloc.h>
@@ -148 +149 @@
         tcb_t *tcb;
 
-        *data = malloc(sizeof(tcb_t) + size);
+        size = ALIGN_UP(size, &_tls_alignment);
+        *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
         if (*data == NULL)
                 return NULL;
@@ -167 +169 @@
 void tls_free_variant_2(tcb_t *tcb, size_t size)
 {
+        size = ALIGN_UP(size, &_tls_alignment);
         void *start = ((void *) tcb) - size;
         free(start);