Skip to content

Commit 886516f

Browse files
ebiggerspalmer-dabbelt
authored andcommitted
RISC-V: fix check for zvkb with tip-of-tree clang
LLVM commit 8e01042da9d3 ("[RISCV] Add missing dependency check for Zvkb (#79467)") broke the check used by the TOOLCHAIN_HAS_VECTOR_CRYPTO kconfig symbol because it made zvkb start depending on v or zve*. Fix this by specifying both v and zvkb when checking for support for zvkb. Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20240127090055.124336-1-ebiggers@kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent aba3f18 commit 886516f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/riscv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ config TOOLCHAIN_HAS_ZBB
591591
# extensions, including Zvk*, Zvbb, and Zvbc. LLVM added all of these at once.
592592
# binutils added all except Zvkb, then added Zvkb. So we just check for Zvkb.
593593
config TOOLCHAIN_HAS_VECTOR_CRYPTO
594-
def_bool $(as-instr, .option arch$(comma) +zvkb)
594+
def_bool $(as-instr, .option arch$(comma) +v$(comma) +zvkb)
595595
depends on AS_HAS_OPTION_ARCH
596596

597597
config RISCV_ISA_ZBB

0 commit comments

Comments
 (0)