Allow sel_ldr to continue without the IRT, when nexe doesn't have segment gap

src/trusted/service_runtime/sel_main.c

Index: src/trusted/service_runtime/sel_main.c
diff --git a/src/trusted/service_runtime/sel_main.c b/src/trusted/service_runtime/sel_main.c
index 35a9b14dfb497aa509b42eb1253de2f0cbe995d5..90e4736a0a1e56439a815b8df5d8e9d7175d39ae 100644
--- a/src/trusted/service_runtime/sel_main.c
+++ b/src/trusted/service_runtime/sel_main.c
@@ -678,18 +678,29 @@ int main(int  argc,
     NaClGdbHook(&state);
   }
 
-
   if (NULL != blob_library_file) {
     if (LOAD_OK == errcode) {
-      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));
+      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, to provide better diagnostics when the linker

[Mark Seaborn, 2012/06/28 22:50:55]

maybe: "when the nexe does not follow NaCl's stable ABI"

[jvoung - send to chromium..., 2012/06/28 23:02:50]

Done.

+         * did not create a segment gap!
+         */
+        NaClLog(LOG_WARNING,
+                "Main executable has no segment gap; not loading IRT library.\n"

[Mark Seaborn, 2012/06/28 22:50:55]

Can you keep the warning all on one line, please?  (Make sure to put a space
instead of '\n'.)

[jvoung - send to chromium..., 2012/06/28 23:02:50]

Done.

+                "This is expected for PNaCl's translator nexes.\n");
       }
-      NaClPerfCounterMark(&time_all_main, "BlobLoaded");
-      NaClPerfCounterIntervalLast(&time_all_main);
     }
 
     if (-1 == (*((struct Gio *) &blob_file)->vtbl->Close)((struct Gio *)