module: set .init_array alignment to 8

daviddaney · Jessica Yu · commit 5bd933fe4481 · 2017-03-13T09:40:28.000-07:00
The proper idiom for aligning linker sections in modules is different than for built-in sections. ". = ALIGN();" followed by a forced output address of 0 does nothing, as forcing the address changes the value of ".". Use output section alignment specifier instead. Fixes: 9ddf825 ("kernel: add support for .init_array.* constructors") Reviewed-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Signed-off-by: David Daney <david.daney@cavium.com> Signed-off-by: Jessica Yu <jeyu@redhat.com>
diff --git a/scripts/module-common.lds b/scripts/module-common.lds
@@ -20,8 +20,7 @@ SECTIONS {
 	__kcrctab_unused_gpl	0 : { *(SORT(___kcrctab_unused_gpl+*)) }
 	__kcrctab_gpl_future	0 : { *(SORT(___kcrctab_gpl_future+*)) }
 
-	. = ALIGN(8);
-	.init_array		0 : { *(SORT(.init_array.*)) *(.init_array) }
+	.init_array		0 : ALIGN(8) { *(SORT(.init_array.*)) *(.init_array) }
 
 	__jump_table		0 : ALIGN(8) { KEEP(*(__jump_table)) }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ SECTIONS {`
`20`	`20`	`__kcrctab_unused_gpl 0 : { (SORT(___kcrctab_unused_gpl+)) }`
`21`	`21`	`__kcrctab_gpl_future 0 : { (SORT(___kcrctab_gpl_future+)) }`
`22`	`22`
`23`		`- . = ALIGN(8);`
`24`		`- .init_array 0 : { (SORT(.init_array.)) *(.init_array) }`
	`23`	`+ .init_array 0 : ALIGN(8) { (SORT(.init_array.)) *(.init_array) }`
`25`	`24`
`26`	`25`	`__jump_table 0 : ALIGN(8) { KEEP(*(__jump_table)) }`
`27`	`26`	`}`