Blame elfutils-0.176-gcc-pr88835.patch
|
 |
dfe2b39 |
Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88835
|
|
|
dfe2b39 |
|
|
|
dfe2b39 |
diff --git a/src/readelf.c b/src/readelf.c
|
|
|
dfe2b39 |
index 33706bd..b55844c 100644
|
|
|
dfe2b39 |
--- a/src/readelf.c
|
|
|
dfe2b39 |
+++ b/src/readelf.c
|
|
|
dfe2b39 |
@@ -10143,7 +10143,7 @@ print_debug_str_section (Dwfl_Module *dwflmod __attribute__ ((unused)),
|
|
|
dfe2b39 |
++digits;
|
|
|
dfe2b39 |
tmp >>= 4;
|
|
|
dfe2b39 |
}
|
|
|
dfe2b39 |
- digits = MAX (4, digits);
|
|
|
dfe2b39 |
+ digits = MIN (16, MAX (4, digits));
|
|
|
dfe2b39 |
|
|
|
dfe2b39 |
printf (gettext ("\nDWARF section [%2zu] '%s' at offset %#" PRIx64 ":\n"
|
|
|
dfe2b39 |
" %*s String\n"),
|
|
|
dfe2b39 |
diff --git a/tests/backtrace.c b/tests/backtrace.c
|
|
|
dfe2b39 |
index 05e8ef8..d621fbf 100644
|
|
|
dfe2b39 |
--- a/tests/backtrace.c
|
|
|
dfe2b39 |
+++ b/tests/backtrace.c
|
|
|
dfe2b39 |
@@ -185,7 +185,7 @@ frame_callback (Dwfl_Frame *state, void *frame_arg)
|
|
|
dfe2b39 |
symname = dwfl_module_addrname (mod, pc_adjusted);
|
|
|
dfe2b39 |
|
|
|
dfe2b39 |
printf ("#%2d %#" PRIx64 "%4s\t%s\n", *framenop, (uint64_t) pc,
|
|
|
dfe2b39 |
- ! isactivation ? "- 1" : "", symname);
|
|
|
dfe2b39 |
+ ! isactivation ? "- 1" : "", symname ?: "<null>");
|
|
|
dfe2b39 |
pid_t tid = dwfl_thread_tid (thread);
|
|
|
dfe2b39 |
callback_verify (tid, *framenop, pc, symname, dwfl);
|
|
|
dfe2b39 |
(*framenop)++;
|