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__)

[Roland McGrath, 2012/08/06 23:32:24]

This does not belong here.
The shim only has to do with PPAPI interfaces, so it should be done in some
PPAPI-specific code.

[Robert Muth (chromium), 2012/08/07 14:45:40]

I think it makes sense to keep it here.
It is conceivable that the non-ppapi irt api could be affected by this.

Do you have any suggestions where to move it instead?

On 2012/08/06 23:32:24, Roland McGrath wrote:

+  /* switch irt to use pnacl shim wrappers */
+  /* enable this when removing src/untrusted/pnacl_irt_shim/ */
+  /* __libnacl_mandatory_irt_query("@nacl-cc-shim-mode", NULL, 0); */

[Mark Seaborn, 2012/08/06 23:30:29]

This is not an appropriate place to enable the shims because this file is part
of user code (and it's also newlib-only).  User PNaCl bitcode should not know
about the shims.  The shims should be enabled from PNaCl system code, presumably
from some code that is inserted to run before the user code's _start entry
point.

[Robert Muth (chromium), 2012/08/07 14:45:40]

Moving it elsewhere will likely be quite messy.
As the IRT interface is not usable up to this point.

Meaning I would have to replicated some of the code here
elsewhere.

We the new interface, I think it is ok for a pnacl pexe to
advertise its nature to the irt.

+#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);
 }