| 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 ca7a9e60964e829b8d240fb1dc90221510926673..478a4a771b23965ea0779046c62d996eb7d103aa 100644
|
| --- a/src/trusted/service_runtime/sel_main.c
|
| +++ b/src/trusted/service_runtime/sel_main.c
|
| @@ -725,26 +725,15 @@ int NaClSelLdrMain(int argc, char **argv) {
|
|
|
| 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 *)
|
|
|