Skip to content

Commit e432f09

Browse files
committed
Remove some hardcoded exports that can now be handled by JS __deps. NFC
See #18849
1 parent c8f3ea7 commit e432f09

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

emcc.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2413,11 +2413,6 @@ def phase_linker_setup(options, state, newargs):
24132413
exit_with_error('-sPROXY_TO_PTHREAD requires -pthread to work!')
24142414
settings.JS_LIBRARIES.append((0, 'library_pthread_stub.js'))
24152415

2416-
# TODO: Move this into the library JS file once it becomes possible.
2417-
# See https://github.com/emscripten-core/emscripten/pull/15982
2418-
if settings.INCLUDE_FULL_LIBRARY and not settings.DISABLE_EXCEPTION_CATCHING:
2419-
settings.EXPORTED_FUNCTIONS += ['___get_exception_message', '_free']
2420-
24212416
if settings.MEMORY64:
24222417
if settings.ASYNCIFY and settings.MEMORY64 == 1:
24232418
exit_with_error('MEMORY64=1 is not compatible with ASYNCIFY')
@@ -2902,9 +2897,7 @@ def get_full_import_name(name):
29022897
# What you need to do is different depending on the kind of EH you use
29032898
# (https://github.com/emscripten-core/emscripten/issues/17115).
29042899
settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$getExceptionMessage', '$incrementExceptionRefcount', '$decrementExceptionRefcount']
2905-
settings.EXPORTED_FUNCTIONS += ['getExceptionMessage', '___get_exception_message', '_free']
2906-
if settings.WASM_EXCEPTIONS:
2907-
settings.EXPORTED_FUNCTIONS += ['___cpp_exception', '___cxa_increment_exception_refcount', '___cxa_decrement_exception_refcount', '___thrown_object_from_unwind_exception']
2900+
settings.EXPORTED_FUNCTIONS += ['getExceptionMessage']
29082901

29092902
if settings.SIDE_MODULE:
29102903
# For side modules, we ignore all REQUIRED_EXPORTS that might have been added above.

0 commit comments

Comments
 (0)