Commit a7d0c210337246fa9c25b73cf76dfdbb159f642b

Authored by Paolo 'Blaisorblade' Giarrusso
Committed by Linus Torvalds
1 parent 2d5cbf324c

[PATCH] i386 / uml: add dwarf sections to static link script

Inside the linker script, insert the code for DWARF debug info sections. This
may help GDB'ing a Uml binary. Actually, it seems that ld is able to guess
what I added correctly, but normal linker scripts include this section so it
should be correct anyway adding it.

On request by Sam Ravnborg <sam@ravnborg.org>, I've added it to
asm-generic/vmlinux.lds.s. I've also moved there the stabs debug section,
used the new macro in i386 linker script and added DWARF debug section to
that.

In the truth, I've not been able to verify the difference in GDB behaviour
after this change (I've seen large improvements with another patch). This
may depend on my binutils version, older one may have worse defaults.

However, this section is present in normal linker script, so add it at
least for the sake of cleanness.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 4 changed files with 50 additions and 50 deletions Side-by-side Diff

arch/i386/kernel/vmlinux.lds.S
... ... @@ -144,13 +144,8 @@
144 144 *(.exitcall.exit)
145 145 }
146 146  
147   - /* Stabs debugging sections. */
148   - .stab 0 : { *(.stab) }
149   - .stabstr 0 : { *(.stabstr) }
150   - .stab.excl 0 : { *(.stab.excl) }
151   - .stab.exclstr 0 : { *(.stab.exclstr) }
152   - .stab.index 0 : { *(.stab.index) }
153   - .stab.indexstr 0 : { *(.stab.indexstr) }
154   - .comment 0 : { *(.comment) }
  147 + STABS_DEBUG
  148 +
  149 + DWARF_DEBUG
155 150 }
arch/um/kernel/dyn.lds.S
... ... @@ -146,38 +146,9 @@
146 146 }
147 147 _end = .;
148 148 PROVIDE (end = .);
149   - /* Stabs debugging sections. */
150   - .stab 0 : { *(.stab) }
151   - .stabstr 0 : { *(.stabstr) }
152   - .stab.excl 0 : { *(.stab.excl) }
153   - .stab.exclstr 0 : { *(.stab.exclstr) }
154   - .stab.index 0 : { *(.stab.index) }
155   - .stab.indexstr 0 : { *(.stab.indexstr) }
156   - .comment 0 : { *(.comment) }
157   - /* DWARF debug sections.
158   - Symbols in the DWARF debugging sections are relative to the beginning
159   - of the section so we begin them at 0. */
160   - /* DWARF 1 */
161   - .debug 0 : { *(.debug) }
162   - .line 0 : { *(.line) }
163   - /* GNU DWARF 1 extensions */
164   - .debug_srcinfo 0 : { *(.debug_srcinfo) }
165   - .debug_sfnames 0 : { *(.debug_sfnames) }
166   - /* DWARF 1.1 and DWARF 2 */
167   - .debug_aranges 0 : { *(.debug_aranges) }
168   - .debug_pubnames 0 : { *(.debug_pubnames) }
169   - /* DWARF 2 */
170   - .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
171   - .debug_abbrev 0 : { *(.debug_abbrev) }
172   - .debug_line 0 : { *(.debug_line) }
173   - .debug_frame 0 : { *(.debug_frame) }
174   - .debug_str 0 : { *(.debug_str) }
175   - .debug_loc 0 : { *(.debug_loc) }
176   - .debug_macinfo 0 : { *(.debug_macinfo) }
177   - /* SGI/MIPS DWARF 2 extensions */
178   - .debug_weaknames 0 : { *(.debug_weaknames) }
179   - .debug_funcnames 0 : { *(.debug_funcnames) }
180   - .debug_typenames 0 : { *(.debug_typenames) }
181   - .debug_varnames 0 : { *(.debug_varnames) }
  149 +
  150 + STABS_DEBUG
  151 +
  152 + DWARF_DEBUG
182 153 }
arch/um/kernel/uml.lds.S
... ... @@ -93,15 +93,11 @@
93 93 *(.bss)
94 94 *(COMMON)
95 95 }
96   - _end = . ;
  96 + _end = .;
97 97 PROVIDE (end = .);
98   - /* Stabs debugging sections. */
99   - .stab 0 : { *(.stab) }
100   - .stabstr 0 : { *(.stabstr) }
101   - .stab.excl 0 : { *(.stab.excl) }
102   - .stab.exclstr 0 : { *(.stab.exclstr) }
103   - .stab.index 0 : { *(.stab.index) }
104   - .stab.indexstr 0 : { *(.stab.indexstr) }
105   - .comment 0 : { *(.comment) }
  98 +
  99 + STABS_DEBUG
  100 +
  101 + DWARF_DEBUG
106 102 }
include/asm-generic/vmlinux.lds.h
... ... @@ -103,4 +103,42 @@
103 103 VMLINUX_SYMBOL(__kprobes_text_start) = .; \
104 104 *(.kprobes.text) \
105 105 VMLINUX_SYMBOL(__kprobes_text_end) = .;
  106 +
  107 + /* DWARF debug sections.
  108 + Symbols in the DWARF debugging sections are relative to
  109 + the beginning of the section so we begin them at 0. */
  110 +#define DWARF_DEBUG \
  111 + /* DWARF 1 */ \
  112 + .debug 0 : { *(.debug) } \
  113 + .line 0 : { *(.line) } \
  114 + /* GNU DWARF 1 extensions */ \
  115 + .debug_srcinfo 0 : { *(.debug_srcinfo) } \
  116 + .debug_sfnames 0 : { *(.debug_sfnames) } \
  117 + /* DWARF 1.1 and DWARF 2 */ \
  118 + .debug_aranges 0 : { *(.debug_aranges) } \
  119 + .debug_pubnames 0 : { *(.debug_pubnames) } \
  120 + /* DWARF 2 */ \
  121 + .debug_info 0 : { *(.debug_info \
  122 + .gnu.linkonce.wi.*) } \
  123 + .debug_abbrev 0 : { *(.debug_abbrev) } \
  124 + .debug_line 0 : { *(.debug_line) } \
  125 + .debug_frame 0 : { *(.debug_frame) } \
  126 + .debug_str 0 : { *(.debug_str) } \
  127 + .debug_loc 0 : { *(.debug_loc) } \
  128 + .debug_macinfo 0 : { *(.debug_macinfo) } \
  129 + /* SGI/MIPS DWARF 2 extensions */ \
  130 + .debug_weaknames 0 : { *(.debug_weaknames) } \
  131 + .debug_funcnames 0 : { *(.debug_funcnames) } \
  132 + .debug_typenames 0 : { *(.debug_typenames) } \
  133 + .debug_varnames 0 : { *(.debug_varnames) } \
  134 +
  135 + /* Stabs debugging sections. */
  136 +#define STABS_DEBUG \
  137 + .stab 0 : { *(.stab) } \
  138 + .stabstr 0 : { *(.stabstr) } \
  139 + .stab.excl 0 : { *(.stab.excl) } \
  140 + .stab.exclstr 0 : { *(.stab.exclstr) } \
  141 + .stab.index 0 : { *(.stab.index) } \
  142 + .stab.indexstr 0 : { *(.stab.indexstr) } \
  143 + .comment 0 : { *(.comment) }