Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ld.elf_so: Sprinkle tls debug messages. 

XXX pullup-10
This commit is contained in:
riastradh 2023-05-31 18:44:39 +00:00
parent a2db434eb1
commit 3e105dc2be
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libexec/ld.elf_so/map_object.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: map_object.c,v 1.65 2023/01/12 19:17:11 christos Exp $ */
/* $NetBSD: map_object.c,v 1.66 2023/05/31 18:44:39 riastradh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: map_object.c,v 1.65 2023/01/12 19:17:11 christos Exp $");
__RCSID("$NetBSD: map_object.c,v 1.66 2023/05/31 18:44:39 riastradh Exp $");
#endif /* not lint */
#include <errno.h>
@ -310,6 +310,9 @@ _rtld_map_object(const char *path, int fd, const struct stat *sb)
obj->tlsalign = phtls->p_align;
obj->tlsinitsize = phtls->p_filesz;
tls_vaddr = phtls->p_vaddr;
dbg(("%s: tls index %zu size %zu align %zu initsize %zu",
obj->path, obj->tlsindex, obj->tlssize, obj->tlsalign,
obj->tlsinitsize));
}
#endif
@ -437,8 +440,11 @@ _rtld_map_object(const char *path, int fd, const struct stat *sb)
}
#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
if (phtls != NULL)
if (phtls != NULL) {
obj->tlsinit = mapbase + tls_vaddr;
dbg(("%s: tls init = %p + %"PRImemsz" = %p", obj->path,
mapbase, tls_vaddr, obj->tlsinit));
}
#endif
obj->mapbase = mapbase;

6
libexec/ld.elf_so/tls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tls.c,v 1.15 2023/02/10 08:12:48 skrll Exp $ */
/* $NetBSD: tls.c,v 1.16 2023/05/31 18:44:39 riastradh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: tls.c,v 1.15 2023/02/10 08:12:48 skrll Exp $");
__RCSID("$NetBSD: tls.c,v 1.16 2023/05/31 18:44:39 riastradh Exp $");
#include <sys/param.h>
#include <sys/ucontext.h>
@ -261,6 +261,8 @@ _rtld_tls_offset_allocate(Obj_Entry *obj)
}
}
obj->tlsoffset = offset;
dbg(("%s: static tls offset 0x%zx size %zu\n",
obj->path, obj->tlsoffset, obj->tlssize));
_rtld_tls_static_offset = next_offset;
obj->tls_done = 1;