Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions emcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,6 @@ def phase_setup(options, state):
if settings.PTHREADS or settings.WASM_WORKERS:
settings.SHARED_MEMORY = 1

if settings.SHARED_MEMORY:
settings.BULK_MEMORY = 1

if 'DISABLE_EXCEPTION_CATCHING' in user_settings and 'EXCEPTION_CATCHING_ALLOWED' in user_settings:
# If we get here then the user specified both DISABLE_EXCEPTION_CATCHING and EXCEPTION_CATCHING_ALLOWED
# on the command line. This is no longer valid so report either an error or a warning (for
Expand Down
2 changes: 0 additions & 2 deletions src/settings_internal.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,6 @@ var POST_JS_FILES = [];
// Set when -pthread / -sPTHREADS is passed
var PTHREADS = false;

var BULK_MEMORY = false;

var MINIFY_WHITESPACE = true;

var ASYNCIFY_IMPORTS_EXCEPT_JS_LIBS = [];
Expand Down
2 changes: 0 additions & 2 deletions tools/cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -520,12 +520,10 @@ def consume_arg_file():
settings.DISABLE_EXCEPTION_THROWING = 1
settings.WASM_EXCEPTIONS = 0
elif arg == '-mbulk-memory':
settings.BULK_MEMORY = 1
feature_matrix.enable_feature(feature_matrix.Feature.BULK_MEMORY,
'-mbulk-memory',
override=True)
elif arg == '-mno-bulk-memory':
settings.BULK_MEMORY = 0
feature_matrix.disable_feature(feature_matrix.Feature.BULK_MEMORY)
elif arg == '-msign-ext':
feature_matrix.enable_feature(feature_matrix.Feature.SIGN_EXT,
Expand Down
2 changes: 0 additions & 2 deletions tools/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -1473,8 +1473,6 @@ def limit_incoming_module_api():
# TODO(sbc): Find make a generic way to expose the feature matrix to JS
# compiler rather then adding them all ad-hoc as internal settings
settings.SUPPORTS_PROMISE_ANY = feature_matrix.caniuse(feature_matrix.Feature.PROMISE_ANY)
if not settings.BULK_MEMORY:
settings.BULK_MEMORY = feature_matrix.caniuse(feature_matrix.Feature.BULK_MEMORY)
default_setting('WASM_BIGINT', feature_matrix.caniuse(feature_matrix.Feature.JS_BIGINT_INTEGRATION))

if settings.AUDIO_WORKLET:
Expand Down
1 change: 0 additions & 1 deletion tools/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
'SUPPORT_LONGJMP',
'WASM_OBJECT_FILES',
'WASM_WORKERS',
'BULK_MEMORY',

# Internal settings used during compilation
'EXCEPTION_CATCHING_ALLOWED',
Expand Down