cleanup minimal

Author: sbc100

src/Fetch.js

@@ -434,7 +434,7 @@ function fetchXHR(fetch, onsuccess, onerror, onprogress, onreadystatechange) {
 function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
   // Avoid shutting down the runtime since we want to wait for the async
   // response.
-  runtimeKeepalivePush();
+  {{{ runtimeKeepalivePush() }}}
 
   var fetch_attr = fetch + {{{ C_STRUCTS.emscripten_fetch_t.__attributes }}};
   var requestMethod = UTF8ToString(fetch_attr);
@@ -456,7 +456,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #if FETCH_DEBUG
     console.log('fetch: operation success. e: ' + e);
 #endif
-    runtimeKeepalivePop();
+    {{{ runtimeKeepalivePop() }}}
     callUserCallback(function() {
       if (onsuccess) {{{ makeDynCall('vi', 'onsuccess') }}}(fetch);
       else if (successcb) successcb(fetch);
@@ -474,7 +474,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #if FETCH_DEBUG
     console.error('fetch: operation failed: ' + e);
 #endif
-    runtimeKeepalivePop();
+    {{{ runtimeKeepalivePop() }}}
     callUserCallback(function() {
       if (onerror) {{{ makeDynCall('vi', 'onerror') }}}(fetch);
       else if (errorcb) errorcb(fetch);
@@ -507,7 +507,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #if FETCH_DEBUG
       console.log('fetch: IndexedDB store succeeded.');
 #endif
-      runtimeKeepalivePop();
+      {{{ runtimeKeepalivePop() }}}
       callUserCallback(function() {
         if (onsuccess) {{{ makeDynCall('vi', 'onsuccess') }}}(fetch);
         else if (successcb) successcb(fetch);
@@ -517,7 +517,7 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
 #if FETCH_DEBUG
       console.error('fetch: IndexedDB store failed.');
 #endif
-      runtimeKeepalivePop();
+      {{{ runtimeKeepalivePop() }}}
       callUserCallback(function() {
         if (onsuccess) {{{ makeDynCall('vi', 'onsuccess') }}}(fetch);
         else if (successcb) successcb(fetch);

src/library.js

@@ -3772,9 +3772,11 @@ LibraryManager.library = {
 
   // Callable in pthread without __proxy needed.
   emscripten_exit_with_live_runtime__sig: 'v',
+#if !MINIMAL_RUNTIME
   emscripten_exit_with_live_runtime__deps: ['$runtimeKeepalivePush'],
+#endif
   emscripten_exit_with_live_runtime: function() {
-    runtimeKeepalivePush();
+    {{{ runtimeKeepalivePush() }}}
     throw 'unwind';
   },
 
@@ -3832,7 +3834,9 @@ LibraryManager.library = {
   // The job of this wrapper is the handle emscripten-specfic exceptions such
   // as ExitStatus and 'unwind' and prevent these from escaping to the top
   // level.
+#if EXIT_RUNTIME || USE_PTHREADS
   $callUserCallback__deps: ['$maybeExit'],
+#endif
   $callUserCallback: function(func) {
     if (ABORT) {
 #if ASSERTIONS
@@ -3851,7 +3855,12 @@ LibraryManager.library = {
         throw e;
       }
     }
-    maybeExit();
+#if EXIT_RUNTIME || USE_PTHREADS
+#if USE_PTHREADS && !EXIT_RUNTIME
+    if (ENVIRONMENT_IS_PTHREAD)
+#endif
+      maybeExit();
+#endif
   },
 
   $maybeExit__deps: ['exit',
@@ -3883,8 +3892,6 @@ LibraryManager.library = {
   },
 #else
   // MINIMAL_RUNTIME doesn't support the runtimeKeepalive stuff
-  $runtimeKeepalivePush: function() {},
-  $runtimeKeepalivePop: function() {},
   $callUserCallback: function(func) {
     func();
   },