Skip to content

L
linux
Commit 0f5c9064 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ralf Baechle
Browse files
Options

[MIPS] Introduce a consistent style for vmlinux.lds. 

This style will be consitent with all other arch's - soon.

In addition:
- Moved a few labels inside brackets for the sections they specify
  to prevent that linker alignmnet made them point before the section start
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d5ab1a69
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 150 deletions
arch/mips/kernel/vmlinux.lds.S
View file @ 0f5c9064
...@@ -6,163 +6,202 @@ ...@@ -6,163 +6,202 @@
OUTPUT_ARCH(mips) OUTPUT_ARCH(mips)
ENTRY(kernel_entry) ENTRY(kernel_entry)
jiffies = JIFFIES; jiffies = JIFFIES;
SECTIONS SECTIONS
{ {
#ifdef CONFIG_BOOT_ELF64 #ifdef CONFIG_BOOT_ELF64
/* Read-only sections, merged into text segment: */ /* Read-only sections, merged into text segment: */
/* . = 0xc000000000000000; */ /* . = 0xc000000000000000; */
/* This is the value for an Origin kernel, taken from an IRIX kernel. */ /* This is the value for an Origin kernel, taken from an IRIX kernel. */
/* . = 0xc00000000001c000; */ /* . = 0xc00000000001c000; */
/* Set the vaddr for the text segment to a value /* Set the vaddr for the text segment to a value
>= 0xa800 0000 0001 9000 if no symmon is going to configured * >= 0xa800 0000 0001 9000 if no symmon is going to configured
>= 0xa800 0000 0030 0000 otherwise */ * >= 0xa800 0000 0030 0000 otherwise
*/
/* . = 0xa800000000300000; */ /* . = 0xa800000000300000; */
/* . = 0xa800000000300000; */ /* . = 0xa800000000300000; */
. = 0xffffffff80300000; . = 0xffffffff80300000;
#endif #endif
. = LOADADDR; . = LOADADDR;
/* read-only */ /* read-only */
_text = .; /* Text and read-only data */ _text = .; /* Text and read-only data */
.text : { .text : {
TEXT_TEXT TEXT_TEXT
SCHED_TEXT SCHED_TEXT
LOCK_TEXT LOCK_TEXT
*(.fixup) *(.fixup)
*(.gnu.warning) *(.gnu.warning)
} =0 } =0
_etext = .; /* End of text section */
_etext = .; /* End of text section */
/* Exception table */
. = ALIGN(16); /* Exception table */ . = ALIGN(16);
__start___ex_table = .; __ex_table : {
__ex_table : { *(__ex_table) } __start___ex_table = .;
__stop___ex_table = .; *(__ex_table)
__stop___ex_table = .;
__start___dbe_table = .; /* Exception table for data bus errors */ }
__dbe_table : { *(__dbe_table) }
__stop___dbe_table = .; /* Exception table for data bus errors */
__dbe_table : {
NOTES __start___dbe_table = .;
*(__dbe_table)
RODATA __stop___dbe_table = .;
}
/* writeable */ RODATA
.data : { /* Data */
. = . + DATAOFFSET; /* for CONFIG_MAPPED_KERNEL */ /* writeable */
/* .data : { /* Data */
* This ALIGN is needed as a workaround for a bug a gcc bug upto 4.1 which . = . + DATAOFFSET; /* for CONFIG_MAPPED_KERNEL */
* limits the maximum alignment to at most 32kB and results in the following /*
* warning: * This ALIGN is needed as a workaround for a bug a gcc bug upto 4.1 which
* * limits the maximum alignment to at most 32kB and results in the following
* CC arch/mips/kernel/init_task.o * warning:
* arch/mips/kernel/init_task.c:30: warning: alignment of ‘init_thread_union’ *
* is greater than maximum object file alignment. Using 32768 * CC arch/mips/kernel/init_task.o
*/ * arch/mips/kernel/init_task.c:30: warning: alignment of ‘init_thread_union’
. = ALIGN(_PAGE_SIZE); * is greater than maximum object file alignment. Using 32768
*(.data.init_task) */
. = ALIGN(_PAGE_SIZE);
DATA_DATA *(.data.init_task)
CONSTRUCTORS DATA_DATA
} CONSTRUCTORS
_gp = . + 0x8000; }
.lit8 : { *(.lit8) } _gp = . + 0x8000;
.lit4 : { *(.lit4) } .lit8 : {
/* We want the small data sections together, so single-instruction offsets *(.lit8)
can access them all, and initialized data all before uninitialized, so }
we can shorten the on-disk segment size. */ .lit4 : {
.sdata : { *(.sdata) } *(.lit4)
}
. = ALIGN(_PAGE_SIZE); /* We want the small data sections together, so single-instruction offsets
__nosave_begin = .; can access them all, and initialized data all before uninitialized, so
.data_nosave : { *(.data.nosave) } we can shorten the on-disk segment size. */
. = ALIGN(_PAGE_SIZE); .sdata : {
__nosave_end = .; *(.sdata)
}
. = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) } . = ALIGN(_PAGE_SIZE);
.data_nosave : {
_edata = .; /* End of data section */ __nosave_begin = .;
*(.data.nosave)
/* will be freed after init */ }
. = ALIGN(_PAGE_SIZE); /* Init code and data */ . = ALIGN(_PAGE_SIZE);
__init_begin = .; __nosave_end = .;
.init.text : {
_sinittext = .; . = ALIGN(32);
*(.init.text) .data.cacheline_aligned : {
_einittext = .; *(.data.cacheline_aligned)
} }
.init.data : { *(.init.data) } _edata = .; /* End of data section */
. = ALIGN(16);
__setup_start = .; /* will be freed after init */
.init.setup : { *(.init.setup) } . = ALIGN(_PAGE_SIZE); /* Init code and data */
__setup_end = .; __init_begin = .;
.init.text : {
__initcall_start = .; _sinittext = .;
.initcall.init : { *(.init.text)
INITCALLS _einittext = .;
} }
__initcall_end = .; .init.data : {
*(.init.data)
__con_initcall_start = .; }
.con_initcall.init : { *(.con_initcall.init) } . = ALIGN(16);
__con_initcall_end = .; .init.setup : {
SECURITY_INIT __setup_start = .;
/* .exit.text is discarded at runtime, not link time, to deal with *(.init.setup)
references from .rodata */ __setup_end = .;
.exit.text : { *(.exit.text) } }
.exit.data : { *(.exit.data) }
.initcall.init : {
__initcall_start = .;
INITCALLS
__initcall_end = .;
}
.con_initcall.init : {
__con_initcall_start = .;
*(.con_initcall.init)
__con_initcall_end = .;
}
SECURITY_INIT
/* .exit.text is discarded at runtime, not link time, to deal with
* references from .rodata
*/
.exit.text : {
*(.exit.text)
}
.exit.data : {
*(.exit.data)
}
#if defined(CONFIG_BLK_DEV_INITRD) #if defined(CONFIG_BLK_DEV_INITRD)
. = ALIGN(_PAGE_SIZE); . = ALIGN(_PAGE_SIZE);
__initramfs_start = .; .init.ramfs : {
.init.ramfs : { *(.init.ramfs) } __initramfs_start = .;
__initramfs_end = .; *(.init.ramfs)
__initramfs_end = .;
}
#endif #endif
PERCPU(_PAGE_SIZE) PERCPU(_PAGE_SIZE)
. = ALIGN(_PAGE_SIZE); . = ALIGN(_PAGE_SIZE);
__init_end = .; __init_end = .;
/* freed after init ends here */ /* freed after init ends here */
__bss_start = .; /* BSS */ __bss_start = .; /* BSS */
.sbss : { .sbss : {
*(.sbss) *(.sbss)
*(.scommon) *(.scommon)
} }
.bss : { .bss : {
*(.bss) *(.bss)
*(COMMON) *(COMMON)
} }
__bss_stop = .; __bss_stop = .;
_end = . ; _end = . ;
/* Sections to be discarded */ /* Sections to be discarded */
/DISCARD/ : { /DISCARD/ : {
*(.exitcall.exit) *(.exitcall.exit)
/* ABI crap starts here */ /* ABI crap starts here */
*(.MIPS.options) *(.MIPS.options)
*(.options) *(.options)
*(.pdr) *(.pdr)
*(.reginfo) *(.reginfo)
} }
/* These mark the ABI of the kernel for debuggers. */ /* These mark the ABI of the kernel for debuggers. */
.mdebug.abi32 : { KEEP(*(.mdebug.abi32)) } .mdebug.abi32 : {
.mdebug.abi64 : { KEEP(*(.mdebug.abi64)) } KEEP(*(.mdebug.abi32))
}
/* This is the MIPS specific mdebug section. */ .mdebug.abi64 : {
.mdebug : { *(.mdebug) } KEEP(*(.mdebug.abi64))
}
STABS_DEBUG
/* This is the MIPS specific mdebug section. */
DWARF_DEBUG .mdebug : {
*(.mdebug)
/* These must appear regardless of . */ }
.gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
.gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) } STABS_DEBUG
.note : { *(.note) } DWARF_DEBUG
/* These must appear regardless of . */
.gptab.sdata : {
*(.gptab.data)
*(.gptab.sdata)
}
.gptab.sbss : {
*(.gptab.bss)
*(.gptab.sbss)
}
.note : {
*(.note)
}
} }
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7