aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-30 14:22:49 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-30 14:22:49 -0800
commit94bb14c5bbd23285549d87f19dc6d09c90bcf92f (patch)
tree09145d399589bd0485f1a3097c64571c3f6aa676
parent59e79633f56eaaa5696486639c0435e5828f5d9b (diff)
send EXPORTED_FUNCTIONS to fastcomp glue
-rwxr-xr-xemscripten.py1
-rw-r--r--src/modules.js3
2 files changed, 3 insertions, 1 deletions
diff --git a/emscripten.py b/emscripten.py
index 84ec6943..afae9507 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -852,6 +852,7 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None,
# 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)
diff --git a/src/modules.js b/src/modules.js
index 29fca664..e80115c4 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -485,7 +485,8 @@ var PassManager = {
}));
} else if (phase == 'glue') {
print('\n//FORWARDED_DATA:' + JSON.stringify({
- Functions: Functions
+ Functions: Functions,
+ EXPORTED_FUNCTIONS: EXPORTED_FUNCTIONS
}));
}
},