From 4e4c04f0d42fd075ac62bc0ff1d116f950b8ddce Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 13 Mar 2011 21:08:45 +0000 Subject: Fill in TLS related fields in dl_iterate_phdr if TLS is supported --- libexec/ld.elf_so/rtld.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libexec') diff --git a/libexec/ld.elf_so/rtld.c b/libexec/ld.elf_so/rtld.c index 7849f2a336e..3787347be47 100644 --- a/libexec/ld.elf_so/rtld.c +++ b/libexec/ld.elf_so/rtld.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.c,v 1.139 2011/03/09 23:10:07 joerg Exp $ */ +/* $NetBSD: rtld.c,v 1.140 2011/03/13 21:08:45 joerg Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include #ifndef lint -__RCSID("$NetBSD: rtld.c,v 1.139 2011/03/09 23:10:07 joerg Exp $"); +__RCSID("$NetBSD: rtld.c,v 1.140 2011/03/13 21:08:45 joerg Exp $"); #endif /* not lint */ #include @@ -1154,12 +1154,12 @@ dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *), void *pa STAILQ_FIRST(&obj->names)->name : obj->path; phdr_info.dlpi_phdr = obj->phdr; phdr_info.dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]); -#if 1 - phdr_info.dlpi_tls_modid = 0; - phdr_info.dlpi_tls_data = 0; -#else +#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II) phdr_info.dlpi_tls_modid = obj->tlsindex; phdr_info.dlpi_tls_data = obj->tlsinit; +#else + phdr_info.dlpi_tls_modid = 0; + phdr_info.dlpi_tls_data = 0; #endif phdr_info.dlpi_adds = _rtld_objloads; phdr_info.dlpi_subs = _rtld_objloads - _rtld_objcount; -- cgit