Changeset 3a9414e in mainline

Timestamp:

2016-05-22T20:22:59Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f356618

Parents:

b272c67a

Message:

Do not touch dtv if CONFIG_RTLD is not enabled. Fixes non-ia32 builds.

File:

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

uspace/lib/c/generic/tls.c

@@ -97 +97 @@
 void tls_free(tcb_t *tcb)
 {
+#ifdef CONFIG_RTLD
         free(tcb->dtv);
+#endif
         tls_free_arch(tcb, tls_get_size());
 }
@@ -116 +118 @@
                 return NULL;
         *data = ((void *)tcb) + sizeof(tcb_t);
+#ifdef CONFIG_RTLD
         tcb->dtv = NULL;
+#endif
 
         return tcb;
@@ -149 +153 @@
         tcb = (tcb_t *) (*data + size);
         tcb->self = tcb;
+#ifdef CONFIG_RTLD
         tcb->dtv = NULL;
+#endif
 
         return tcb;