Commit a7d0c210 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2d5cbf32

arch/i386/kernel/vmlinux.lds.S

+3 −8
Original line number Diff line number Diff line
@@ -144,12 +144,7 @@ SECTIONS 
	*(.exitcall.exit)

	}



  /* Stabs debugging sections.  */

  .stab 0 : { *(.stab) }

  .stabstr 0 : { *(.stabstr) }

  .stab.excl 0 : { *(.stab.excl) }

  .stab.exclstr 0 : { *(.stab.exclstr) }

  .stab.index 0 : { *(.stab.index) }

  .stab.indexstr 0 : { *(.stab.indexstr) }

  .comment 0 : { *(.comment) }

  STABS_DEBUG



  DWARF_DEBUG

}

arch/um/kernel/dyn.lds.S

+4 −33
Original line number Diff line number Diff line
@@ -146,37 +146,8 @@ SECTIONS 
  }

  _end = .;

  PROVIDE (end = .);

   /* Stabs debugging sections.  */

  .stab          0 : { *(.stab) }

  .stabstr       0 : { *(.stabstr) }

  .stab.excl     0 : { *(.stab.excl) }

  .stab.exclstr  0 : { *(.stab.exclstr) }

  .stab.index    0 : { *(.stab.index) }

  .stab.indexstr 0 : { *(.stab.indexstr) }

  .comment       0 : { *(.comment) }

  /* DWARF debug sections.

     Symbols in the DWARF debugging sections are relative to the beginning

     of the section so we begin them at 0.  */

  /* DWARF 1 */

  .debug          0 : { *(.debug) }

  .line           0 : { *(.line) }

  /* GNU DWARF 1 extensions */

  .debug_srcinfo  0 : { *(.debug_srcinfo) }

  .debug_sfnames  0 : { *(.debug_sfnames) }

  /* DWARF 1.1 and DWARF 2 */

  .debug_aranges  0 : { *(.debug_aranges) }

  .debug_pubnames 0 : { *(.debug_pubnames) }

  /* DWARF 2 */

  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }

  .debug_abbrev   0 : { *(.debug_abbrev) }

  .debug_line     0 : { *(.debug_line) }

  .debug_frame    0 : { *(.debug_frame) }

  .debug_str      0 : { *(.debug_str) }

  .debug_loc      0 : { *(.debug_loc) }

  .debug_macinfo  0 : { *(.debug_macinfo) }

  /* SGI/MIPS DWARF 2 extensions */

  .debug_weaknames 0 : { *(.debug_weaknames) }

  .debug_funcnames 0 : { *(.debug_funcnames) }

  .debug_typenames 0 : { *(.debug_typenames) }

  .debug_varnames  0 : { *(.debug_varnames) }



  STABS_DEBUG



  DWARF_DEBUG

}

arch/um/kernel/uml.lds.S

+5 −9
Original line number Diff line number Diff line
@@ -95,12 +95,8 @@ SECTIONS 
  }

  _end = .;

  PROVIDE (end = .);

  /* Stabs debugging sections.  */

  .stab 0 : { *(.stab) }

  .stabstr 0 : { *(.stabstr) }

  .stab.excl 0 : { *(.stab.excl) }

  .stab.exclstr 0 : { *(.stab.exclstr) }

  .stab.index 0 : { *(.stab.index) }

  .stab.indexstr 0 : { *(.stab.indexstr) }

  .comment 0 : { *(.comment) }



  STABS_DEBUG



  DWARF_DEBUG

}

include/asm-generic/vmlinux.lds.h

+38 −0
Original line number Diff line number Diff line
@@ -103,3 +103,41 @@ 
		VMLINUX_SYMBOL(__kprobes_text_start) = .;		\

		*(.kprobes.text)					\

		VMLINUX_SYMBOL(__kprobes_text_end) = .;



		/* DWARF debug sections.

		Symbols in the DWARF debugging sections are relative to

		the beginning of the section so we begin them at 0.  */

#define DWARF_DEBUG							\

		/* DWARF 1 */						\

		.debug          0 : { *(.debug) }			\

		.line           0 : { *(.line) }			\

		/* GNU DWARF 1 extensions */				\

		.debug_srcinfo  0 : { *(.debug_srcinfo) }		\

		.debug_sfnames  0 : { *(.debug_sfnames) }		\

		/* DWARF 1.1 and DWARF 2 */				\

		.debug_aranges  0 : { *(.debug_aranges) }		\

		.debug_pubnames 0 : { *(.debug_pubnames) }		\

		/* DWARF 2 */						\

		.debug_info     0 : { *(.debug_info			\

				.gnu.linkonce.wi.*) }			\

		.debug_abbrev   0 : { *(.debug_abbrev) }		\

		.debug_line     0 : { *(.debug_line) }			\

		.debug_frame    0 : { *(.debug_frame) }			\

		.debug_str      0 : { *(.debug_str) }			\

		.debug_loc      0 : { *(.debug_loc) }			\

		.debug_macinfo  0 : { *(.debug_macinfo) }		\

		/* SGI/MIPS DWARF 2 extensions */			\

		.debug_weaknames 0 : { *(.debug_weaknames) }		\

		.debug_funcnames 0 : { *(.debug_funcnames) }		\

		.debug_typenames 0 : { *(.debug_typenames) }		\

		.debug_varnames  0 : { *(.debug_varnames) }		\



		/* Stabs debugging sections.  */

#define STABS_DEBUG							\

		.stab 0 : { *(.stab) }					\

		.stabstr 0 : { *(.stabstr) }				\

		.stab.excl 0 : { *(.stab.excl) }			\

		.stab.exclstr 0 : { *(.stab.exclstr) }			\

		.stab.index 0 : { *(.stab.index) }			\

		.stab.indexstr 0 : { *(.stab.indexstr) }		\

		.comment 0 : { *(.comment) }

CRA Git | Maintained and supported by SUSTech CRA and CCSE