Commit 5d150a97 authored by Tim Abbott's avatar Tim Abbott Committed by Linus Torvalds

um: Clean up linker script using standard macros.

Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: user-mode-linux-devel@lists.sourceforge.net
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd3db323
...@@ -16,11 +16,7 @@ ...@@ -16,11 +16,7 @@
. = ALIGN(4096); . = ALIGN(4096);
.note : { *(.note.*) } .note : { *(.note.*) }
__ex_table : { EXCEPTION_TABLE(0)
__start___ex_table = .;
*(__ex_table)
__stop___ex_table = .;
}
BUG_TABLE BUG_TABLE
...@@ -43,28 +39,17 @@ ...@@ -43,28 +39,17 @@
} }
.init.setup : { .init.setup : {
__setup_start = .; INIT_SETUP(0)
*(.init.setup)
__setup_end = .;
} }
. = ALIGN(32); PERCPU(32)
.data.percpu : {
__per_cpu_start = . ;
*(.data.percpu)
__per_cpu_end = . ;
}
.initcall.init : { .initcall.init : {
__initcall_start = .; INIT_CALLS
INITCALLS
__initcall_end = .;
} }
.con_initcall.init : { .con_initcall.init : {
__con_initcall_start = .; CON_INITCALL
*(.con_initcall.init)
__con_initcall_end = .;
} }
.uml.initcall.init : { .uml.initcall.init : {
...@@ -118,8 +103,6 @@ ...@@ -118,8 +103,6 @@
. = ALIGN(4096); . = ALIGN(4096);
.init.ramfs : { .init.ramfs : {
__initramfs_start = .; INIT_RAM_FS
*(.init.ramfs)
__initramfs_end = .;
} }
...@@ -16,11 +16,7 @@ SECTIONS ...@@ -16,11 +16,7 @@ SECTIONS
_text = .; _text = .;
_stext = .; _stext = .;
__init_begin = .; __init_begin = .;
.init.text : { INIT_TEXT_SECTION(PAGE_SIZE)
_sinittext = .;
INIT_TEXT
_einittext = .;
}
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
...@@ -96,8 +92,7 @@ SECTIONS ...@@ -96,8 +92,7 @@ SECTIONS
.init_array : { *(.init_array) } .init_array : { *(.init_array) }
.fini_array : { *(.fini_array) } .fini_array : { *(.fini_array) }
.data : { .data : {
. = ALIGN(KERNEL_STACK_SIZE); /* init_task */ INIT_TASK_DATA(KERNEL_STACK_SIZE)
*(.data.init_task)
. = ALIGN(KERNEL_STACK_SIZE); . = ALIGN(KERNEL_STACK_SIZE);
*(.data.init_irqstack) *(.data.init_irqstack)
DATA_DATA DATA_DATA
......
...@@ -22,11 +22,7 @@ SECTIONS ...@@ -22,11 +22,7 @@ SECTIONS
_text = .; _text = .;
_stext = .; _stext = .;
__init_begin = .; __init_begin = .;
.init.text : { INIT_TEXT_SECTION(PAGE_SIZE)
_sinittext = .;
INIT_TEXT
_einittext = .;
}
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.text : .text :
...@@ -52,8 +48,7 @@ SECTIONS ...@@ -52,8 +48,7 @@ SECTIONS
init.data : { INIT_DATA } init.data : { INIT_DATA }
.data : .data :
{ {
. = ALIGN(KERNEL_STACK_SIZE); /* init_task */ INIT_TASK_DATA(KERNEL_STACK_SIZE)
*(.data.init_task)
. = ALIGN(KERNEL_STACK_SIZE); . = ALIGN(KERNEL_STACK_SIZE);
*(.data.init_irqstack) *(.data.init_irqstack)
DATA_DATA DATA_DATA
...@@ -81,19 +76,10 @@ SECTIONS ...@@ -81,19 +76,10 @@ SECTIONS
_edata = .; _edata = .;
PROVIDE (edata = .); PROVIDE (edata = .);
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.sbss : __bss_start = .;
{ PROVIDE(_bss_start = .);
__bss_start = .; SBSS(0)
PROVIDE(_bss_start = .); BSS(0)
*(.sbss)
*(.scommon)
}
.bss :
{
*(.dynbss)
*(.bss)
*(COMMON)
}
_end = .; _end = .;
PROVIDE (end = .); PROVIDE (end = .);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment