From: Robin Murphy robin.murphy@arm.com
mainline inclusion from mainline-v5.14-rc1 commit b6c4ea48415d26ec08fb67fbbd3eefdb1f96ffa6 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I94XOA CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
Add yet another set of assembly symbol annotations, this time for the borderline-absurd situation of a function aliasing to a weak symbol which itself also wants a position-independent alias.
Signed-off-by: Robin Murphy robin.murphy@arm.com Link: https://lore.kernel.org/r/75545b3c4129b20b887474bb58a9cf302bf2132b.162212852... Signed-off-by: Will Deacon will@kernel.org Signed-off-by: liwei liwei728@huawei.com --- arch/arm64/include/asm/linkage.h | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h index ba89a9af820a..9906541a6861 100644 --- a/arch/arm64/include/asm/linkage.h +++ b/arch/arm64/include/asm/linkage.h @@ -56,8 +56,16 @@ SYM_FUNC_START_ALIAS(__pi_##x); \ SYM_FUNC_START_WEAK(x)
+#define SYM_FUNC_START_WEAK_ALIAS_PI(x) \ + SYM_FUNC_START_ALIAS(__pi_##x); \ + SYM_START(x, SYM_L_WEAK, SYM_A_ALIGN) + #define SYM_FUNC_END_PI(x) \ SYM_FUNC_END(x); \ SYM_FUNC_END_ALIAS(__pi_##x)
+#define SYM_FUNC_END_ALIAS_PI(x) \ + SYM_FUNC_END_ALIAS(x); \ + SYM_FUNC_END_ALIAS(__pi_##x) + #endif