about summary refs log tree commit diff
path: root/elf/dl-main.h
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-01-21 10:20:50 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-02-10 09:16:13 -0300
commitd7703d3176d225d5743b21811d888619eba39e82 (patch)
tree5a4586f8fe3459d45319cac801366dd92510d5b2 /elf/dl-main.h
parent6628c742b2c16e785d3c884d9deeda5adb30ca12 (diff)
downloadglibc-d7703d3176d225d5743b21811d888619eba39e82.tar.gz
glibc-d7703d3176d225d5743b21811d888619eba39e82.tar.xz
glibc-d7703d3176d225d5743b21811d888619eba39e82.zip
malloc: Remove LD_TRACE_PRELINKING usage from mtrace
The fix for BZ#22716 replacde LD_TRACE_LOADED_OBJECTS with
LD_TRACE_PRELINKING so mtrace could record executable address
position.

To provide the same information, LD_TRACE_LOADED_OBJECTS is
extended where a value or '2' also prints the executable address
as well.  It avoid adding another loader environment variable
to be used solely for mtrace.  The vDSO will be printed as
a default library (with '=>' pointing the same name), which is
ok since both mtrace and ldd already handles it.

The mtrace script is changed to also parse the new format.  To
correctly support PIE and non-PIE executables, both the default
mtrace address and the one calculated as used (it fixes mtrace
for non-PIE exectuable as for BZ#22716 for PIE).

Checked on x86_64-linux-gnu.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diffstat (limited to 'elf/dl-main.h')
-rw-r--r--elf/dl-main.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/elf/dl-main.h b/elf/dl-main.h
index 3e32f254c5..e4fa19ee4e 100644
--- a/elf/dl-main.h
+++ b/elf/dl-main.h
@@ -94,6 +94,9 @@ struct dl_main_state
 
   enum rtld_mode mode;
 
+  /* True if program should be also printed for rtld_mode_trace.  */
+  bool mode_trace_program;
+
   /* True if any of the debugging options is enabled.  */
   bool any_debug;