s390: vmlinux.lds.S: Drop .hash and .gnu.hash for !CONFIG_PIE_BUILD

sumanthkorikkar · Alexander Gordeev · commit 5f90003f0904 · 2024-04-29T17:33:30.000+02:00
Sections .hash and .gnu.hash are only created when CONFIG_PIE_BUILD option is enabled. Drop these for the case CONFIG_PIE_BUILD is disabled. [ agordeev: Reworded the commit message ] Fixes: 778666d ("s390: compile relocatable kernel without -fPIE") Suggested-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com> Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
@@ -209,13 +209,13 @@ SECTIONS
 	.dynstr ALIGN(8) : {
 		*(.dynstr)
 	}
-#endif
 	.hash ALIGN(8) : {
 		*(.hash)
 	}
 	.gnu.hash ALIGN(8) : {
 		*(.gnu.hash)
 	}
+#endif
 
 	. = ALIGN(PAGE_SIZE);
 	__init_end = .;		/* freed after init ends here */

Original file line number	Diff line number	Diff line change
`@@ -209,13 +209,13 @@ SECTIONS`
`209`	`209`	`.dynstr ALIGN(8) : {`
`210`	`210`	`*(.dynstr)`
`211`	`211`	`}`
`212`		`-#endif`
`213`	`212`	`.hash ALIGN(8) : {`
`214`	`213`	`*(.hash)`
`215`	`214`	`}`
`216`	`215`	`.gnu.hash ALIGN(8) : {`
`217`	`216`	`*(.gnu.hash)`
`218`	`217`	`}`
	`218`	`+#endif`
`219`	`219`
`220`	`220`	`. = ALIGN(PAGE_SIZE);`
`221`	`221`	`__init_end = .; /* freed after init ends here */`