[tip:,x86/urgent] x86/vdso: Conditionally export __vdso_sgx_enter_enclave()

Message ID 167059453391.4906.374881146743460680.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/urgent] x86/vdso: Conditionally export __vdso_sgx_enter_enclave() |

Commit Message

tip-bot2 for Thomas Gleixner Dec. 9, 2022, 2:02 p.m. UTC
  The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     45be2ad007a9c6bea70249c4cf3e4905afe4caeb
Gitweb:        https://git.kernel.org/tip/45be2ad007a9c6bea70249c4cf3e4905afe4caeb
Author:        Nathan Chancellor <nathan@kernel.org>
AuthorDate:    Tue, 08 Nov 2022 17:03:07 -07:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 09 Dec 2022 14:58:02 +01:00

x86/vdso: Conditionally export __vdso_sgx_enter_enclave()

Recently, ld.lld moved from '--undefined-version' to
'--no-undefined-version' as the default, which breaks building the vDSO
when CONFIG_X86_SGX is not set:

  ld.lld: error: version script assignment of 'LINUX_2.6' to symbol '__vdso_sgx_enter_enclave' failed: symbol not defined

__vdso_sgx_enter_enclave is only included in the vDSO when
CONFIG_X86_SGX is set. Only export it if it will be present in the final
object, which clears up the error.

Fixes: 8466436952017 ("x86/vdso: Implement a vDSO for Intel SGX enclave call")                                                                                                                                                               
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1756
Link: https://lore.kernel.org/r/20221109000306.1407357-1-nathan@kernel.org
---
 arch/x86/entry/vdso/vdso.lds.S | 2 ++
 1 file changed, 2 insertions(+)
  

Patch

diff --git a/arch/x86/entry/vdso/vdso.lds.S b/arch/x86/entry/vdso/vdso.lds.S
index 4bf4846..e8c60ae 100644
--- a/arch/x86/entry/vdso/vdso.lds.S
+++ b/arch/x86/entry/vdso/vdso.lds.S
@@ -27,7 +27,9 @@  VERSION {
 		__vdso_time;
 		clock_getres;
 		__vdso_clock_getres;
+#ifdef CONFIG_X86_SGX
 		__vdso_sgx_enter_enclave;
+#endif
 	local: *;
 	};
 }