svn commit: r362524 - stable/12/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Tue Jun 23 03:17:14 2020
New Revision: 362524
URL: https://svnweb.freebsd.org/changeset/base/362524

Log:
  MFC r362249:
  Systematically pass RTLD_LO_TRACE to load_needed_objects().

Modified:
  stable/12/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/12/libexec/rtld-elf/rtld.c	Tue Jun 23 00:02:28 2020	(r362523)
+++ stable/12/libexec/rtld-elf/rtld.c	Tue Jun 23 03:17:14 2020	(r362524)
@@ -685,7 +685,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. */
@@ -3425,7 +3426,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)