4 files changed, 50 insertions, 50 deletions
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S
index 13b9c62cbbb4..4710195b6b74 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
@@ -144,12 +144,7 @@ SECTIONS
        *(.exitcall.exit)
        }
-  /* Stabs debugging sections.  */
+  STABS_DEBUG
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
+  DWARF_DEBUG
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
 }
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index 3942a5f245de..2517ecb8bf27 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -146,37 +146,8 @@ SECTIONS
  }
  _end = .;
  PROVIDE (end = .);
-   /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
+  STABS_DEBUG
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
+  DWARF_DEBUG
-  .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) }
 }
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index b03326d391c9..af11915ce0a8 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -93,14 +93,10 @@ SECTIONS
   *(.bss)
   *(COMMON)
  }
-  _end = . ;
+  _end = .;
  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
+  STABS_DEBUG
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
+  DWARF_DEBUG
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
 }
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 6f857be2b644..a9c55490fb82 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -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) }

diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S index 13b9c62cbbb4..4710195b6b74 100644 --- a/arch/i386/kernel/vmlinux.lds.S +++ b/arch/i386/kernel/vmlinux.lds.S
@@ -144,12 +144,7 @@ SECTIONS
144	*(.exitcall.exit)	144	*(.exitcall.exit)
145	}	145	}
146		146
147	/* Stabs debugging sections. */	147	STABS_DEBUG
148	.stab 0 : { *(.stab) }	148
149	.stabstr 0 : { *(.stabstr) }	149	DWARF_DEBUG
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) }
155	}	150	}


diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index 3942a5f245de..2517ecb8bf27 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S
@@ -146,37 +146,8 @@ SECTIONS
146	}	146	}
147	_end = .;	147	_end = .;
148	PROVIDE (end = .);	148	PROVIDE (end = .);
149	/* Stabs debugging sections. */	149
150	.stab 0 : { *(.stab) }	150	STABS_DEBUG
151	.stabstr 0 : { *(.stabstr) }	151
152	.stab.excl 0 : { *(.stab.excl) }	152	DWARF_DEBUG
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) }
182	}	153	}


diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index b03326d391c9..af11915ce0a8 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S
@@ -93,14 +93,10 @@ SECTIONS
93	*(.bss)	93	*(.bss)
94	*(COMMON)	94	*(COMMON)
95	}	95	}
96	_end = . ;	96	_end = .;
97	PROVIDE (end = .);	97	PROVIDE (end = .);
98	/* Stabs debugging sections. */	98
99	.stab 0 : { *(.stab) }	99	STABS_DEBUG
100	.stabstr 0 : { *(.stabstr) }	100
101	.stab.excl 0 : { *(.stab.excl) }	101	DWARF_DEBUG
102	.stab.exclstr 0 : { *(.stab.exclstr) }
103	.stab.index 0 : { *(.stab.index) }
104	.stab.indexstr 0 : { *(.stab.indexstr) }
105	.comment 0 : { *(.comment) }
106	}	102	}


diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 6f857be2b644..a9c55490fb82 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h
@@ -103,3 +103,41 @@
103	VMLINUX_SYMBOL(__kprobes_text_start) = .; \	103	VMLINUX_SYMBOL(__kprobes_text_start) = .; \
104	*(.kprobes.text) \	104	*(.kprobes.text) \
105	VMLINUX_SYMBOL(__kprobes_text_end) = .;	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) }