Changeset ffccdff0 in mainline for uspace/lib/c/generic/thread/tls.c
- Timestamp:
- 2020-06-15T13:29:29Z (4 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4f663f3e
- Parents:
- 128359eb
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/thread/tls.c
r128359eb rffccdff0 37 37 38 38 #include <assert.h> 39 #include <stdalign.h> 39 40 #include <stddef.h> 40 41 #include <align.h> … … 69 70 #else 70 71 size_t tls_size = tls ? tls->p_memsz : 0; 71 return -ALIGN_UP((ptrdiff_t) tls_size, max(tls_align, _Alignof(tcb_t)));72 return -ALIGN_UP((ptrdiff_t) tls_size, max(tls_align, alignof(tcb_t))); 72 73 #endif 73 74 } … … 104 105 #else 105 106 size_t alloc_size = 106 ALIGN_UP(tls_size, max(tls_align, _Alignof(tcb_t))) + sizeof(tcb_t);107 #endif 108 109 void *area = alloc(max(tls_align, _Alignof(tcb_t)), alloc_size);107 ALIGN_UP(tls_size, max(tls_align, alignof(tcb_t))) + sizeof(tcb_t); 108 #endif 109 110 void *area = alloc(max(tls_align, alignof(tcb_t)), alloc_size); 110 111 if (!area) 111 112 return NULL; … … 187 188 tls_free_arch(tcb, 188 189 ALIGN_UP(tls->p_memsz, tls->p_align) + sizeof(tcb_t), 189 max(tls->p_align, _Alignof(tcb_t)));190 max(tls->p_align, alignof(tcb_t))); 190 191 } 191 192
Note:
See TracChangeset
for help on using the changeset viewer.