Module Name: src
Committed By: joerg
Date: Tue Nov 5 22:22:42 UTC 2019
Modified Files:
src/lib/libc/tls: tls.c
src/libexec/ld.elf_so: tls.c
Log Message:
Use alignof and not size_t for platforms with non-natural base
alignments.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/tls/tls.c
cvs rdiff -u -r1.13 -r1.14 src/libexec/ld.elf_so/tls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/tls/tls.c
diff -u src/lib/libc/tls/tls.c:1.10 src/lib/libc/tls/tls.c:1.11
--- src/lib/libc/tls/tls.c:1.10 Mon Nov 4 12:45:10 2019
+++ src/lib/libc/tls/tls.c Tue Nov 5 22:22:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.10 2019/11/04 12:45:10 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.11 2019/11/05 22:22:42 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.10 2019/11/04 12:45:10 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.11 2019/11/05 22:22:42 joerg Exp $");
#include "namespace.h"
@@ -46,6 +46,7 @@ __RCSID("$NetBSD: tls.c,v 1.10 2019/11/0
#include <link_elf.h>
#include <lwp.h>
#include <stdbool.h>
+#include <stdalign.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -85,7 +86,7 @@ _rtld_tls_allocate(void)
if (initial_thread_tcb == NULL) {
#ifdef __HAVE_TLS_VARIANT_II
- tls_size = roundup2(tls_size, sizeof(max_align_t));
+ tls_size = roundup2(tls_size, alignof(max_align_t));
#endif
tls_allocation = tls_size + sizeof(*tcb);
Index: src/libexec/ld.elf_so/tls.c
diff -u src/libexec/ld.elf_so/tls.c:1.13 src/libexec/ld.elf_so/tls.c:1.14
--- src/libexec/ld.elf_so/tls.c:1.13 Mon Nov 4 12:45:10 2019
+++ src/libexec/ld.elf_so/tls.c Tue Nov 5 22:22:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.13 2019/11/04 12:45:10 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.14 2019/11/05 22:22:42 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,11 +29,12 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.13 2019/11/04 12:45:10 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.14 2019/11/05 22:22:42 joerg Exp $");
#include <sys/param.h>
#include <sys/ucontext.h>
#include <lwp.h>
+#include <stdalign.h>
#include <stddef.h>
#include <string.h>
#include "debug.h"
@@ -100,7 +101,7 @@ _rtld_tls_initial_allocation(void)
#ifndef __HAVE_TLS_VARIANT_I
_rtld_tls_static_space = roundup2(_rtld_tls_static_space,
- sizeof(max_align_t));
+ alignof(max_align_t));
#endif
dbg(("_rtld_tls_static_space %zu", _rtld_tls_static_space));
