Commit 091e52c3 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files

x86, vmlinux.lds: unify remaining parts 



32 bit:
- explicit page align .bss
- move ALING() out of .brk output section
- discard *(.eh_frame)

64 bit:
- move ALIGN() out of .bss output section
- move ALIGN() out of .brk output section
- use a dedicated section to define _end

[ Impact: unify and fix section alignments in linker script ]

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-13-git-send-email-sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9d16e783

arch/x86/kernel/vmlinux.lds.S

+27 −5
Original line number Diff line number Diff line
@@ -359,12 +359,34 @@ SECTIONS 
	/* use another section data.init2, see PERCPU_VADDR() above */

#endif



	/* BSS */

	. = ALIGN(PAGE_SIZE);

	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {

		__bss_start = .;

		*(.bss.page_aligned)

		*(.bss)

		. = ALIGN(4);

		__bss_stop = .;

	}



#ifdef CONFIG_X86_32

# include "vmlinux_32.lds.S"

#else

# include "vmlinux_64.lds.S"

#endif

	. = ALIGN(PAGE_SIZE);

	.brk : AT(ADDR(.brk) - LOAD_OFFSET) {

		__brk_base = .;

		. += 64 * 1024;		/* 64k alignment slop space */

		*(.brk_reservation)	/* areas brk users have reserved */

		__brk_limit = .;

	}



	.end : AT(ADDR(.end) - LOAD_OFFSET) {

		_end = .;

	}



	/* Sections to be discarded */

	/DISCARD/ : {

		*(.exitcall.exit)

		*(.eh_frame)

		*(.discard)

	}



        STABS_DEBUG

        DWARF_DEBUG

arch/x86/kernel/vmlinux_32.lds.S

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
	/* BSS */

	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {

		__bss_start = .;

		*(.bss.page_aligned)

		*(.bss)

		. = ALIGN(4);

		__bss_stop = .;

	}



	.brk : AT(ADDR(.brk) - LOAD_OFFSET) {

		. = ALIGN(PAGE_SIZE);

		__brk_base = .;

		. += 64 * 1024;		/* 64k alignment slop space */

		*(.brk_reservation)	/* areas brk users have reserved */

		__brk_limit = .;

	}



	.end : AT(ADDR(.end) - LOAD_OFFSET) {

		_end = . ;

	}



	/* Sections to be discarded */

	/DISCARD/ : {

		*(.exitcall.exit)

		*(.discard)

	}

arch/x86/kernel/vmlinux_64.lds.S

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {

		. = ALIGN(PAGE_SIZE);

		__bss_start = .;		/* BSS */

		*(.bss.page_aligned)

		*(.bss)

		__bss_stop = .;

	}



	.brk : AT(ADDR(.brk) - LOAD_OFFSET) {

		. = ALIGN(PAGE_SIZE);

		__brk_base = .;

		. += 64 * 1024;		/* 64k alignment slop space */

		*(.brk_reservation)	/* areas brk users have reserved */

		__brk_limit = .;

	}



	_end = . ;



	/* Sections to be discarded */

	/DISCARD/ : {

		*(.exitcall.exit)

		*(.eh_frame)

		*(.discard)

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE