NonSFI Mode: Make hello_world test run with nonsfi_nacl=1 bitcode=1 pnacl_generate_pexe=0.

SConstruct

 #! -*- 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.
 
 import atexit
 import json
 import os
 import platform
 import re
@@ skipping 3678 matching lines @@
 
 nacl_irt_test_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests)
 nacl_irt_test_env.AddChromeFilesFromGroup('irt_variant_test_scons_files')
 nacl_irt_test_env.Append(BUILD_SCONSCRIPTS=irt_only_tests)
 TestsUsePublicLibs(nacl_irt_test_env)
 TestsUsePublicListMappingsLib(nacl_irt_test_env)
 
 # We add the following settings after creating nacl_irt_test_env because we
 # don't want them to be inherited by nacl_irt_test_env.
 if nacl_env.Bit('nonsfi_nacl'):
-  # Not-IRT-using non-SFI code uses Linux syscalls directly.  Since this
-  # involves using inline assembly, this requires turning off the PNaCl ABI
-  # checker.
-  nacl_env.SetBits('nonstable_bitcode')
-  nacl_env.Append(LINKFLAGS=['--pnacl-disable-abi-check'])
-  # Tell the PNaCl translator to link a Linux executable.
-  nacl_env.Append(TRANSLATEFLAGS=['--noirt'])
+  if nacl_env.Bit('pnacl_generate_pexe'):
+    # Not-IRT-using non-SFI code uses Linux syscalls directly.  Since this
+    # involves using inline assembly, this requires turning off the PNaCl ABI
+    # checker.
+    nacl_env.SetBits('nonstable_bitcode')
+    nacl_env.Append(LINKFLAGS=['--pnacl-disable-abi-check'])
+    # Tell the PNaCl translator to link a Linux executable.
+    nacl_env.Append(TRANSLATEFLAGS=['--noirt'])
+  else:
+    nacl_env.Append(LINKFLAGS=['--pnacl-allow-native', '-Wt,--noirt'])
 
 # If a tests/.../nacl.scons file builds a library, we will just use
 # the one already built in nacl_env instead.
 def IrtTestDummyLibrary(*args, **kwargs):
   pass
 nacl_irt_test_env.AddMethod(IrtTestDummyLibrary, 'ComponentLibrary')
 
 def IrtTestAddNodeToTestSuite(env, node, suite_name, node_name=None,
                               is_broken=False, is_flaky=False,
                               disable_irt_suffix=False):
@@ skipping 297 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')