Date: Tue, 23 Jun 2020 03:31:35 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r362527 - stable/11/libexec/rtld-elf Message-ID: <202006230331.05N3VZIE075994@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Jun 23 03:31:34 2020 New Revision: 362527 URL: https://svnweb.freebsd.org/changeset/base/362527 Log: MFC r362249: Systematically pass RTLD_LO_TRACE to load_needed_objects(). Modified: stable/11/libexec/rtld-elf/rtld.c Directory Properties: stable/11/ (props changed) Modified: stable/11/libexec/rtld-elf/rtld.c ============================================================================== --- stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:18:57 2020 (r362526) +++ stable/11/libexec/rtld-elf/rtld.c Tue Jun 23 03:31:34 2020 (r362527) @@ -689,7 +689,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr preload_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q)); dbg("loading needed objects"); - if (load_needed_objects(obj_main, 0) == -1) + if (load_needed_objects(obj_main, ld_tracing != NULL ? RTLD_LO_TRACE : + 0) == -1) rtld_die(); /* Make a list of all objects loaded at startup. */ @@ -3398,7 +3399,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *ref } if (result != -1) result = load_needed_objects(obj, lo_flags & (RTLD_LO_DLOPEN | - RTLD_LO_EARLY | RTLD_LO_IGNSTLS)); + RTLD_LO_EARLY | RTLD_LO_IGNSTLS | RTLD_LO_TRACE)); init_dag(obj); ref_dag(obj); if (result != -1)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006230331.05N3VZIE075994>