Linker script cleanup for um
PATCH v2 1/1 Linker script cleanup for um
This is an updated version of the patch I sent on September 6 cleaning up the um architecture's linker scripts. It differs from the previous version only in having been rebased on top of Linus' current master.
This cross-architecture linker script cleanup project is in preparation for adding support for building the kernel with -ffunction-sections -fdata-sections, which is a prerequisite for Ksplice.
-Tim Abbott
Tim Abbott (1):
um: Clean up linker script using standard macros.
arch/um/include/asm/common.lds.S | 29 ++++++----------------------- arch/um/kernel/dyn.lds.S | 9 ++------- arch/um/kernel/uml.lds.S | 26 ++++++-------------------- 3 files changed, 14 insertions(+), 50 deletions(-)
PATCH v2 1/1 um: Clean up linker script using standard macros.
Signed-off-by Tim Abbott <[email protected]>
Cc Jeff Dike <[email protected]>
Cc Sam Ravnborg <[email protected]>
--- arch/um/include/asm/common.lds.S | 29 ++++++----------------------- arch/um/kernel/dyn.lds.S | 9 ++------- arch/um/kernel/uml.lds.S | 26 ++++++-------------------- 3 files changed, 14 insertions(+), 50 deletions(-)
arch/um/include/asm/common.lds.S +6 -23
@@ -16,11 +16,7 @@ . = ALIGN(4096); .note : { *(.note.*) } - __ex_table : { - __start___ex_table = .; - *(__ex_table) - __stop___ex_table = .; - } + EXCEPTION_TABLE(0) BUG_TABLE
@@ -43,28 +39,17 @@ } .init.setup : { - __setup_start = .; - *(.init.setup) - __setup_end = .; + INIT_SETUP(0) } - . = ALIGN(32); - .data.percpu : { - __per_cpu_start = . ; - *(.data.percpu) - __per_cpu_end = . ; - } + PERCPU(32) .initcall.init : { - __initcall_start = .; - INITCALLS - __initcall_end = .; + INIT_CALLS } .con_initcall.init : { - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; + CON_INITCALL } .uml.initcall.init : {
@@ -118,8 +103,6 @@ . = ALIGN(4096); .init.ramfs : { - __initramfs_start = .; - *(.init.ramfs) - __initramfs_end = .; + INIT_RAM_FS }
arch/um/kernel/dyn.lds.S +2 -7
@@ -16,11 +16,7 @@ SECTIONS _text = .; _stext = .; __init_begin = .; - .init.text : { - _sinittext = .; - INIT_TEXT - _einittext = .; - } + INIT_TEXT_SECTION(PAGE_SIZE) . = ALIGN(PAGE_SIZE);
@@ -96,8 +92,7 @@ SECTIONS .init_array : { *(.init_array) } .fini_array : { *(.fini_array) } .data : { - . = ALIGN(KERNEL_STACK_SIZE); /* init_task */ - *(.data.init_task) + INIT_TASK_DATA(KERNEL_STACK_SIZE) . = ALIGN(KERNEL_STACK_SIZE); *(.data.init_irqstack) DATA_DATA
arch/um/kernel/uml.lds.S +6 -20
@@ -22,11 +22,7 @@ SECTIONS _text = .; _stext = .; __init_begin = .; - .init.text : { - _sinittext = .; - INIT_TEXT - _einittext = .; - } + INIT_TEXT_SECTION(PAGE_SIZE) . = ALIGN(PAGE_SIZE); .text :
@@ -52,8 +48,7 @@ SECTIONS init.data : { INIT_DATA } .data : { - . = ALIGN(KERNEL_STACK_SIZE); /* init_task */ - *(.data.init_task) + INIT_TASK_DATA(KERNEL_STACK_SIZE) . = ALIGN(KERNEL_STACK_SIZE); *(.data.init_irqstack) DATA_DATA
@@ -81,19 +76,10 @@ SECTIONS _edata = .; PROVIDE (edata = .); . = ALIGN(PAGE_SIZE); - .sbss : - { - __bss_start = .; - PROVIDE(_bss_start = .); - *(.sbss) - *(.scommon) - } - .bss : - { - *(.dynbss) - *(.bss) - *(COMMON) - } + __bss_start = .; + PROVIDE(_bss_start = .); + SBSS(0) + BSS(0) _end = .; PROVIDE (end = .);
Signature · 13 lines
1.6.3.3 ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [PATCH v2] um: Clean up linker script using standard macros.
Quoted 4 lines · Tim Abbott
Signed-off-by Tim Abbott <[email protected]>Cc Jeff Dike <[email protected]>Cc Sam Ravnborg <[email protected]>
Acked-by Sam Ravnborg <[email protected]>
Sam