Changeset f126c87 in mainline for uspace/lib/c/generic/tls.c

Timestamp:

2016-09-01T16:46:27Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

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

uspace/lib/c/generic/tls.c

@@ -74 +74 @@
         tcb_t *tcb;
         size_t tls_size = &_tbss_end - &_tdata_start;
-
+        
 #ifdef CONFIG_RTLD
         if (runtime_env != NULL)
                 return rtld_tls_make(runtime_env);
 #endif
+        
         tcb = tls_alloc_arch(&data, tls_size);
         if (!tcb)
                 return NULL;
-
+        
         /*
          * Copy thread local data from the initialization image.
@@ -118 +119 @@
         if (!tcb)
                 return NULL;
-        *data = ((void *)tcb) + sizeof(tcb_t);
+        
+        *data = ((void *) tcb) + sizeof(tcb_t);
 #ifdef CONFIG_RTLD
         tcb->dtv = NULL;
@@ -148 +150 @@
 {
         tcb_t *tcb;
-
+        
         size = ALIGN_UP(size, &_tls_alignment);
         *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);