Non-SFI Mode: Add nonsfi_loader and plumbing to test it

src/nonsfi/irt/irt_interfaces.c

 /*
  * Copyright (c) 2013 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/nonsfi/irt/irt_interfaces.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ skipping 454 matching lines @@
   return 0;
 }
 
 static void irt_stub_func(const char *name) {
   fprintf(stderr, "Error: Unimplemented IRT function: %s\n", name);
   abort();
 }
 
 #define DEFINE_STUB(name) \
     static void irt_stub_##name() { irt_stub_func(#name); }
-#define USE_STUB(s, name) (typeof(s.name)) irt_stub_##name
+#define USE_STUB(s, name) (__typeof__(s.name)) irt_stub_##name
 
 static const struct nacl_irt_basic irt_basic = {
   irt_exit,
   irt_gettod,
   irt_clock_func,
   irt_nanosleep,
   irt_sched_yield,
   irt_sysconf,
 };
 
@@ skipping 109 matching lines @@
         return size;
       }
       break;
     }
   }
   fprintf(stderr, "Warning: unavailable IRT interface queried: %s\n",
           interface_ident);
   return 0;
 }
 
-int main(int argc, char **argv, char **environ) {
+int nacl_irt_nonsfi_entry(int argc, char **argv, char **environ,
+                          nacl_entry_func_t entry_func) {
   /* Find size of environ array. */
   size_t env_count = 0;
   while (environ[env_count] != NULL)
     env_count++;
 
   size_t count =
       1  /* cleanup_func pointer */
       + 2  /* envc and argc counts */
       + argc + 1  /* argv array, with terminator */
       + env_count + 1  /* environ array, with terminator */
@@ skipping 16 matching lines @@
     data[pos++] = (uintptr_t) environ[i];
   data[pos++] = 0;
   /* auxv[0] */
   data[pos++] = AT_SYSINFO;
   data[pos++] = (uintptr_t) irt_interface_query;
   /* auxv[1] */
   data[pos++] = 0;
   data[pos++] = 0;
   assert(pos == count);
 
+  entry_func(data);
+  return 1;
+}
+
+#if defined(DEFINE_MAIN)
+int main(int argc, char **argv, char **environ) {
   /*
    * On Linux, we rename _start() to _user_start() to avoid a clash
    * with the "_start" routine in the host toolchain.  On Mac OS X,
    * lacking objcopy, doing the symbol renaming is trickier, but also
    * unnecessary, because the host toolchain doesn't have a "_start"
    * routine.
    */
+  nacl_entry_func_t entry_func =
 #if defined(__APPLE__)
-  _start(data);
+    _start;
 #else
-  _user_start(data);
+    _user_start;
 #endif
-  return 1;
+
+  return nacl_irt_nonsfi_entry(argc, argv, environ, entry_func);
 }
+#endif