Commit 85233c43 authored by Tim Abbott's avatar Tim Abbott Committed by Hirokazu Takata

m32r: Cleanup linker script using new linker script macros.

This patch is largely a straightforward conversion.  One thing to note
is that the new macros use fewer separate output sections than the old
code; this should have no functional impact but is relevant for people
objdumping vmlinux files.

Also note that it moves the .data.init_task output sections inside
_edata.
Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
parent 743486df
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/thread_info.h>
OUTPUT_ARCH(m32r) OUTPUT_ARCH(m32r)
#if defined(__LITTLE_ENDIAN__) #if defined(__LITTLE_ENDIAN__)
...@@ -40,72 +41,22 @@ SECTIONS ...@@ -40,72 +41,22 @@ SECTIONS
#endif #endif
_etext = .; /* End of text section */ _etext = .; /* End of text section */
. = ALIGN(16); /* Exception table */ EXCEPTION_TABLE(16)
__start___ex_table = .;
__ex_table : { *(__ex_table) }
__stop___ex_table = .;
RODATA RODATA
RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
/* writeable */
.data : { /* Data */
DATA_DATA
CONSTRUCTORS
}
. = ALIGN(4096);
__nosave_begin = .;
.data_nosave : { *(.data.nosave) }
. = ALIGN(4096);
__nosave_end = .;
. = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
_edata = .; /* End of data section */ _edata = .; /* End of data section */
. = ALIGN(8192); /* init_task */
.data.init_task : { *(.data.init_task) }
/* will be freed after init */ /* will be freed after init */
. = ALIGN(4096); /* Init code and data */ . = ALIGN(PAGE_SIZE); /* Init code and data */
__init_begin = .; __init_begin = .;
.init.text : { INIT_TEXT_SECTION(PAGE_SIZE)
_sinittext = .; INIT_DATA_SECTION(16)
INIT_TEXT PERCPU(PAGE_SIZE)
_einittext = .; . = ALIGN(PAGE_SIZE);
}
.init.data : { INIT_DATA }
. = ALIGN(16);
__setup_start = .;
.init.setup : { *(.init.setup) }
__setup_end = .;
__initcall_start = .;
.initcall.init : {
INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
.con_initcall.init : { *(.con_initcall.init) }
__con_initcall_end = .;
SECURITY_INIT
#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(4096);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
#endif
PERCPU(4096)
. = ALIGN(4096);
__init_end = .; __init_end = .;
/* freed after init ends here */ /* freed after init ends here */
__bss_start = .; /* BSS */ BSS_SECTION(0, 0, 4)
.bss : { *(.bss) }
. = ALIGN(4);
__bss_stop = .;
_end = . ; _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