From: Marc Zyngier Date: Tue, 28 Jul 2020 15:02:21 +0000 (+0100) Subject: Merge branch 'kvm-arm64/ptrauth-nvhe' into kvmarm-master/next-WIP X-Git-Tag: v5.9-rc1~47^2~6^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc279329a8aecfee50e010312c2dc373ab6810fb;p=thirdparty%2Flinux.git Merge branch 'kvm-arm64/ptrauth-nvhe' into kvmarm-master/next-WIP Signed-off-by: Marc Zyngier --- fc279329a8aecfee50e010312c2dc373ab6810fb diff --cc arch/arm64/Kconfig index 66dc41fd49f23,d719ea9c596d9..27cfac5617454 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -1516,11 -1516,10 +1516,10 @@@ menu "ARMv8.3 architectural features config ARM64_PTR_AUTH bool "Enable support for pointer authentication" default y - depends on !KVM || ARM64_VHE depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC - # GCC 9.1 and later inserts a .note.gnu.property section note for PAC + # Modern compilers insert a .note.gnu.property section note for PAC # which is only understood by binutils starting with version 2.33.1. - depends on !CC_IS_GCC || GCC_VERSION < 90100 || LD_VERSION >= 233010000 + depends on LD_IS_LLD || LD_VERSION >= 233010000 || (CC_IS_GCC && GCC_VERSION < 90100) depends on !CC_IS_CLANG || AS_HAS_CFI_NEGATE_RA_STATE depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS) help