Compare commits

..

2 Commits

Author SHA1 Message Date
Zhenwei Jin
49985986e8
Merge 58ccc6d267 into 0e8b57d8a8 2025-05-07 11:33:19 +08:00
zhenweijin
58ccc6d267 prevent abort in get_current_target when AOT and compiler both enabled 2025-05-07 11:02:19 +08:00
2 changed files with 3 additions and 3 deletions

View File

@ -28,7 +28,7 @@ if (WAMR_BUILD_AOT_VALIDATOR EQUAL 1)
list (APPEND c_source_all ${IWASM_AOT_DIR}/aot_validator.c)
endif ()
if (WAMR_BUILD_WAMR_COMPILER EQUAL 1)
if (WAMR_BUILD_WAMR_COMPILER EQUAL 1 AND WAMR_BUILD_AOT EQUAL 0)
# AOT reloc functions are not used during AOT compilation
set (arch_source ${IWASM_AOT_DIR}/arch/aot_reloc_dummy.c)
elseif (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")

View File

@ -6,7 +6,7 @@ if(NOT WAMR_BUILD_INTERP)
set(WAMR_BUILD_INTERP 1)
endif()
set(WAMR_BUILD_WAMR_COMPILER 0)
set(WAMR_BUILD_WAMR_COMPILER 1)
set(WAMR_BUILD_AOT 1)
set(WAMR_BUILD_INTERP 1)
set(WAMR_BUILD_JIT 0)
@ -69,7 +69,7 @@ target_link_libraries(aotclib PUBLIC ${REQUIRED_LLVM_LIBS})
if(NOT IN_OSS_FUZZ)
message(STATUS "Enable ASan and UBSan in non-oss-fuzz environment")
target_compile_options(aotclib PUBLIC
target_compile_options(aotclib PUBLIC
-fprofile-instr-generate -fcoverage-mapping
-fno-sanitize-recover=all
-fsanitize=address,undefined