diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-07-15 15:24:54 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-07-15 15:24:54 -0700 |
| commit | 6e7a7aa3e8c2096463fed1f24d561557f49787f8 (patch) | |
| tree | f81ea4377db6d4fd1b002cb55875d2291b71b62e /src/jsifier.js | |
| parent | 9bf755607fc7a0e7f446a5e2d6c82738d77d876f (diff) | |
| parent | 61c31f69359132e7630a9c4c2c3d25a6ed742247 (diff) | |
Merge branch 'self-dlopen' of github.com:int3/emscripten into incoming
Diffstat (limited to 'src/jsifier.js')
| -rw-r--r-- | src/jsifier.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index 82b78d0a..38581ce4 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -286,6 +286,8 @@ function JSify(data, functionsOnly, givenFunctions) { allocator = 'ALLOC_NONE'; } + Variables.globals[item.ident].named = item.named; + if (ASM_JS && (MAIN_MODULE || SIDE_MODULE) && !item.private_ && !NAMED_GLOBALS && isIndexableGlobal(item.ident)) { // We need this to be named (and it normally would not be), so that it can be linked to and used from other modules Variables.globals[item.ident].linkable = 1; @@ -602,6 +604,8 @@ function JSify(data, functionsOnly, givenFunctions) { var associatedSourceFile = "NO_SOURCE"; } + if (DLOPEN_SUPPORT) Functions.getIndex(func.ident); + func.JS += 'function ' + func.ident + '(' + paramIdents.join(', ') + ') {\n'; if (PGO) { |