Remove the BUILD_RV64_LINUX mode Remove the BUILD_RV64_LINUX from codebase as it's not longer needed and not supported by RVV1.0. Change-Id: Ib3636a40e6dc121767124b8315b752580b52d930
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ba311b..5f0802f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -12,16 +12,13 @@ ${CMAKE_CURRENT_LIST_DIR}/cmake/ ) -set(BUILD_RV64_LINUX OFF CACHE BOOL "Build RISC-V 64-bit Linux target (default: OFF)") set(BUILD_INTERNAL_MODELS OFF CACHE BOOL "Build applications from internal models (default: OFF)") set(IREE_SOURCE_DIR "$ENV{ROOTDIR}/toolchain/iree" CACHE PATH "IREE source code path. (default: $ENV{ROOTDIR}/toolchain/iree)") # Use nano spec header and libraries. -if(NOT ${BUILD_RV64_LINUX}) - include_directories(BEFORE SYSTEM "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/include/newlib-nano/") - link_directories(BEFORE "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/lib/newlib-nano/") -endif() +include_directories(BEFORE SYSTEM "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/include/newlib-nano/") +link_directories(BEFORE "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/lib/newlib-nano/") #------------------------------------------------------------------------------- # Springbok-specific settings @@ -53,12 +50,10 @@ #------------------------------------------------------------------------------- set(SPRINGBOK_CONFIG_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/springbok_config.h") add_definitions(-DFLATCC_USE_GENERIC_ALIGNED_ALLOC) -if(NOT ${BUILD_RV64_LINUX}) - add_definitions(-DIREE_PLATFORM_GENERIC) - add_definitions(-DIREE_SYNCHRONIZATION_DISABLE_UNSAFE=1) - add_definitions(-DIREE_FILE_IO_ENABLE=0) - add_definitions(-DIREE_USER_CONFIG_H="${SPRINGBOK_CONFIG_HEADER}") -endif() +add_definitions(-DIREE_PLATFORM_GENERIC) +add_definitions(-DIREE_SYNCHRONIZATION_DISABLE_UNSAFE=1) +add_definitions(-DIREE_FILE_IO_ENABLE=0) +add_definitions(-DIREE_USER_CONFIG_H="${SPRINGBOK_CONFIG_HEADER}") # The project does a cmake hack here -- at the executable linkage stage, we # append the logging library (and springbok BSP). Any logging library update
diff --git a/cmake/riscv_iree.cmake b/cmake/riscv_iree.cmake index 36b08d1..265cf63 100644 --- a/cmake/riscv_iree.cmake +++ b/cmake/riscv_iree.cmake
@@ -38,18 +38,11 @@ set(RISCV_LINKER_FLAGS) set(RISCV_LINKER_FLAGS_EXE) -if(${BUILD_RV64_LINUX}) - set(CMAKE_SYSTEM_NAME Linux) - set(CMAKE_SYSTEM_LIBRARY_PATH "${RISCV_TOOLCHAIN_ROOT}/sysroot/usr/lib") - set(RISCV_COMPILER_FLAGS "${RISCV_COMPILER_FLAGS} -march=rv64gc -mabi=lp64d") - set(RISCV_LINKER_FLAGS "${RISCV_LINKER_FLAGS} -lstdc++ -lpthread -lm -ldl") -else() - set(CMAKE_SYSTEM_NAME Generic) - set(CMAKE_C_STANDARD 11) - set(CMAKE_C_EXTENSIONS OFF) # Force the usage of _ISOC11_SOURCE - set(CMAKE_SYSTEM_LIBRARY_PATH "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/lib") - set(RISCV_COMPILER_FLAGS "${RISCV_COMPILER_FLAGS} -menable-experimental-extensions -march=rv32imf_zvl512b_zve32x -mabi=ilp32") -endif() +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_C_STANDARD 11) +set(CMAKE_C_EXTENSIONS OFF) # Force the usage of _ISOC11_SOURCE +set(CMAKE_SYSTEM_LIBRARY_PATH "${RISCV_TOOLCHAIN_ROOT}/riscv32-unknown-elf/lib") +set(RISCV_COMPILER_FLAGS "${RISCV_COMPILER_FLAGS} -menable-experimental-extensions -march=rv32imf_zvl512b_zve32x -mabi=ilp32") set(CMAKE_C_FLAGS "${RISCV_COMPILER_FLAGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${RISCV_COMPILER_FLAGS} ${RISCV_COMPILER_FLAGS_CXX} ${CMAKE_CXX_FLAGS}")