diff options
author | Alon Zakai <alonzakai@gmail.com> | 2014-02-02 17:35:43 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-02 17:35:43 -0800 |
commit | 1341770f17043a800d87e2fd23c368c913cb6e87 (patch) | |
tree | 52de52da891d88962b944ae748e5199c43d15309 /emscripten.py | |
parent | 60e3e4622a70a562f7faba0d00f5638214bba29d (diff) |
parse exports from fastcomp, and enable test_llvm_used
Diffstat (limited to 'emscripten.py')
-rwxr-xr-x | emscripten.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/emscripten.py b/emscripten.py index 77082aee..0b1c0bf4 100755 --- a/emscripten.py +++ b/emscripten.py @@ -862,15 +862,13 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, pre = parts[0] funcs_js.append(parts[1]) - # calculations on merged forwarded data TODO - # merge forwarded data assert settings.get('ASM_JS'), 'fastcomp is asm.js only' settings['EXPORTED_FUNCTIONS'] = forwarded_json['EXPORTED_FUNCTIONS'] all_exported_functions = set(settings['EXPORTED_FUNCTIONS']) # both asm.js and otherwise for additional_export in settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE']: # additional functions to export from asm, if they are implemented all_exported_functions.add('_' + additional_export) - exported_implemented_functions = set() + exported_implemented_functions = set(metadata['exports']) export_bindings = settings['EXPORT_BINDINGS'] export_all = settings['EXPORT_ALL'] for key in metadata['implementedFunctions'] + forwarded_json['Functions']['implementedFunctions'].keys(): # XXX perf |