Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit fabd7e8

Browse files
committed
Move --bind to targets which need it.
1 parent ebb60c5 commit fabd7e8

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

talk/owt/sdk/wasm/gn/BUILD.gn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ template("gcc_like_toolchain") {
6565

6666
tool("cc") {
6767
depfile = "{{output}}.d"
68-
command = "$cc_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=1 --bind -fno-stack-protector ${external_cflags} -c {{source}} -o {{output}}"
68+
command = "$cc_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=1 -fno-stack-protector ${external_cflags} -c {{source}} -o {{output}}"
6969
depsformat = "gcc"
7070
outputs = [ "$object_subdir/{{source_name_part}}.o" ]
7171
description = "compile {{source}}"
7272
}
7373

7474
tool("cxx") {
7575
depfile = "{{output}}.d"
76-
command = "$cc_wrapper $cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=1 --bind -fno-stack-protector ${external_cflags} ${external_cxxflags} -c {{source}} -o {{output}}"
76+
command = "$cc_wrapper $cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=1 -fno-stack-protector ${external_cflags} ${external_cxxflags} -c {{source}} -o {{output}}"
7777
depsformat = "gcc"
7878
outputs = [ "$object_subdir/{{source_name_part}}.o" ]
7979
description = "compile {{source}}"
8080
}
8181

8282
tool("asm") {
8383
depfile = "{{output}}.d"
84-
command = "$cc_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=1 --bind -fno-stack-protector -c {{source}} -o {{output}}"
84+
command = "$cc_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=1 -fno-stack-protector -c {{source}} -o {{output}}"
8585
depsformat = "gcc"
8686
outputs = [ "$object_subdir/{{source_name_part}}.o" ]
8787
description = "assemble {{source}}"
@@ -175,6 +175,6 @@ gcc_like_toolchain("wasm") {
175175
os = host_os
176176
ar = "$emsdk_dir/emscripten/emar --em-config $em_config"
177177
cc = "$emsdk_dir/emscripten/emcc --em-config $em_config -pthread"
178-
cxx = "$emsdk_dir/emscripten/em++ --em-config $em_config --bind -pthread"
178+
cxx = "$emsdk_dir/emscripten/em++ --em-config $em_config -pthread"
179179
strip = ""
180180
}

talk/owt/sdk/wasm/gn/wasm.gni

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,23 @@ template("wasm_lib") {
7272
"-s",
7373
"EXPORT_ES6=1",
7474

75+
"--bind",
76+
7577
#"-fno-stack-protector",
7678

7779
# This is to prevent that two different wasm modules end up generating
7880
# JS that overrides the same global variable (var Module = ...)
7981
# "-s",
8082
# "EXPORT_NAME=${target_name}",
8183

82-
"-lworkerfs.js", # For FS.filesystems.WORKERFS
83-
84-
"--bind",
84+
# "-lworkerfs.js", # For FS.filesystems.WORKERFS
8585

8686
"-s",
87-
"PTHREAD_POOL_SIZE=5",
87+
"PTHREAD_POOL_SIZE=8",
88+
"-s",
89+
"ALLOW_BLOCKING_ON_MAIN_THREAD=0",
8890

8991
"-pthread",
90-
91-
"--source-map-base",
9292
]
9393
if (is_debug) {
9494
_target_ldflags += [
@@ -98,8 +98,10 @@ template("wasm_lib") {
9898
# "SAFE_HEAP=1",
9999
# "-s",
100100
# "STACK_OVERFLOW_CHECK=1",
101-
# "-gsource-map",
102-
# "-O0",
101+
"-O0",
102+
"-gsource-map",
103+
"--source-map-base",
104+
"http://jianjunz-nuc-ubuntu.sh.intel.com:9900/out/wasm/",
103105
]
104106
} else {
105107
_target_ldflags += [

0 commit comments

Comments
 (0)