Merge remote-tracking branch 'upstream/master'

1 files changed, 1 insertions, 16 deletions

diff --git a/src/analyzer.js b/src/analyzer.js
index bae05ec8..9b8af51b 100644
--- a/src/analyzer.js
+++ b/src/analyzer.js
@@ -1124,21 +1124,6 @@ function analyzer(data) {
   }, 'Sorter');
 
   // Solve it
-  var ret = substrate.solve();
-
-  // Add additional necessary items
-  if (INCLUDE_FULL_LIBRARY) {
-    assert(!BUILD_AS_SHARED_LIB, 'Cannot have both INCLUDE_FULL_LIBRARY and BUILD_AS_SHARED_LIB set.')
-    var libFuncsToInclude = keys(Library);
-  } else {
-    var libFuncsToInclude = ['memset', 'malloc', 'free'];
-  }
-  libFuncsToInclude.forEach(function(ident) {
-    ret.functionStubs.push({
-      intertype: 'functionStub',
-      ident: '_' + ident
-    });
-  });
-  return ret;
+  return substrate.solve();
 }