Commit a18abcd7 authored by Christophe Leroy's avatar Christophe Leroy Committed by Wen Zhiwei
Browse files

powerpc/vdso: Don't discard rela sections 

stable inclusion
from stable-v6.6.51
commit af4d5630d99161c965f006f9aaef4dc2a19bd10c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYRVR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=af4d5630d99161c965f006f9aaef4dc2a19bd10c



--------------------------------

[ Upstream commit 6114139c3bdde992f4a19264e4f9bfc100d8d776 ]

After building the VDSO, there is a verification that it contains
no dynamic relocation, see commit aff69273 ("vdso: Improve
cmd_vdso_check to check all dynamic relocations").

This verification uses readelf -r and doesn't work if rela sections
are discarded.

Fixes: 8ad57add ("powerpc/build: vdso linker warning for orphan sections")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/45c3e6fc76cad05ad2cac0f5b5dfb4fae86dc9d6.1724153239.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent c38ec462

arch/powerpc/kernel/vdso/vdso32.lds.S

+3 −1
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ SECTIONS 
	.got		: { *(.got) }			:text

	.plt		: { *(.plt) }



	.rela.dyn	: { *(.rela .rela*) }



	_end = .;

	__end = .;

	PROVIDE(end = .);
@@ -87,7 +89,7 @@ SECTIONS 
		*(.branch_lt)

		*(.data .data.* .gnu.linkonce.d.* .sdata*)

		*(.bss .sbss .dynbss .dynsbss)

		*(.got1 .glink .iplt .rela*)

		*(.got1 .glink .iplt)

	}

}

arch/powerpc/kernel/vdso/vdso64.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ SECTIONS 
	.eh_frame_hdr	: { *(.eh_frame_hdr) }		:text	:eh_frame_hdr

	.eh_frame	: { KEEP (*(.eh_frame)) }	:text

	.gcc_except_table : { *(.gcc_except_table) }

	.rela.dyn ALIGN(8) : { *(.rela.dyn) }

	.rela.dyn ALIGN(8) : { *(.rela .rela*) }



	.got ALIGN(8)	: { *(.got .toc) }
@@ -86,7 +86,7 @@ SECTIONS 
		*(.data .data.* .gnu.linkonce.d.* .sdata*)

		*(.bss .sbss .dynbss .dynsbss)

		*(.opd)

		*(.glink .iplt .plt .rela*)

		*(.glink .iplt .plt)

	}

}