Partly change IRT load-skipping to be explicit.

src/trusted/service_runtime/sel_main_chrome.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.
  */
 
 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
 
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_io.h"
@@ skipping 290 matching lines @@
    * error reporting done; can quit now if there was an error earlier.
    */
   if (LOAD_OK != errcode) {
     goto done;
   }
 
   /*
    * Load the integrated runtime (IRT) library.
    * We check if there is a segment gap before trying to load the IRT.  This
    * is to support IRT-less / segment-gap-free PNaCl translator nexes.
-   * TODO(mseaborn): Plumb through a flag from Chrome in such cases,
-   * instead of looking for the absence of a segment gap, when the nexe does
-   * not follow NaCl's stable ABI.
+   * TODO(mseaborn): Instead of looking for the absence of a segment gap,

[Mark Seaborn, 2013/01/03 23:36:40]

You can change this to TODO(jvoung) if you're going to do it. :-)

[jvoung (off chromium), 2013/01/04 00:05:31]

Done.

+   * only allow irt_fd == -1, when the nexe does not follow NaCl's stable ABI.
    */
-  if (NULL != nap->text_shm) {
+  if (NULL != nap->text_shm && args->irt_fd != -1) {
     NaClLoadIrt(nap, args->irt_fd);
   } else {
     NaClLog(
         LOG_WARNING,
-        "Main executable has no segment gap; skipping loading IRT library. "
-        "This is expected for PNaCl's translator nexes.\n");
+        "Main executable has no segment gap or irt_fd == -1; "

[Mark Seaborn, 2013/01/03 23:36:40]

You should probably drop this log message, or change the log level to >=1.  We
don't want this to be printed when PNaCl is working fine.

[jvoung (off chromium), 2013/01/04 00:05:31]

Done.

+        "skipping loading IRT library. This is expected for PNaCl's "
+        "translator nexes.\n");
   }
 
   NACL_FI_FATAL("BeforeEnvCleanserCtor");
 
   NaClEnvCleanserCtor(&env_cleanser, 1);
   if (!NaClEnvCleanserInit(&env_cleanser, envp, NULL)) {
     NaClLog(LOG_FATAL, "Failed to initialise env cleanser\n");
   }
 
   if (NACL_FI_ERROR_COND("LaunchServiceThreads",
@@ skipping 46 matching lines @@
    * Instead, we wait for the hard-shutdown on the command channel.
    */
   if (LOAD_OK != errcode) {
     NaClBlockIfCommandChannelExists(nap);
   }
 
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 }