CVS commit: src/libexec/ld.elf_so

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Wed May 31 18:44:39 UTC 2023

Modified Files:
        src/libexec/ld.elf_so: map_object.c tls.c

Log Message:
ld.elf_so: Sprinkle tls debug messages.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/libexec/ld.elf_so/map_object.c
cvs rdiff -u -r1.15 -r1.16 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/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.65 src/libexec/ld.elf_so/map_object.c:1.66
--- src/libexec/ld.elf_so/map_object.c:1.65	Thu Jan 12 19:17:11 2023
+++ src/libexec/ld.elf_so/map_object.c	Wed May 31 18:44:39 2023
@@ -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 f
 		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 f
 	}
 
 #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;

Index: src/libexec/ld.elf_so/tls.c
diff -u src/libexec/ld.elf_so/tls.c:1.15 src/libexec/ld.elf_so/tls.c:1.16
--- src/libexec/ld.elf_so/tls.c:1.15	Fri Feb 10 08:12:48 2023
+++ src/libexec/ld.elf_so/tls.c	Wed May 31 18:44:39 2023
@@ -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;