Incorporate shimming into the irt

src/untrusted/nacl/nacl_irt.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 <string.h>
 #include <unistd.h>
 
 #include "native_client/src/include/elf_auxv.h"
@@ skipping 79 matching lines @@
   __libnacl_mandatory_irt_query(ident, &__libnacl_irt_##name,   \
                                 sizeof(__libnacl_irt_##name))
 
 /*
  * Initialize all our IRT function tables using the query function.
  * The query function's address is passed via AT_SYSINFO in auxv.
  */
 void __libnacl_irt_init(Elf32_auxv_t *auxv) {
   grok_auxv(auxv);
 
+/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */
+#if defined(__pnacl__)
+  /*
+   * Let the irt know that this is pnacl nexe.
+   * Code will have to be added here once we eliminate
+   *  src/untrusted/pnacl_irt_shim/
+   */
+#endif
   DO_QUERY(NACL_IRT_BASIC_v0_1, basic);
   DO_QUERY(NACL_IRT_FDIO_v0_1, fdio);
   DO_QUERY(NACL_IRT_FILENAME_v0_1, filename);
   DO_QUERY(NACL_IRT_MEMORY_v0_1, memory);
   DO_QUERY(NACL_IRT_DYNCODE_v0_1, dyncode);
   DO_QUERY(NACL_IRT_TLS_v0_1, tls);
   DO_QUERY(NACL_IRT_BLOCKHOOK_v0_1, blockhook);
 }