Stackable IRT

src/untrusted/nacl/start.c

Index: src/untrusted/nacl/start.c
diff --git a/src/untrusted/nacl/start.c b/src/untrusted/nacl/start.c
index 200aef4d7cb4bea8eeb834a25b69ae5bf1ac70cf..732ae67d05b392d1dfc3f74644531c1d6298f5df 100644
--- a/src/untrusted/nacl/start.c
+++ b/src/untrusted/nacl/start.c
@@ -7,6 +7,7 @@
 #include <unistd.h>
 
 #include "native_client/src/include/elf32.h"
+#include "native_client/src/untrusted/irt/irt_module.h"
 #include "native_client/src/untrusted/nacl/nacl_irt.h"
 #include "native_client/src/untrusted/nacl/nacl_startup.h"
 #include "native_client/src/untrusted/nacl/start.h"
@@ -46,7 +47,7 @@ void _start(uint32_t *info) {
    */
   __nacl_initial_thread_stack_end = &info;
 
-  __libnacl_irt_init(auxv);
+  __libnacl_irt_init(argc, argv, auxv);
 
   /*
    * If we were started by a dynamic linker, then it passed its finalizer
@@ -61,6 +62,15 @@ void _start(uint32_t *info) {
 
   __libc_init_array();
 
+  /*
+  {
+    struct nacl_irt *irt = nacl_irt_new(NULL, __nacl_irt_query, NULL);
+    if (irt != NULL) {
+      nacl_irt_layer_init(irt->layer);
+    }
+  }
+  */
+
   int (*main_ptr)(int argc, char **argv, char **envp) = &__nacl_main;
   if (main_ptr == NULL)
     main_ptr = &main;