From f4d4d6973696cdd6cb5142ade5cc7b521bd7c144 Mon Sep 17 00:00:00 2001 From: J-Heinemann <66268543+J-Heinemann@users.noreply.github.com> Date: Fri, 12 Jun 2020 12:47:06 +0200 Subject: [PATCH] wasm_export.h Function Description & SGX SDK Include path (#279) * Missing SGX SDK Include fixed * Update shared_platform.cmake * CMakeFile remove stdlib from untrusted part * Added two times in function description zero as possible return value * Update shared_platform.cmake Co-authored-by: Joshua Heinemann Co-authored-by: wenyongh --- core/iwasm/include/wasm_export.h | 4 ++-- core/shared/platform/linux-sgx/shared_platform.cmake | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/iwasm/include/wasm_export.h b/core/iwasm/include/wasm_export.h index 0ef3bb982..f9659a2e8 100644 --- a/core/iwasm/include/wasm_export.h +++ b/core/iwasm/include/wasm_export.h @@ -319,7 +319,7 @@ wasm_runtime_lookup_wasi_start_function(wasm_module_inst_t module_inst); * @param name the name of the function * @param signature the signature of the function, ignored currently * - * @return the function instance found + * @return the function instance found. Otherwise NULL will be returned. */ wasm_function_inst_t wasm_runtime_lookup_function(wasm_module_inst_t const module_inst, @@ -331,7 +331,7 @@ wasm_runtime_lookup_function(wasm_module_inst_t const module_inst, * @param module_inst the module instance * @param stack_size the stack size to execute a WASM function * - * @return the execution environment + * @return the execution environment. In case of invalid stack size, NULL will be returned. */ wasm_exec_env_t wasm_runtime_create_exec_env(wasm_module_inst_t module_inst, diff --git a/core/shared/platform/linux-sgx/shared_platform.cmake b/core/shared/platform/linux-sgx/shared_platform.cmake index 810a7cf2e..a92caafee 100644 --- a/core/shared/platform/linux-sgx/shared_platform.cmake +++ b/core/shared/platform/linux-sgx/shared_platform.cmake @@ -14,9 +14,11 @@ else() set (SGX_SDK_DIR $ENV{SGX_SDK}) endif() -include_directories (${SGX_SDK_DIR}/include - ${SGX_SDK_DIR}/include/tlibc - ${SGX_SDK_DIR}/include/libcxx) +include_directories (${SGX_SDK_DIR}/include) +if (NOT BUILD_UNTRUST_PART EQUAL 1) + include_directories (${SGX_SDK_DIR}/include/tlibc + ${SGX_SDK_DIR}/include/libcxx) +endif () file (GLOB_RECURSE source_all ${PLATFORM_SHARED_DIR}/*.c)