Switch from using 'nacl_main' to 'main' entry point

ports/ninja/nacl.patch

 diff --git a/configure.py b/configure.py
 --- a/configure.py
 +++ b/configure.py
 @@ -28,7 +28,9 @@ import string
  import subprocess
  import sys
  
 -sys.path.insert(0, 'misc')
 +SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 +sys.path.insert(0, os.path.join(SCRIPT_DIR, 'misc'))
@@ skipping 45 matching lines @@
      return os.path.join('$builddir', filename)
  def doc(filename):
 @@ -263,6 +270,7 @@ def binary(name):
      return name
  
  n.variable('builddir', 'build')
 +n.variable('srcdir', os.path.relpath(SCRIPT_DIR, os.getcwd()))
  n.variable('cxx', CXX)
  if platform.is_msvc():
      n.variable('ar', 'link')
-@@ -354,9 +362,12 @@ def shell_escape(str):
+@@ -326,6 +334,8 @@ if platform.is_mingw():
+     ldflags.append('-static')
+ elif platform.is_solaris():
+     cflags.remove('-fvisibility=hidden')
++elif platform.is_nacl():
++    cflags.remove('-fvisibility=hidden')
+ elif platform.is_msvc():
+     pass
+ else:
+@@ -354,9 +364,12 @@ def shell_escape(str):
  
  if 'CFLAGS' in configure_env:
      cflags.append(configure_env['CFLAGS'])
 -n.variable('cflags', ' '.join(shell_escape(flag) for flag in cflags))
  if 'LDFLAGS' in configure_env:
      ldflags.append(configure_env['LDFLAGS'])
 +if 'LIBS' in configure_env:
 +    libs.append(configure_env['LIBS'])
 +
 +n.variable('cflags', ' '.join(shell_escape(flag) for flag in cflags))
  n.variable('ldflags', ' '.join(shell_escape(flag) for flag in ldflags))
  n.newline()
  
-@@ -403,10 +414,10 @@ objs = []
+@@ -403,10 +416,10 @@ objs = []
  if platform.supports_ninja_browse():
      n.comment('browse_py.h is used to inline browse.py.')
      n.rule('inline',
 -           command='src/inline.sh $varname < $in > $out',
 +           command='$srcdir/src/inline.sh $varname < $in > $out',
             description='INLINE $out')
      n.build(built('browse_py.h'), 'inline', src('browse.py'),
 -            implicit='src/inline.sh',
 +            implicit=src('inline.sh'),
              variables=[('varname', 'kBrowsePy')])
      n.newline()
  
-@@ -469,10 +480,11 @@ else:
+@@ -469,10 +482,11 @@ else:
      ninja_lib = n.build(built('libninja.a'), 'ar', objs)
  n.newline()
  
 +# TODO(bradnelson): Upstream this fix.
  if platform.is_msvc():
 -    libs.append('ninja.lib')
 +    libs.insert(0, 'ninja.lib')
  else:
 -    libs.append('-lninja')
 +    libs.insert(0, '-lninja')
  
  all_targets = []
  
-@@ -583,7 +595,7 @@ if not host.is_mingw():
+@@ -583,7 +597,7 @@ if not host.is_mingw():
                 options.with_python,
             generator=True)
      n.build('build.ninja', 'configure',
 -            implicit=['configure.py', os.path.normpath('misc/ninja_syntax.py')])
 +            implicit=['$srcdir/configure.py', os.path.normpath('$srcdir/misc/ninja_syntax.py')])
      n.newline()
  
  n.default(ninja)
 diff --git a/src/disk_interface_test.cc b/src/disk_interface_test.cc
 --- a/src/disk_interface_test.cc
@@ skipping 45 matching lines @@
 +++ b/src/manifest_parser_perftest.cc
 @@ -99,7 +99,7 @@ int main(int argc, char* argv[]) {
    }
  
    if (chdir(kManifestDir) < 0)
 -    Fatal("chdir: %s", strerror(errno));
 +    Fatal("chdir %s: %s", kManifestDir, strerror(errno));
  
    const int kNumRepetitions = 5;
    vector<int> times;
-diff --git a/src/ninja.cc b/src/ninja.cc
---- a/src/ninja.cc
-+++ b/src/ninja.cc
-@@ -42,6 +42,11 @@
- #include "util.h"
- #include "version.h"
- 
-+#if defined(__native_client__)
-+# include "nacl_main.h"
-+# define main nacl_main
-+#endif
-+
- #ifdef _MSC_VER
- // Defined in msvc_helper_main-win32.cc.
- int MSVCHelperMain(int argc, char** argv);
 diff --git a/src/ninja_test.cc b/src/ninja_test.cc
 --- a/src/ninja_test.cc
 +++ b/src/ninja_test.cc
 @@ -14,6 +14,7 @@
  
  #include <stdarg.h>
  #include <stdio.h>
 +#include <stdlib.h>
  
  #ifdef _WIN32
  #include "getopt.h"
-@@ -21,6 +22,14 @@
+@@ -21,6 +22,13 @@
  #include <getopt.h>
  #endif
  
 +#if defined(__native_client__)
++#include <nacl_io/nacl_io.h>
 +#include <sys/stat.h>
 +#include <sys/mount.h>
-+#include "nacl_main.h"
-+#include "nacl_io/nacl_io.h"
-+#define main nacl_main
++#include <unistd.h>
 +#endif
 +
  #include "test.h"
  #include "line_printer.h"
  
-@@ -123,6 +132,16 @@ bool testing::Test::Check(bool condition, const char* file, int line,
+@@ -123,6 +131,16 @@ bool testing::Test::Check(bool condition, const char* file, int line,
  }
  
  int main(int argc, char **argv) {
 +#ifdef __native_client__
 +  // ninja tests require fcntl() and other functions which are not
 +  // available under sel_ldr, so we configure nacl_io and run the tests
 +  // in a memfs.
 +  nacl_io_init();
 +  umount("/");
 +  mount("", "/", "memfs", 0, NULL);
 +  mkdir("/tmp", 0777);
 +  chdir("/");
 +#endif
    int tests_started = 0;
  
    const char* test_filter = "*";
-@@ -152,5 +171,8 @@ int main(int argc, char **argv) {
+@@ -152,5 +170,8 @@ int main(int argc, char **argv) {
    }
  
    printer.PrintOnNewLine(passed ? "passed\n" : "failed\n");
 +#ifdef __native_client__
 +  nacl_io_uninit();
 +#endif
    return passed ? EXIT_SUCCESS : EXIT_FAILURE;
  }
 diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc
 --- a/src/subprocess-posix.cc
@@ skipping 205 matching lines @@
 +#ifdef __native_client__
 +int getloadavg(double loadavg[], int nelem) {
 +  errno = ENOSYS;
 +  return -1;
 +}
 +#endif
 +
  void Fatal(const char* msg, ...) {
    va_list ap;
    fprintf(stderr, "ninja: fatal: ");