diff options
| -rwxr-xr-x | emscripten.py | 2 | ||||
| -rw-r--r-- | src/library.js | 4 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/emscripten.py b/emscripten.py index 40014d2f..55f00aee 100755 --- a/emscripten.py +++ b/emscripten.py @@ -796,7 +796,7 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, if DEBUG: logging.debug('emscript: js compiler glue') # Integrate info from backend - settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] = settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] + metadata['declares'] + settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] = settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] + map(shared.JS.to_nice_ident, metadata['declares']) # Settings changes assert settings['TARGET_LE32'] == 1 diff --git a/src/library.js b/src/library.js index 3df61724..128bb211 100644 --- a/src/library.js +++ b/src/library.js @@ -4665,6 +4665,10 @@ LibraryManager.library = { llvm_dbg_declare__inline: function() { throw 'llvm_debug_declare' }, // avoid warning + // llvm-nacl + + llvm_nacl_atomic_store_i32__inline: true, + // ========================================================================== // llvm-mono integration // ========================================================================== diff --git a/tools/shared.py b/tools/shared.py index 0783dc75..cf7830e3 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -1509,7 +1509,7 @@ class JS: @staticmethod def to_nice_ident(ident): # limited version of the JS function toNiceIdent - return ident.replace('%', '$').replace('@', '_') + return ident.replace('%', '$').replace('@', '_').replace('.', '_') @staticmethod def make_initializer(sig, settings=None): |