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/modules.js | |
| parent | 9bf755607fc7a0e7f446a5e2d6c82738d77d876f (diff) | |
| parent | 61c31f69359132e7630a9c4c2c3d25a6ed742247 (diff) | |
Merge branch 'self-dlopen' of github.com:int3/emscripten into incoming
Diffstat (limited to 'src/modules.js')
| -rw-r--r-- | src/modules.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules.js b/src/modules.js index a6aa2644..53d97817 100644 --- a/src/modules.js +++ b/src/modules.js @@ -449,7 +449,8 @@ var PassManager = { Types: Types, Variables: Variables, Functions: Functions, - EXPORTED_FUNCTIONS: EXPORTED_FUNCTIONS // needed for asm.js global constructors (ctors) + EXPORTED_FUNCTIONS: EXPORTED_FUNCTIONS, // needed for asm.js global constructors (ctors) + Runtime: { GLOBAL_BASE: Runtime.GLOBAL_BASE } })); } else if (phase == 'funcs') { print('\n//FORWARDED_DATA:' + JSON.stringify({ |