christoph/wamr
1
Fork 0
Code Releases Activity

Update wasm app build scripts for wasi-sdk-12 and refine interpreter (#481)

Browse Source 
Update wasm app build scripts for wasi-sdk-12.0: add --export=__main_argc_argv, remove --no-threads
Lookup function with name "__main_argc_argv" as main function besides "main"
Change module_malloc to runtime_malloc in wasi native lib
Refine classic interpreter op_block and op_br_table
Refine faster interpreter op_br_table

Signed-off-by: Wenyong Huang <wenyong.huang@intel.com>
This commit is contained in:
Wenyong Huang
2020-12-27 20:46:31 -06:00
committed by GitHub
parent 13f0b2485b
commit 724858c731
19 changed files with 144 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/basic/build.sh
View File

@ -46,7 +46,7 @@ OUT_FILE=${i%.*}.wasm
--target=wasm32 -O0 -z stack-size=4096 -Wl,--initial-memory=65536 \
--sysroot=${WAMR_DIR}/wamr-sdk/app/libc-builtin-sysroot \
-Wl,--allow-undefined-file=${WAMR_DIR}/wamr-sdk/app/libc-builtin-sysroot/share/defined-symbols.txt \
-Wl,--no-threads,--strip-all,--no-entry -nostdlib \
-Wl,--strip-all,--no-entry -nostdlib \
-Wl,--export=generate_float \
-Wl,--export=float_to_string \
-Wl,--export=calculate\

4
samples/gui/wasm-apps/decrease/Makefile
View File

@ -21,8 +21,8 @@ all:
--target=wasm32 -O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
--sysroot=$(SDK_DIR)/libc-builtin-sysroot \
-L$(APP_FRAMEWORK_DIR)/lib -lapp_framework \
-Wl,--allow-undefined-file=$(SDK_DIR)/libc-builtin-sysroot/share/defined-symbols.txt \
-Wl,--no-threads,--strip-all,--no-entry -nostdlib \
-Wl,--allow-undefined-file=$(SDK_DIR)/libc-builtin-sysroot/share/defined-symbols.txt \
-Wl,--strip-all,--no-entry -nostdlib \
-Wl,--export=on_init -Wl,--export=on_timer_callback \
-Wl,--export=on_widget_event \
-Wl,--export=__heap_base,--export=__data_end \

2
samples/gui/wasm-apps/increase/Makefile
View File

@ -27,7 +27,7 @@ all:
@$(CC) $(CFLAGS) $(SRCS) \
--target=wasm32 -O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
-Wl,--allow-undefined \
-Wl,--no-threads,--strip-all,--no-entry -nostdlib \
-Wl,--strip-all,--no-entry -nostdlib \
-Wl,--export=on_init -Wl,--export=on_timer_callback \
-Wl,--export=on_widget_event \
-Wl,--export=__heap_base,--export=__data_end \

4
samples/littlevgl/wasm-apps/Makefile_wasm_app
View File

@ -49,9 +49,9 @@ all:
@$(CC) $(CFLAGS) $(SRCS) \
-O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
-DLV_CONF_INCLUDE_SIMPLE \
-L$(APP_FRAMEWORK_DIR)/lib -lapp_framework \
-L$(APP_FRAMEWORK_DIR)/lib -lapp_framework \
-Wl,--allow-undefined \
-Wl,--no-threads,--strip-all,--no-entry \
-Wl,--strip-all,--no-entry \
-Wl,--export=on_init -Wl,--export=on_timer_callback \
-Wl,--export=__heap_base,--export=__data_end \
-o ui_app_wasi.wasm

4
samples/littlevgl/wasm-apps/Makefile_wasm_app_no_wasi
View File

@ -52,8 +52,8 @@ all:
--sysroot=$(WAMR_DIR)/wamr-sdk/app/libc-builtin-sysroot \
-O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
-DLV_CONF_INCLUDE_SIMPLE \
-L$(APP_FRAMEWORK_DIR)/lib -lapp_framework \
-L$(APP_FRAMEWORK_DIR)/lib -lapp_framework \
-Wl,--allow-undefined \
-Wl,--no-threads,--strip-all,--no-entry -nostdlib \
-Wl,--strip-all,--no-entry -nostdlib \
-Wl,--export=on_init -Wl,--export=on_timer_callback \
-o ui_app_builtin_libc.wasm

12
samples/multi-thread/wasm-apps/CMakeLists.txt
View File

@ -27,11 +27,13 @@ set (DEFINED_SYMBOLS
"${WAMR_ROOT_DIR}/wamr-sdk/app/libc-builtin-sysroot/share/defined-symbols.txt")
set (CMAKE_EXE_LINKER_FLAGS
"-Wl,--shared-memory,--max-memory=131072, \
-Wl,--no-entry,--strip-all,--export=main, \
-Wl,--export=__heap_base,--export=__data_end \
-Wl,--export=__wasm_call_ctors \
-Wl,--allow-undefined-file=${DEFINED_SYMBOLS}"
"-Wl,--shared-memory,--max-memory=131072, \
-Wl,--no-entry,--strip-all, \
-Wl,--export=__heap_base,--export=__data_end \
-Wl,--export=__wasm_call_ctors \
-Wl,--export=main -Wl,--export=__main_argc_argv \
-Wl,--allow-undefined"
#-Wl,--allow-undefined-file=${DEFINED_SYMBOLS}"
)
add_executable(test.wasm main.c)

2
samples/simple/build.sh
View File

@ -153,7 +153,7 @@ OUT_FILE=${i%.*}.wasm
--target=wasm32 -O3 -z stack-size=4096 -Wl,--initial-memory=65536 \
--sysroot=${WAMR_DIR}/wamr-sdk/out/$PROFILE/app-sdk/libc-builtin-sysroot \
-Wl,--allow-undefined-file=${WAMR_DIR}/wamr-sdk/out/$PROFILE/app-sdk/libc-builtin-sysroot/share/defined-symbols.txt \
-Wl,--no-threads,--strip-all,--no-entry -nostdlib \
-Wl,--strip-all,--no-entry -nostdlib \
-Wl,--export=on_init -Wl,--export=on_destroy \
-Wl,--export=on_request -Wl,--export=on_response \
-Wl,--export=on_sensor_event -Wl,--export=on_timer_callback \