aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-12-11 06:54:52 -0500
committerRalf Baechle <ralf@linux-mips.org>2006-12-11 20:46:24 -0500
commit2efac77e82a36bf616d474f2eb721d95543cfae9 (patch)
treeaf5c5dcb2a6880cef1f8bfcd2b7b3586efc4bd66 /arch/mips
parent8b2f35504d81422beb9e3562ee3dd99e8567cc80 (diff)
[MIPS] Discard .exit.text and .exit.data at runtime.
While the recent cset 86384d544157db23879064cde36061cdcafc6794 did improve things it didn't resolve all the problems. So bite the bullet and discard .exit.text and .exit.data at runtime. Which of course sucks because it bloats binaries with code that will never ever be used but it's the only thing that will work reliable as demonstrated by the function sd_major() in drivers/scsi/sd.c. Gcc may compile sd_major() using a jump table which it will put into .rodata. If it also inlines sd_major's function body into exit_sd() which gcc > 3.4.x does. If CONFIG_BLK_DEV_SD has been set to y we would like ld to discard exit_sd's code at link time. However sd_major happens to contain a switch statement which gcc will compile using a jump table in .rodata on the architectures I checked. So, when ld later discards .exit.text only the jump table in .rodata with its stale references to the discard .exit.text will be left which any no antique ld will honor with a link error. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/vmlinux.lds.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 2f4508f55fca..cecff24cc972 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -109,6 +109,10 @@ SECTIONS
109 .con_initcall.init : { *(.con_initcall.init) } 109 .con_initcall.init : { *(.con_initcall.init) }
110 __con_initcall_end = .; 110 __con_initcall_end = .;
111 SECURITY_INIT 111 SECURITY_INIT
112 /* .exit.text is discarded at runtime, not link time, to deal with
113 references from .rodata */
114 .exit.text : { *(.exit.text) }
115 .exit.data : { *(.exit.data) }
112 . = ALIGN(_PAGE_SIZE); 116 . = ALIGN(_PAGE_SIZE);
113 __initramfs_start = .; 117 __initramfs_start = .;
114 .init.ramfs : { *(.init.ramfs) } 118 .init.ramfs : { *(.init.ramfs) }
@@ -136,8 +140,6 @@ SECTIONS
136 140
137 /* Sections to be discarded */ 141 /* Sections to be discarded */
138 /DISCARD/ : { 142 /DISCARD/ : {
139 *(.exit.text)
140 *(.exit.data)
141 *(.exitcall.exit) 143 *(.exitcall.exit)
142 144
143 /* ABI crap starts here */ 145 /* ABI crap starts here */