Load debug section only when dumping debug sections
Don't load debug sections if we aren't dumping any debug sections. PR binutils/28843 * objdump.c (dump_any_debugging): New. (load_debug_section): Return false if dump_any_debugging isn't set. (main): Set dump_any_debugging when dumping any debug sections. * readelf (dump_any_debugging): New. (parse_args): Set dump_any_debugging when dumping any debug sections. (load_debug_section): Return false if dump_any_debugging isn't set.
This commit is contained in:
parent
492325c4b7
commit
e1dbfc17c5
2 changed files with 15 additions and 0 deletions
|
@ -131,6 +131,7 @@ static bool color_output = false; /* --visualize-jumps=color. */
|
||||||
static bool extended_color_output = false; /* --visualize-jumps=extended-color. */
|
static bool extended_color_output = false; /* --visualize-jumps=extended-color. */
|
||||||
static int process_links = false; /* --process-links. */
|
static int process_links = false; /* --process-links. */
|
||||||
|
|
||||||
|
static int dump_any_debugging;
|
||||||
static int demangle_flags = DMGL_ANSI | DMGL_PARAMS;
|
static int demangle_flags = DMGL_ANSI | DMGL_PARAMS;
|
||||||
|
|
||||||
/* A structure to record the sections mentioned in -j switches. */
|
/* A structure to record the sections mentioned in -j switches. */
|
||||||
|
@ -3851,6 +3852,9 @@ load_debug_section (enum dwarf_section_display_enum debug, void *file)
|
||||||
asection *sec;
|
asection *sec;
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
||||||
|
if (!dump_any_debugging)
|
||||||
|
return false;
|
||||||
|
|
||||||
/* If it is already loaded, do nothing. */
|
/* If it is already loaded, do nothing. */
|
||||||
if (section->start != NULL)
|
if (section->start != NULL)
|
||||||
{
|
{
|
||||||
|
@ -5688,6 +5692,10 @@ main (int argc, char **argv)
|
||||||
if (!seenflag)
|
if (!seenflag)
|
||||||
usage (stderr, 2);
|
usage (stderr, 2);
|
||||||
|
|
||||||
|
dump_any_debugging = (dump_debugging
|
||||||
|
|| dump_dwarf_section_info
|
||||||
|
|| process_links);
|
||||||
|
|
||||||
if (formats_info)
|
if (formats_info)
|
||||||
exit_status = display_info ();
|
exit_status = display_info ();
|
||||||
else
|
else
|
||||||
|
|
|
@ -239,6 +239,7 @@ static bool decompress_dumps = false;
|
||||||
static bool do_not_show_symbol_truncation = false;
|
static bool do_not_show_symbol_truncation = false;
|
||||||
static bool do_demangle = false; /* Pretty print C++ symbol names. */
|
static bool do_demangle = false; /* Pretty print C++ symbol names. */
|
||||||
static bool process_links = false;
|
static bool process_links = false;
|
||||||
|
static bool dump_any_debugging = false;
|
||||||
static int demangle_flags = DMGL_ANSI | DMGL_PARAMS;
|
static int demangle_flags = DMGL_ANSI | DMGL_PARAMS;
|
||||||
static int sym_base = 0;
|
static int sym_base = 0;
|
||||||
|
|
||||||
|
@ -5332,6 +5333,7 @@ parse_args (struct dump_data *dumpdata, int argc, char ** argv)
|
||||||
case 'P':
|
case 'P':
|
||||||
process_links = true;
|
process_links = true;
|
||||||
do_follow_links = true;
|
do_follow_links = true;
|
||||||
|
dump_any_debugging = true;
|
||||||
break;
|
break;
|
||||||
case 'x':
|
case 'x':
|
||||||
request_dump (dumpdata, HEX_DUMP);
|
request_dump (dumpdata, HEX_DUMP);
|
||||||
|
@ -5347,6 +5349,7 @@ parse_args (struct dump_data *dumpdata, int argc, char ** argv)
|
||||||
break;
|
break;
|
||||||
case 'w':
|
case 'w':
|
||||||
do_dump = true;
|
do_dump = true;
|
||||||
|
dump_any_debugging = true;
|
||||||
if (optarg == NULL)
|
if (optarg == NULL)
|
||||||
{
|
{
|
||||||
do_debugging = true;
|
do_debugging = true;
|
||||||
|
@ -5360,6 +5363,7 @@ parse_args (struct dump_data *dumpdata, int argc, char ** argv)
|
||||||
break;
|
break;
|
||||||
case OPTION_DEBUG_DUMP:
|
case OPTION_DEBUG_DUMP:
|
||||||
do_dump = true;
|
do_dump = true;
|
||||||
|
dump_any_debugging = true;
|
||||||
if (optarg == NULL)
|
if (optarg == NULL)
|
||||||
{
|
{
|
||||||
do_debugging = true;
|
do_debugging = true;
|
||||||
|
@ -15913,6 +15917,9 @@ load_debug_section (enum dwarf_section_display_enum debug, void * data)
|
||||||
Elf_Internal_Shdr * sec;
|
Elf_Internal_Shdr * sec;
|
||||||
Filedata * filedata = (Filedata *) data;
|
Filedata * filedata = (Filedata *) data;
|
||||||
|
|
||||||
|
if (!dump_any_debugging)
|
||||||
|
return false;
|
||||||
|
|
||||||
/* Without section headers we cannot find any sections. */
|
/* Without section headers we cannot find any sections. */
|
||||||
if (filedata->section_headers == NULL)
|
if (filedata->section_headers == NULL)
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue