Changeset 4f205248 in mainline for uspace/lib/c/arch/ia32/src

Timestamp:

2018-04-23T18:50:40Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

a2eb85d

Parents:

8d58fca

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-23 17:47:09)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-04-23 18:50:40)

Message:

Honor TLS alignment.

Location:

uspace/lib/c/arch/ia32/src

Files:

• rtld/reloc.c (modified) (1 diff)
• tls.c (modified) (1 diff)

uspace/lib/c/arch/ia32/src/rtld/reloc.c

@@ -181 +181 @@
                 case R_386_TLS_TPOFF:
                         DPRINTF("fixup R_386_TLS_TPOFF\n");
-                        *r_ptr = (dest->ioffs + sym_def->st_value) - dest->rtld->tls_size;
+                        *r_ptr = sym_def->st_value + dest->tpoff;
                         break;
 

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

@@ -45 +45 @@
 #endif
 
-tcb_t *tls_alloc_arch(void **data, size_t size)
+tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
-        return tls_alloc_variant_2(data, size);
+        return tls_alloc_variant_2(size, align);
 }
 
-void tls_free_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size, size_t align)
 {
-        tls_free_variant_2(tcb, size);
+        tls_free_variant_2(tcb, size, align);
 }