diff options
| author | Nick Clifton <nickc@redhat.com> | 2013-05-02 10:18:37 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2013-05-02 10:18:37 +0000 |
| commit | 0b1f59d04cb3f09950e7e67e2aef4eb0f5a48dee (patch) | |
| tree | 9769ddacbad710fe2dc3705927a8a567fcdba70e /binutils | |
| parent | 2cc71f7346c2459dbed3b0505d20430d5c9dcb4f (diff) | |
| download | binutils-redhat-0b1f59d04cb3f09950e7e67e2aef4eb0f5a48dee.tar.gz | |
* dwarf.c (display_debug_lines_raw): Do not treat .debug_line.dwo
sections as if they were fragmentary .debug_line sections.
(display_debug_lines_decoded): Likewise.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/dwarf.c | 25 |
2 files changed, 17 insertions, 14 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 58f7657fdb..9426e34fa4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2013-05-02 Nick Clifton <nickc@redhat.com> + + * dwarf.c (display_debug_lines_raw): Do not treat .debug_line.dwo + sections as if they were fragmentary .debug_line sections. + (display_debug_lines_decoded): Likewise. + 2013-04-29 Nick Clifton <nickc@redhat.com> * dwarf.c (read_debug_line_header): New function. Reads in a diff --git a/binutils/dwarf.c b/binutils/dwarf.c index b11169b7bc..774904c4d9 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -2659,7 +2659,10 @@ display_debug_lines_raw (struct dwarf_section *section, unsigned char *end_of_sequence; int i; - if (const_strneq (section->name, ".debug_line.")) + if (const_strneq (section->name, ".debug_line.") + /* Note: the following does not apply to .debug_line.dwo sections. + These are full debug_line sections. */ + && strcmp (section->name, ".debug_line.dwo") != 0) { /* Sections named .debug_line.<foo> are fragments of a .debug_line section containing just the Line Number Statements. They are @@ -2668,9 +2671,9 @@ display_debug_lines_raw (struct dwarf_section *section, garbage collection decides to discard a .text.<foo> section it can then also discard the line number information in .debug_line.<foo>. - Since the section is a fragmnent it does not have the details + Since the section is a fragment it does not have the details needed to fill out a LineInfo structure, so instead we use the - details from the last one we processed. */ + details from the last full debug_line section that we processed. */ end_of_sequence = end; standard_opcodes = NULL; linfo = saved_linfo; @@ -2994,18 +2997,12 @@ display_debug_lines_decoded (struct dwarf_section *section, unsigned char **directory_table = NULL; unsigned int n_directories = 0; - if (const_strneq (section->name, ".debug_line.")) + if (const_strneq (section->name, ".debug_line.") + /* Note: the following does not apply to .debug_line.dwo sections. + These are full debug_line sections. */ + && strcmp (section->name, ".debug_line.dwo") != 0) { - /* Sections named .debug_line.<foo> are fragments of a .debug_line - section containing just the Line Number Statements. They are - created by the assembler and intended to be used alongside gcc's - -ffunction-sections command line option. When the linker's - garbage collection decides to discard a .text.<foo> section it - can then also discard the line number information in .debug_line.<foo>. - - Since the section is a fragmnent it does not have the details - needed to fill out a LineInfo structure, so instead we use the - details from the last one we processed. */ + /* See comment in display_debug_lines_raw(). */ end_of_sequence = end; standard_opcodes = NULL; linfo = saved_linfo; |