Merge branch 'llvm-svn' of github.com:kripken/emscripten into llvm-svn

2 files changed, 4 insertions, 1 deletions

diff --git a/src/modules.js b/src/modules.js
index a4a64790..942f58ba 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -244,7 +244,7 @@ var Functions = {
       // Shared libraries reuse the parent's function table.
       return 'FUNCTION_TABLE = FUNCTION_TABLE.concat([' + indices + ']);';
     } else {
-      return 'FUNCTION_TABLE = [' + indices + '];';
+      return 'FUNCTION_TABLE = [' + indices + ']; Module["FUNCTION_TABLE"] = FUNCTION_TABLE;';
     }
   }
 };
diff --git a/src/preamble.js b/src/preamble.js
index 1c1ec915..c59a50d1 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -430,6 +430,9 @@ Module['getValue'] = getValue;
 var ALLOC_NORMAL = 0; // Tries to use _malloc()
 var ALLOC_STACK = 1; // Lives for the duration of the current function call
 var ALLOC_STATIC = 2; // Cannot be freed
+Module['ALLOC_NORMAL'] = ALLOC_NORMAL;
+Module['ALLOC_STACK'] = ALLOC_STACK;
+Module['ALLOC_STATIC'] = ALLOC_STATIC;
 
 function allocate(slab, types, allocator) {
   var zeroinit, size;