Fix RVV toolchain conflicts.

4 years ago · 8bd5405228
parent cb51a155b2
commit 8bd5405228
2 changed files with 3 additions and 3 deletions
--- a/modules/core/include/opencv2/core/cv_cpu_dispatch.h
+++ b/modules/core/include/opencv2/core/cv_cpu_dispatch.h
@ -142,7 +142,7 @@
 #  define CV_NEON 1
 #endif

-#if defined(__riscv) && defined(__riscv_vector)
+#if defined(__riscv) && defined(__riscv_vector) && defined(__riscv_vector_071)
 # include<riscv-vector.h>
 # define CV_RVV071 1
 #endif
--- a/platforms/linux/riscv64-071-gcc.toolchain.cmake
+++ b/platforms/linux/riscv64-071-gcc.toolchain.cmake
@ -5,5 +5,5 @@ set(CMAKE_CXX_COMPILER riscv64-unknown-linux-gnu-g++)
 set(CMAKE_CXX_FLAGS ""    CACHE STRING "")
 set(CMAKE_C_FLAGS ""    CACHE STRING "")

-set(CMAKE_CXX_FLAGS "-static -march=rv64gcvxthead -mabi=lp64v -pthread")
-set(CMAKE_C_FLAGS "-static -march=rv64gcvxthead -mabi=lp64v -pthread")
+set(CMAKE_CXX_FLAGS "-static -march=rv64gcvxthead -mabi=lp64v -pthread -D__riscv_vector_071")
+set(CMAKE_C_FLAGS "-static -march=rv64gcvxthead -mabi=lp64v -pthread -D__riscv_vector_071")