riscv: Fix toolchain vector detection

[ Upstream commit 5ba7a75a53dffbf727e842b5847859bb482ac4aa ]

A recent change to gcc flags rv64iv as no longer valid:

   cc1: sorry, unimplemented: Currently the 'V' implementation
   requires the 'M' extension

and as a result vector support is disabled. Fix this by adding m
to our toolchain vector detection code.

Signed-off-by: Anton Blanchard <antonb@tenstorrent.com>
Fixes: fa8e7cce55da ("riscv: Enable Vector code to be built")
Link: https://lore.kernel.org/r/20240819001131.1738806-1-antonb@tenstorrent.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index c785a0200573817ee89024be8316aa818e35a96a..d5d70dc5656ebef81102e53084a428899a34770b 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -489,8 +489,8 @@ config RISCV_ISA_SVPBMT
 config TOOLCHAIN_HAS_V
        bool
        default y
-       depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64iv)
-       depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32iv)
+       depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64imv)
+       depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32imv)
        depends on LLD_VERSION >= 140000 || LD_VERSION >= 23800
        depends on AS_HAS_OPTION_ARCH