mirror of
https://github.com/mii443/wasmer.git
synced 2025-08-23 00:45:32 +00:00
Use wamr from main branch
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -1,3 +1,3 @@
|
|||||||
[submodule "lib/api/third_party/wamr/wasm-micro-runtime"]
|
[submodule "lib/api/third_party/wamr"]
|
||||||
path = lib/api/third_party/wamr/wasm-micro-runtime
|
path = lib/api/third_party/wamr
|
||||||
url = https://github.com/bytecodealliance/wasm-micro-runtime.git
|
url = https://github.com/bytecodealliance/wasm-micro-runtime
|
||||||
|
1
lib/api/third_party/wamr
vendored
Submodule
1
lib/api/third_party/wamr
vendored
Submodule
Submodule lib/api/third_party/wamr added at 6067dbb3ab
2
lib/api/third_party/wamr/.gitignore
vendored
2
lib/api/third_party/wamr/.gitignore
vendored
@ -1,2 +0,0 @@
|
|||||||
build
|
|
||||||
wasm-micro-runtime
|
|
149
lib/api/third_party/wamr/CMakeLists.txt
vendored
149
lib/api/third_party/wamr/CMakeLists.txt
vendored
@ -1,149 +0,0 @@
|
|||||||
# Copyright (C) 2019 Intel Corporation. All rights reserved.
|
|
||||||
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
||||||
|
|
||||||
cmake_minimum_required (VERSION 3.14)
|
|
||||||
|
|
||||||
include(CheckPIESupported)
|
|
||||||
|
|
||||||
if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
|
|
||||||
project(c-api)
|
|
||||||
else()
|
|
||||||
project (c-api C ASM)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT CMAKE_BUILD_TYPE)
|
|
||||||
set(CMAKE_BUILD_TYPE Release)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
|
||||||
################ runtime settings ################
|
|
||||||
|
|
||||||
string (TOLOWER ${CMAKE_HOST_SYSTEM_NAME} WAMR_BUILD_PLATFORM)
|
|
||||||
if (APPLE)
|
|
||||||
add_definitions(-DBH_PLATFORM_DARWIN)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
# Reset default linker flags
|
|
||||||
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
|
|
||||||
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
|
|
||||||
|
|
||||||
# WAMR features switch
|
|
||||||
|
|
||||||
# Set WAMR_BUILD_TARGET, currently values supported:
|
|
||||||
# "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]",
|
|
||||||
# "MIPS", "XTENSA", "RISCV64[sub]", "RISCV32[sub]"
|
|
||||||
if (NOT DEFINED WAMR_BUILD_TARGET)
|
|
||||||
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)")
|
|
||||||
set (WAMR_BUILD_TARGET "AARCH64")
|
|
||||||
if (NOT DEFINED WAMR_BUILD_SIMD)
|
|
||||||
set (WAMR_BUILD_SIMD 1)
|
|
||||||
endif ()
|
|
||||||
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
|
|
||||||
set (WAMR_BUILD_TARGET "RISCV64")
|
|
||||||
elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
||||||
# Build as X86_64 by default in 64-bit platform
|
|
||||||
set (WAMR_BUILD_TARGET "X86_64")
|
|
||||||
if (NOT DEFINED WAMR_BUILD_SIMD)
|
|
||||||
set (WAMR_BUILD_SIMD 1)
|
|
||||||
endif ()
|
|
||||||
elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
||||||
# Build as X86_32 by default in 32-bit platform
|
|
||||||
set (WAMR_BUILD_TARGET "X86_32")
|
|
||||||
else ()
|
|
||||||
message(SEND_ERROR "Unsupported build target platform!")
|
|
||||||
endif ()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if(NOT DEFINED WAMR_BUILD_INTERP)
|
|
||||||
set(WAMR_BUILD_INTERP 1)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT DEFINED WAMR_BUILD_AOT)
|
|
||||||
set(WAMR_BUILD_AOT 0)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT DEFINED WAMR_BUILD_JIT)
|
|
||||||
set(WAMR_BUILD_JIT 0)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(WAMR_BUILD_LIBC_BUILTIN 0)
|
|
||||||
set(WAMR_BUILD_LIBC_WASI 0)
|
|
||||||
set(WAMR_BUILD_MULTI_MODULE 0)
|
|
||||||
set(WAMR_BUILD_DUMP_CALL_STACK 1)
|
|
||||||
set(WAMR_BUILD_REF_TYPES 1)
|
|
||||||
|
|
||||||
# If not defined WAMR_BUILD_GC, set it to 0
|
|
||||||
if(NOT DEFINED WAMRC_BUILD_WITH_GC)
|
|
||||||
set(WAMRC_BUILD_WITH_GC 0)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT DEFINED WAMR_BUILD_FAST_INTERP)
|
|
||||||
set(WAMR_BUILD_FAST_INTERP 1)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (NOT MSVC)
|
|
||||||
# compiling and linking flags
|
|
||||||
if (NOT (CMAKE_C_COMPILER MATCHES ".*clang.*" OR CMAKE_C_COMPILER_ID MATCHES ".*Clang"))
|
|
||||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
|
|
||||||
endif ()
|
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security")
|
|
||||||
if (WAMR_BUILD_TARGET MATCHES "X86_.*" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
|
|
||||||
if (NOT (CMAKE_C_COMPILER MATCHES ".*clang.*" OR CMAKE_C_COMPILER_ID MATCHES ".*Clang"))
|
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mindirect-branch-register")
|
|
||||||
endif ()
|
|
||||||
endif ()
|
|
||||||
endif()
|
|
||||||
# build out vmlib
|
|
||||||
set(WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/wasm-micro-runtime)
|
|
||||||
include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
|
|
||||||
|
|
||||||
add_library(vmlib STATIC ${WAMR_RUNTIME_LIB_SOURCE})
|
|
||||||
if (MSVC)
|
|
||||||
target_compile_definitions(vmlib PRIVATE WASM_API_EXTERN=)
|
|
||||||
endif()
|
|
||||||
target_link_libraries (vmlib ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
|
|
||||||
|
|
||||||
if (WAMR_BUILD_WASM_CACHE EQUAL 1)
|
|
||||||
target_link_libraries(vmlib boringssl_crypto)
|
|
||||||
endif ()
|
|
||||||
################################################
|
|
||||||
|
|
||||||
################# application related ################
|
|
||||||
### locate wat2wasm
|
|
||||||
#find_program(WAT2WASM
|
|
||||||
# wat2wasm
|
|
||||||
# PATHS /opt/wabt/bin
|
|
||||||
# REQUIRED
|
|
||||||
#)
|
|
||||||
#
|
|
||||||
#if(NOT WAT2WASM)
|
|
||||||
# message(SEND_ERROR "can not find wat2wasm")
|
|
||||||
#else ()
|
|
||||||
# execute_process(COMMAND ${WAT2WASM} --version
|
|
||||||
# OUTPUT_VARIABLE WAT2WASM_VERSION_OUTPUT)
|
|
||||||
# string(STRIP ${WAT2WASM_VERSION_OUTPUT} WAT2WASM_VERSION)
|
|
||||||
# message("-- Found wat2wasm ${WAT2WASM_VERSION}")
|
|
||||||
#endif()
|
|
||||||
#
|
|
||||||
#if (${WAT2WASM_VERSION} VERSION_LESS 1.0.26)
|
|
||||||
# set(WAT2WASM_FLAGS "--enable-reference-types")
|
|
||||||
#endif ()
|
|
||||||
#
|
|
||||||
#if(${WAMR_BUILD_AOT} EQUAL 1)
|
|
||||||
# ## locate wamrc
|
|
||||||
# find_program(WAMRC
|
|
||||||
# wamrc
|
|
||||||
# PATHS ${WAMR_ROOT_DIR}/wamr-compiler/build/
|
|
||||||
# )
|
|
||||||
#
|
|
||||||
# if(NOT WAMRC)
|
|
||||||
# message(SEND_ERROR "can not find wamrc. refer to \
|
|
||||||
# https://github.com/bytecodealliance/wasm-micro-runtime#build-wamrc-aot-compiler"
|
|
||||||
# )
|
|
||||||
# endif()
|
|
||||||
#endif()
|
|
||||||
##include (${SHARED_DIR}/utils/uncommon/shared_uncommon.cmake)
|
|
||||||
|
|
||||||
set(MM_UTIL src/utils/multi_module_utils.c)
|
|
||||||
|
|
||||||
# check_pie_supported()
|
|
1
lib/api/third_party/wamr/wasm-micro-runtime
vendored
1
lib/api/third_party/wamr/wasm-micro-runtime
vendored
Submodule lib/api/third_party/wamr/wasm-micro-runtime deleted from b11a1d157d
Reference in New Issue
Block a user