cris: Cleanup linker script using new linker script macros.
PATCH 1/1 cris: Cleanup linker script using new linker script macros.
--- arch/cris/kernel/vmlinux.lds.S | 41 +++++++-------------------------------- 1 files changed, 8 insertions(+), 33 deletions(-)
arch/cris/kernel/vmlinux.lds.S +8 -33
@@ -51,61 +51,40 @@ SECTIONS _etext = . ; /* End of text section. */ __etext = .; - . = ALIGN(4); /* Exception table. */ - __start___ex_table = .; - __ex_table : { *(__ex_table) } - __stop___ex_table = .; + EXCEPTION_TABLE(4) RODATA . = ALIGN (4); ___data_start = . ; __Sdata = . ; - .data : { /* Data */ - DATA_DATA - } + RW_DATA_SECTION(0, PAGE_SIZE, PAGE_SIZE) __edata = . ; /* End of data section. */ _edata = . ; - . = ALIGN(PAGE_SIZE); /* init_task and stack, must be aligned. */ - .data.init_task : { *(.data.init_task) } - . = ALIGN(PAGE_SIZE); /* Init code and data. */ __init_begin = .; - .init.text : { - _sinittext = .; - INIT_TEXT - _einittext = .; - } + INIT_TEXT_SECTION(PAGE_SIZE) .init.data : { INIT_DATA } - . = ALIGN(16); - __setup_start = .; - .init.setup : { *(.init.setup) } - __setup_end = .; + .init.setup : { INIT_SETUP(16) } #ifdef CONFIG_ETRAX_ARCH_V32 __start___param = .; __param : { *(__param) } __stop___param = .; #endif .initcall.init : { - __initcall_start = .; - INITCALLS - __initcall_end = .; + INIT_CALLS } .con_initcall.init : { - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; + CON_INITCALL } SECURITY_INIT #ifdef CONFIG_ETRAX_ARCH_V10 #ifdef CONFIG_BLK_DEV_INITRD .init.ramfs : { - __initramfs_start = .; - *(.init.ramfs) - __initramfs_end = .; + INIT_RAM_FS } #endif #endif
@@ -130,11 +109,7 @@ SECTIONS __init_end = .; __data_end = . ; /* Move to _edata ? */ - __bss_start = .; /* BSS. */ - .bss : { - *(COMMON) - *(.bss) - } + BSS_SECTION(0, 0, 0) . = ALIGN (0x20); _end = .;
Signature · 1 line
1.6.3.3
Quoted 21 lines · Tim Abbott
Signed-off-by Tim Abbott <[email protected]>Cc Mikael Starvik <[email protected]>Cc Jesper Nilsson <[email protected]>--- arch/cris/kernel/vmlinux.lds.S | 41 +++++++-------------------------------- 1 files changed, 8 insertions(+), 33 deletions(-)arch/cris/kernel/vmlinux.lds.S +1
-4@@ -51,61 +51,40 @@ SECTIONS _etext = . ; /* End of text section. */ __etext = .; - . = ALIGN(4); /* Exception table. */ - __start___ex_table = .; - __ex_table : { *(__ex_table) } - __stop___ex_table = .; + EXCEPTION_TABLE(4)
arch/cris/kernel/vmlinux.lds.S SECTIONS · line 61
Quoted 10 lines
arch/cris/kernel/vmlinux.lds.S +1
-3RODATA . = ALIGN (4); ___data_start = . ; __Sdata = . ; - .data : { /* Data */ - DATA_DATA - } + RW_DATA_SECTION(0, PAGE_SIZE, PAGE_SIZE)
This causes some problems, and I'm not ldscript guru enough to immediately grasp the problem. What I get is this:
...
LD vmlinuxarch/cris/kernel/vmlinux.lds:326 cannot move location counter backwards (from c017e000 to 00000000) make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
I've dropped that part of the patch, and I'll try to boot test the rest of the patch this week.
Quoted 65 lines
arch/cris/kernel/vmlinux.lds.S +6
-26__edata = . ; /* End of data section. */ _edata = . ; - . = ALIGN(PAGE_SIZE); /* init_task and stack, must be aligned. */ - .data.init_task : { *(.data.init_task) } - . = ALIGN(PAGE_SIZE); /* Init code and data. */ __init_begin = .; - .init.text : { - _sinittext = .; - INIT_TEXT - _einittext = .; - } + INIT_TEXT_SECTION(PAGE_SIZE) .init.data : { INIT_DATA } - . = ALIGN(16); - __setup_start = .; - .init.setup : { *(.init.setup) } - __setup_end = .; + .init.setup : { INIT_SETUP(16) } #ifdef CONFIG_ETRAX_ARCH_V32 __start___param = .; __param : { *(__param) } __stop___param = .; #endif .initcall.init : { - __initcall_start = .; - INITCALLS - __initcall_end = .; + INIT_CALLS } .con_initcall.init : { - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; + CON_INITCALL } SECURITY_INIT #ifdef CONFIG_ETRAX_ARCH_V10 #ifdef CONFIG_BLK_DEV_INITRD .init.ramfs : { - __initramfs_start = .; - *(.init.ramfs) - __initramfs_end = .; + INIT_RAM_FS } #endif #endif@@ -130,11 +109,7 @@ SECTIONS __init_end = .; __data_end = . ; /* Move to _edata ? */ - __bss_start = .; /* BSS. */ - .bss : { - *(COMMON) - *(.bss) - } + BSS_SECTION(0, 0, 0) . = ALIGN (0x20); _end = .;Signature · 1 line
1.6.3.3
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Quoted 12 lines · Jesper Nilsson
arch/cris/kernel/vmlinux.lds.S SECTIONS · line 61
Quoted 7 lines · Tim Abbott
arch/cris/kernel/vmlinux.lds.S +1
-3. = ALIGN (4); ___data_start = . ; __Sdata = . ; - .data : { /* Data */ - DATA_DATA - } + RW_DATA_SECTION(0, PAGE_SIZE, PAGE_SIZE)This causes some problems, and I'm not ldscript guru enough to immediately grasp the problem. What I get is this:
Quoted 5 lines
...
LD vmlinuxarch/cris/kernel/vmlinux.lds:326cannot move location counter backwards (fromc017e000to 00000000) make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
Hmm. I spent a bit looking at it, and I don't have a guess for what the problem is there.
Quoted 2 lines
I've dropped that part of the patch, and I'll try to boot test the rest of the patch this week.
Yeah, it's probably fine to just drop it for now, since it has fairly small cleanup impact on cris.
However, just dropping that hunk is not going to work -- you'll need to re-add the .data.init_task hunk below (which had been part of RW_DATA_SECTION).
-Tim Abbott
Quoted 8 lines
Quoted 8 lines
arch/cris/kernel/vmlinux.lds.S +0
-3__edata = . ; /* End of data section. */ _edata = . ; - . = ALIGN(PAGE_SIZE); /* init_task and stack, must be aligned. */ - .data.init_task : { *(.data.init_task) } - . = ALIGN(PAGE_SIZE); /* Init code and data. */ __init_begin = .;
Quoted 25 lines · Tim Abbott
Quoted 12 lines · Jesper Nilsson
arch/cris/kernel/vmlinux.lds.S SECTIONS · line 61
Quoted 7 lines · Tim Abbott
arch/cris/kernel/vmlinux.lds.S +1
-3. = ALIGN (4); ___data_start = . ; __Sdata = . ; - .data : { /* Data */ - DATA_DATA - } + RW_DATA_SECTION(0, PAGE_SIZE, PAGE_SIZE)This causes some problems, and I'm not ldscript guru enough to immediately grasp the problem. What I get is this:
Quoted 5 lines
...
LD vmlinuxarch/cris/kernel/vmlinux.lds:326cannot move location counter backwards (fromc017e000to 00000000) make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2Hmm. I spent a bit looking at it, and I don't have a guess for what the problem is there.
Quoted 2 lines
I've dropped that part of the patch, and I'll try to boot test the rest of the patch this week.
Quoted 6 lines
Yeah, it's probably fine to just drop it for now, since it has fairly small cleanup impact on cris.
However, just dropping that hunk is not going to work -- you'll need to re-add the .data.init_task hunk below (which had been part of
RW_DATA_SECTION).
Yes, sorry, I did that, but didn't mention it.
Or rather, I added: INIT_TASK_DATA_SECTION(PAGE_SIZE) instead.
Quoted 10 lines
-Tim Abbott
Quoted 8 lines
arch/cris/kernel/vmlinux.lds.S SECTIONS · line 66
Quoted 8 lines
arch/cris/kernel/vmlinux.lds.S +0
-3__edata = . ; /* End of data section. */ _edata = . ; - . = ALIGN(PAGE_SIZE); /* init_task and stack, must be aligned. */ - .data.init_task : { *(.data.init_task) } - . = ALIGN(PAGE_SIZE); /* Init code and data. */ __init_begin = .;
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]