Skip to content

Commit 5e811b9

Browse files
Jens Remushcahca
authored andcommitted
s390/vdso: Use common STABS_DEBUG and DWARF_DEBUG macros
This simplifies the vDSO linker script. The ELF_DETAILS macro was not used in addition, as done on arm64 and powerpc, as that would introduce an empty .modinfo section. Note that this rearranges the .comment section to follow after all of the debug sections. Signed-off-by: Jens Remus <jremus@linux.ibm.com> Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent f5730d4 commit 5e811b9

1 file changed

Lines changed: 3 additions & 40 deletions

File tree

arch/s390/kernel/vdso64/vdso64.lds.S

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <asm/vdso/vsyscall.h>
88
#include <asm/page.h>
99
#include <asm/vdso.h>
10+
#include <asm-generic/vmlinux.lds.h>
1011
#include <vdso/datapage.h>
1112

1213
OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
@@ -59,47 +60,9 @@ SECTIONS
5960
_end = .;
6061
PROVIDE(end = .);
6162

62-
/*
63-
* Stabs debugging sections are here too.
64-
*/
65-
.stab 0 : { *(.stab) }
66-
.stabstr 0 : { *(.stabstr) }
67-
.stab.excl 0 : { *(.stab.excl) }
68-
.stab.exclstr 0 : { *(.stab.exclstr) }
69-
.stab.index 0 : { *(.stab.index) }
70-
.stab.indexstr 0 : { *(.stab.indexstr) }
63+
STABS_DEBUG
64+
DWARF_DEBUG
7165
.comment 0 : { *(.comment) }
72-
73-
/*
74-
* DWARF debug sections.
75-
* Symbols in the DWARF debugging sections are relative to the
76-
* beginning of the section so we begin them at 0.
77-
*/
78-
/* DWARF 1 */
79-
.debug 0 : { *(.debug) }
80-
.line 0 : { *(.line) }
81-
/* GNU DWARF 1 extensions */
82-
.debug_srcinfo 0 : { *(.debug_srcinfo) }
83-
.debug_sfnames 0 : { *(.debug_sfnames) }
84-
/* DWARF 1.1 and DWARF 2 */
85-
.debug_aranges 0 : { *(.debug_aranges) }
86-
.debug_pubnames 0 : { *(.debug_pubnames) }
87-
/* DWARF 2 */
88-
.debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
89-
.debug_abbrev 0 : { *(.debug_abbrev) }
90-
.debug_line 0 : { *(.debug_line) }
91-
.debug_frame 0 : { *(.debug_frame) }
92-
.debug_str 0 : { *(.debug_str) }
93-
.debug_loc 0 : { *(.debug_loc) }
94-
.debug_macinfo 0 : { *(.debug_macinfo) }
95-
/* SGI/MIPS DWARF 2 extensions */
96-
.debug_weaknames 0 : { *(.debug_weaknames) }
97-
.debug_funcnames 0 : { *(.debug_funcnames) }
98-
.debug_typenames 0 : { *(.debug_typenames) }
99-
.debug_varnames 0 : { *(.debug_varnames) }
100-
/* DWARF 3 */
101-
.debug_pubtypes 0 : { *(.debug_pubtypes) }
102-
.debug_ranges 0 : { *(.debug_ranges) }
10366
.gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
10467

10568
/DISCARD/ : {

0 commit comments

Comments
 (0)