Partly change IRT load-skipping to be explicit.

src/trusted/service_runtime/sel_main.c

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  */
 #include "native_client/src/include/portability.h"
@@ skipping 707 matching lines @@
    * NaClCreateMemoryObject() which opens a file in /tmp.
    *
    * We cannot enable the sandbox if file access is enabled.
    */
   if (!NaClAclBypassChecks && g_enable_outer_sandbox_func != NULL) {
     g_enable_outer_sandbox_func();
   }
 
   if (NULL != blob_library_file) {
     if (LOAD_OK == errcode) {
-      if (NULL != nap->text_shm) {
-        NaClLog(2, "Loading blob file %s\n", blob_library_file);
-        errcode = NaClAppLoadFileDynamically(nap, (struct Gio *) &blob_file);
-        if (LOAD_OK != errcode) {
-          fprintf(stderr, "Error while loading \"%s\": %s\n",
-                  blob_library_file,
-                  NaClErrorString(errcode));
-        }
-        NaClPerfCounterMark(&time_all_main, "BlobLoaded");
-        NaClPerfCounterIntervalLast(&time_all_main);
-      } else {
-        /*
-         * TODO(mseaborn): Omit -B when the IRT is not wanted (e.g., from
-         * sel_ldr_launcher_standalone), instead of looking for the absence
-         * of a segment gap, when the nexe does not follow NaCl's stable ABI.
-         */
-        NaClLog(LOG_WARNING,
-                "Main executable has no segment gap; not loading IRT library. "
-                "This is expected for PNaCl's translator nexes.\n");
+      NaClLog(2, "Loading blob file %s\n", blob_library_file);
+      errcode = NaClAppLoadFileDynamically(nap, (struct Gio *) &blob_file);
+      if (LOAD_OK != errcode) {
+        fprintf(stderr, "Error while loading \"%s\": %s\n",
+                blob_library_file,
+                NaClErrorString(errcode));
       }
+      NaClPerfCounterMark(&time_all_main, "BlobLoaded");
+      NaClPerfCounterIntervalLast(&time_all_main);
     }
 
     if (-1 == (*((struct Gio *) &blob_file)->vtbl->Close)((struct Gio *)
                                                           &blob_file)) {
       fprintf(stderr, "Error while closing \"%s\".\n", blob_library_file);
     }
     (*((struct Gio *) &blob_file)->vtbl->Dtor)((struct Gio *) &blob_file);
     if (verbosity) {
       gprintf((struct Gio *) &gout, "printing post-IRT NaClApp details\n");
       NaClAppPrintDetails(nap, (struct Gio *) &gout);
@@ skipping 113 matching lines @@
   fflush(stdout);
 
   if (handle_signals) NaClSignalHandlerFini();
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 
   /* Unreachable, but having the return prevents a compiler error. */
   return ret_code;
 }