gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2024-11-26 23:42:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Upgrade uvwasi to 1.42.0 and fix Android link issues (#938)

Browse Source 
Upgrade uvwasi to 1.42.0 and fix Android link issues reported by #934
This commit is contained in:
Wenyong Huang 2022-01-06 18:25:37 +08:00 committed by GitHub
parent 9d2576d8e0
commit 308d31c621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/iwasm/libraries/libc-uvwasi/libc_uvwasi.cmake
View File

@ -3,7 +3,7 @@
set (LIBC_WASI_DIR ${CMAKE_CURRENT_LIST_DIR}) set (LIBC_WASI_DIR ${CMAKE_CURRENT_LIST_DIR})
set (UVWASI_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../deps/uvwasi) set (UVWASI_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../deps/uvwasi)
set (LIBUV_VERSION v1.39.0) set (LIBUV_VERSION v1.42.0)
add_definitions (-DWASM_ENABLE_LIBC_WASI=1 -DWASM_ENABLE_UVWASI=1) add_definitions (-DWASM_ENABLE_LIBC_WASI=1 -DWASM_ENABLE_UVWASI=1)
@ -21,6 +21,7 @@ if(NOT libuv_POPULATED)
include_directories("${libuv_SOURCE_DIR}/include") include_directories("${libuv_SOURCE_DIR}/include")
add_subdirectory(${libuv_SOURCE_DIR} ${libuv_BINARY_DIR} EXCLUDE_FROM_ALL) add_subdirectory(${libuv_SOURCE_DIR} ${libuv_BINARY_DIR} EXCLUDE_FROM_ALL)
set (UV_A_LIBS uv_a) set (UV_A_LIBS uv_a)
set_target_properties(uv_a PROPERTIES POSITION_INDEPENDENT_CODE 1)
endif() endif()
include_directories(${UVWASI_DIR}/include) include_directories(${UVWASI_DIR}/include)

44
core/shared/platform/android/platform_init.c
View File

@ -89,6 +89,50 @@ readlinkat(int __dir_fd, const char *__path, char *__buf, size_t __buf_size)
return -1; return -1;
} }
int
accept4(int __fd, struct sockaddr *__addr, socklen_t *__addr_length,
int __flags)
{
API_NOT_SUPPORT_ERROR(accept4, 21);
return -1;
}
int
dup3(int oldfd, int newfd, int cloexec)
{
API_NOT_SUPPORT_ERROR(dup3, 21);
return -1;
}
int
pthread_condattr_setclock(pthread_condattr_t *attr, clockid_t clock_id)
{
API_NOT_SUPPORT_ERROR(pthread_condattr_setclock, 21);
return -1;
}
int
epoll_create1(int flags)
{
API_NOT_SUPPORT_ERROR(epoll_create1, 21);
return -1;
}
int
epoll_pwait(int epfd, struct epoll_event *events, int maxevents, int timeout,
const sigset_t *sigmask)
{
API_NOT_SUPPORT_ERROR(epoll_pwait, 21);
return -1;
}
int
inotify_init1(int flags)
{
API_NOT_SUPPORT_ERROR(inotify_init1, 21);
return -1;
}
#endif #endif
#if __ANDROID_API__ < 23 #if __ANDROID_API__ < 23