summaryrefslogtreecommitdiffstats
path: root/arch/arm64/Kconfig
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2021-10-29 12:25:38 +0100
committerWill Deacon <will@kernel.org>2021-10-29 12:25:38 +0100
commitb2909a447ec3f3713b142bf8592733f51e4661fc (patch)
tree1155ba3912a44b8194b1a135341e98a88c718e6b /arch/arm64/Kconfig
parente5f521021279dfc52c03c8a1c3f6159c2add1f74 (diff)
parent3e6f8d1fa18457d54b20917bd9174d27daf09ab9 (diff)
downloadlinux-b2909a447ec3f3713b142bf8592733f51e4661fc.tar.gz
linux-b2909a447ec3f3713b142bf8592733f51e4661fc.tar.bz2
linux-b2909a447ec3f3713b142bf8592733f51e4661fc.zip
Merge branch 'for-next/vdso' into for-next/core
* for-next/vdso: arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd arm64: vdso32: suppress error message for 'make mrproper' arm64: vdso32: drop test for -march=armv8-a arm64: vdso32: drop the test for dmb ishld
Diffstat (limited to 'arch/arm64/Kconfig')
-rw-r--r--arch/arm64/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index da9a756be674..53a6855dbdf0 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1379,7 +1379,8 @@ config KUSER_HELPERS
config COMPAT_VDSO
bool "Enable vDSO for 32-bit applications"
- depends on !CPU_BIG_ENDIAN && "$(CROSS_COMPILE_COMPAT)" != ""
+ depends on !CPU_BIG_ENDIAN
+ depends on (CC_IS_CLANG && LD_IS_LLD) || "$(CROSS_COMPILE_COMPAT)" != ""
select GENERIC_COMPAT_VDSO
default y
help