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

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # 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.
 
 """NaCl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 150 matching lines @@
 def _SetEnvForPnacl(env, root):
   # All the PNaCl tools require Python to be in the PATH.
   arch = env['TARGET_FULLARCH']
   assert arch in ['arm', 'mips32', 'x86-32', 'x86-64']
 
   if env.Bit('pnacl_unsandboxed'):
     if env.Bit('host_linux'):
       arch = '%s-linux' % arch
     elif env.Bit('host_mac'):
       arch = '%s-mac' % arch
+  if env.Bit('nonsfi_nacl'):
+    arch += '-nonsfi'
   arch_flag = ' -arch %s' % arch
   if env.Bit('pnacl_generate_pexe'):
     ld_arch_flag = ''
   else:
     ld_arch_flag = arch_flag
 
   if env.Bit('nacl_glibc'):
     subroot = root + '/glibc'
   else:
     subroot = root
@@ skipping 520 matching lines @@
   if 'toolchain_feature_version' in SCons.Script.ARGUMENTS:
     version = int(SCons.Script.ARGUMENTS['toolchain_feature_version'])
   else:
     version_file = os.path.join(root, 'FEATURE_VERSION')
     if os.path.exists(version_file):
       with open(version_file, 'r') as fh:
         version = int(fh.read())
     else:
       version = 0
   env.Replace(TOOLCHAIN_FEATURE_VERSION=version)