2 files changed, 8 insertions, 5 deletions
diff --git a/emcc b/emcc
index c6b0893b..600a99fd 100755
--- a/emcc
+++ b/emcc
@@ -1069,11 +1069,12 @@ try:
   if shared.Settings.MAIN_MODULE:
     assert not shared.Settings.SIDE_MODULE
     shared.Settings.INCLUDE_FULL_LIBRARY = 1
-    shared.Settings.LINKABLE = 1 # TODO: add FORCE_DCE option for the brave people that do want to dce here and in side modules
-    debug_level = max(debug_level, 2) # preserve function names
   elif shared.Settings.SIDE_MODULE:
     assert not shared.Settings.MAIN_MODULE
-    shared.Settings.LINKABLE = 1
+
+  if shared.Settings.MAIN_MODULE or shared.Settings.SIDE_MODULE:
+    assert not memory_init_file, 'memory init file is not supported with module linking'
+    shared.Settings.LINKABLE = 1 # TODO: add FORCE_DCE option for the brave people that do want to dce here and in side modules
     debug_level = max(debug_level, 2)
 
   ## Compile source code to bitcode
diff --git a/emlink.py b/emlink.py
index 21a9d84f..e54f8c5e 100644
--- a/emlink.py
+++ b/emlink.py
@@ -53,6 +53,8 @@ class AsmModule():
     self.exports_js = post_js[ret:]
 
   def relocate_into(self, main):
+    # heap initializer TODO
+
     # imports
     main_imports = set(main.imports)
     new_imports = [imp for imp in self.imports if imp not in main_imports]
@@ -74,9 +76,9 @@ class AsmModule():
     shared.try_delete(temp)
     main.extra_funcs_js = relocated_funcs.funcs_js.replace(js_optimizer.start_funcs_marker, '\n')
 
-    # tables
+    # tables TODO
 
-    # exports
+    # exports TODO
 
   def write(self, out):
     f = open(out, 'w')