Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e16af09d authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Martin Schwidefsky
Browse files

[S390] s390: beautify vmlinux.lds 



Introduce a consistent style in vmlinux.lds.
This style is gradually being introduced for all archs.

A few lables were moved inside the section definition so
they are assigned the correct value of gcc decide to align
the content to another address than the one . has.
In the past this has fixed several bugs but for s390 it
will not impact due to all the alignmnet already introduced.

Stabs definitions are consolidated in asm-generic/vmlinux.lds.h
This patch also introduce support for DWARF - without knowing
if this makes sense for s390.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2b12f996

arch/s390/kernel/vmlinux.lds.S

+127 −106
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ jiffies = jiffies_64; 
SECTIONS

{

	. = 0x00000000;

  _text = .;			/* Text and read-only data */

	.text : {

	_text = .;		/* Text and read-only data */

		*(.text.head)

	TEXT_TEXT

		SCHED_TEXT
@@ -42,12 +42,13 @@ SECTIONS 
	_eshared = .;		/* End of shareable data */



	. = ALIGN(16);		/* Exception table */

	__ex_table : {

		__start___ex_table = .;

  __ex_table : { *(__ex_table) }

		*(__ex_table)

		__stop___ex_table = .;

	}



	NOTES



	BUG_TABLE



	.data : {		/* Data */
@@ -56,23 +57,33 @@ SECTIONS 
	}



	. = ALIGN(4096);

	.data_nosave : {

	__nosave_begin = .;

  .data_nosave : { *(.data.nosave) }

		*(.data.nosave)

	}

	. = ALIGN(4096);

	__nosave_end = .;



	. = ALIGN(4096);

  .data.page_aligned : { *(.data.idt) }

	.data.page_aligned : {

		*(.data.idt)

	}



	. = ALIGN(256);

  .data.cacheline_aligned : { *(.data.cacheline_aligned) }

	.data.cacheline_aligned : {

		*(.data.cacheline_aligned)

	}



	. = ALIGN(256);

  .data.read_mostly : { *(.data.read_mostly) }

	.data.read_mostly : {

		*(.data.read_mostly)

	}

	_edata = .;		/* End of data section */



	. = ALIGN(8192);	/* init_task */

  .data.init_task : { *(.data.init_task) }

	.data.init_task : {

		*(.data.init_task)

	}



	/* will be freed after init */

	. = ALIGN(4096);	/* Init code and data */
@@ -86,53 +97,63 @@ SECTIONS 
	 * .exit.text is discarded at runtime, not link time,

	 * to deal with references from __bug_table

	*/

  .exit.text :	 { *(.exit.text) }

	.exit.text : {

		*(.exit.text)

	}



  .init.data : { *(.init.data) }

	.init.data : {

		*(.init.data)

	}

	. = ALIGN(256);

	.init.setup : {

		__setup_start = .;

  .init.setup : { *(.init.setup) }

		*(.init.setup)

		__setup_end = .;

  __initcall_start = .;

	}

	.initcall.init : {

		__initcall_start = .;

		INITCALLS

  }

		__initcall_end = .;

	}



	.con_initcall.init : {

		__con_initcall_start = .;

  .con_initcall.init : { *(.con_initcall.init) }

		*(.con_initcall.init)

		__con_initcall_end = .;

	}

	SECURITY_INIT



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(256);

	.init.ramfs : {

		__initramfs_start = .;

  .init.ramfs : { *(.init.initramfs) }

		*(.init.ramfs)

		. = ALIGN(2);

		__initramfs_end = .;

	}

#endif



	PERCPU(4096)

	. = ALIGN(4096);

  __init_end = .;

  /* freed after init ends here */

	__init_end = .;		/* freed after init ends here */



  __bss_start = .;		/* BSS */

  .bss : { *(.bss) }

	/* BSS */

	.bss : {

		__bss_start = .;

		*(.bss)

		. = ALIGN(2);

		__bss_stop = .;

	}



	_end = . ;



	/* Sections to be discarded */

	/DISCARD/ : {

	*(.exit.data) *(.exitcall.exit)

		*(.exit.data)

		*(.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) }

	/* Debugging sections.	*/

	STABS_DEBUG

	DWARF_DEBUG

}