diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/emscripten-exported.json | 59 | ||||
| -rw-r--r-- | src/emscripten-exports.txt | 56 | ||||
| -rw-r--r-- | src/emscripten-helpers.cc | 3 |
4 files changed, 59 insertions, 65 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d374b54b..9072e46d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -751,12 +751,12 @@ if (EMSCRIPTEN) set_target_properties(libwabtjs PROPERTIES OUTPUT_NAME libwabt) set(WABT_POST_JS ${WABT_SOURCE_DIR}/src/wabt.post.js) - set(EMSCRIPTEN_EXPORTED_JSON ${WABT_SOURCE_DIR}/src/emscripten-exported.json) + set(EMSCRIPTEN_EXPORTS ${WABT_SOURCE_DIR}/src/emscripten-exports.txt) set(LIBWABT_LINK_FLAGS -s SINGLE_FILE --post-js ${WABT_POST_JS} - -s EXPORTED_FUNCTIONS=\"@${EMSCRIPTEN_EXPORTED_JSON}\" + -s EXPORTED_FUNCTIONS=\"@${EMSCRIPTEN_EXPORTS}\" -s RESERVED_FUNCTION_POINTERS=10 -s NO_EXIT_RUNTIME=1 -s ALLOW_MEMORY_GROWTH=1 @@ -770,7 +770,7 @@ if (EMSCRIPTEN) set_target_properties(libwabtjs PROPERTIES LINK_FLAGS "${LIBWABT_LINK_FLAGS_STR}" - LINK_DEPENDS "${WABT_POST_JS};${EMSCRIPTEN_EXPORTED_JSON}" + LINK_DEPENDS "${WABT_POST_JS};${EMSCRIPTEN_EXPORTS}" ) endif () diff --git a/src/emscripten-exported.json b/src/emscripten-exported.json deleted file mode 100644 index a35a276c..00000000 --- a/src/emscripten-exported.json +++ /dev/null @@ -1,59 +0,0 @@ -[ -"_free", -"_malloc", -"_wabt_apply_names_module", -"_wabt_bulk_memory_enabled", -"_wabt_destroy_errors", -"_wabt_destroy_features", -"_wabt_destroy_module", -"_wabt_destroy_output_buffer", -"_wabt_destroy_parse_wat_result", -"_wabt_destroy_read_binary_result", -"_wabt_destroy_wast_lexer", -"_wabt_destroy_write_module_result", -"_wabt_exceptions_enabled", -"_wabt_format_binary_errors", -"_wabt_format_text_errors", -"_wabt_generate_names_module", -"_wabt_multi_value_enabled", -"_wabt_mutable_globals_enabled", -"_wabt_new_errors", -"_wabt_new_features", -"_wabt_new_wast_buffer_lexer", -"_wabt_output_buffer_get_data", -"_wabt_output_buffer_get_size", -"_wabt_parse_wast", -"_wabt_parse_wast_result_get_result", -"_wabt_parse_wast_result_release_module", -"_wabt_parse_wat", -"_wabt_parse_wat_result_get_result", -"_wabt_parse_wat_result_release_module", -"_wabt_read_binary", -"_wabt_read_binary_result_get_result", -"_wabt_read_binary_result_release_module", -"_wabt_reference_types_enabled", -"_wabt_sat_float_to_int_enabled", -"_wabt_set_bulk_memory_enabled", -"_wabt_set_exceptions_enabled", -"_wabt_set_multi_value_enabled", -"_wabt_set_mutable_globals_enabled", -"_wabt_set_reference_types_enabled", -"_wabt_set_sat_float_to_int_enabled", -"_wabt_set_sign_extension_enabled", -"_wabt_set_simd_enabled", -"_wabt_set_tail_call_enabled", -"_wabt_set_threads_enabled", -"_wabt_sign_extension_enabled", -"_wabt_simd_enabled", -"_wabt_tail_call_enabled", -"_wabt_threads_enabled", -"_wabt_validate_module", -"_wabt_validate_script", -"_wabt_write_binary_module", -"_wabt_write_binary_spec_script", -"_wabt_write_module_result_get_result", -"_wabt_write_module_result_release_log_output_buffer", -"_wabt_write_module_result_release_output_buffer", -"_wabt_write_text_module", -"_dummy_workaround_for_emscripten_issue_7073" -] diff --git a/src/emscripten-exports.txt b/src/emscripten-exports.txt new file mode 100644 index 00000000..3832f848 --- /dev/null +++ b/src/emscripten-exports.txt @@ -0,0 +1,56 @@ +_free +_malloc +_wabt_apply_names_module +_wabt_bulk_memory_enabled +_wabt_destroy_errors +_wabt_destroy_features +_wabt_destroy_module +_wabt_destroy_output_buffer +_wabt_destroy_parse_wat_result +_wabt_destroy_read_binary_result +_wabt_destroy_wast_lexer +_wabt_destroy_write_module_result +_wabt_exceptions_enabled +_wabt_format_binary_errors +_wabt_format_text_errors +_wabt_generate_names_module +_wabt_multi_value_enabled +_wabt_mutable_globals_enabled +_wabt_new_errors +_wabt_new_features +_wabt_new_wast_buffer_lexer +_wabt_output_buffer_get_data +_wabt_output_buffer_get_size +_wabt_parse_wast +_wabt_parse_wast_result_get_result +_wabt_parse_wast_result_release_module +_wabt_parse_wat +_wabt_parse_wat_result_get_result +_wabt_parse_wat_result_release_module +_wabt_read_binary +_wabt_read_binary_result_get_result +_wabt_read_binary_result_release_module +_wabt_reference_types_enabled +_wabt_sat_float_to_int_enabled +_wabt_set_bulk_memory_enabled +_wabt_set_exceptions_enabled +_wabt_set_multi_value_enabled +_wabt_set_mutable_globals_enabled +_wabt_set_reference_types_enabled +_wabt_set_sat_float_to_int_enabled +_wabt_set_sign_extension_enabled +_wabt_set_simd_enabled +_wabt_set_tail_call_enabled +_wabt_set_threads_enabled +_wabt_sign_extension_enabled +_wabt_simd_enabled +_wabt_tail_call_enabled +_wabt_threads_enabled +_wabt_validate_module +_wabt_validate_script +_wabt_write_binary_module +_wabt_write_binary_spec_script +_wabt_write_module_result_get_result +_wabt_write_module_result_release_log_output_buffer +_wabt_write_module_result_release_output_buffer +_wabt_write_text_module diff --git a/src/emscripten-helpers.cc b/src/emscripten-helpers.cc index 803e386f..127a8c45 100644 --- a/src/emscripten-helpers.cc +++ b/src/emscripten-helpers.cc @@ -398,9 +398,6 @@ void wabt_destroy_output_buffer(wabt::OutputBuffer* output_buffer) { delete output_buffer; } -// See https://github.com/kripken/emscripten/issues/7073. -void dummy_workaround_for_emscripten_issue_7073(void) {} - } // extern "C" #endif /* WABT_EMSCRIPTEN_HELPERS_H_ */ |