[NaCl SDK] Fix sel_ldr.py so it uses nacl_helper_bootstrap correctly.

native_client_sdk/src/tools/sel_ldr.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Wrapper script for launching application within the sel_ldr.
 """
 
 import optparse
 import os
@@ skipping 63 matching lines @@
 
   arch_suffix = arch.replace('-', '_')
 
   sel_ldr = os.path.join(SCRIPT_DIR, 'sel_ldr_%s' % arch_suffix)
   irt = os.path.join(SCRIPT_DIR, 'irt_core_%s.nexe' % arch_suffix)
   if osname == 'win':
     sel_ldr += '.exe'
   Log('ROOT    = %s' % NACL_SDK_ROOT)
   Log('SEL_LDR = %s' % sel_ldr)
   Log('IRT     = %s' % irt)
-  cmd = [sel_ldr, '-a', '-B', irt, '-l', os.devnull]
+  cmd = [sel_ldr]
+
+  if osname == 'linux':
+    # Run sel_ldr under nacl_helper_bootstrap
+    helper = os.path.join(SCRIPT_DIR, 'nacl_helper_bootstrap_%s' % arch_suffix)
+    Log('HELPER  = %s' % helper)
+    cmd.insert(0, helper)
+    cmd.append('--r_debug=0xXXXXXXXXXXXXXXXX')
+    cmd.append('--reserved_at_zero=0xXXXXXXXXXXXXXXXX')
+
+  cmd += ['-a', '-B', irt]
 
   if options.debug:
     cmd.append('-g')
 
-  if osname == 'linux':
-    helper = os.path.join(SCRIPT_DIR, 'nacl_helper_bootstrap_%s' % arch_suffix)
-    Log('HELPER  = %s' % helper)
-    cmd.insert(0, helper)
+  if not options.verbose:
+    cmd += ['-l', os.devnull]
 
   if dynamic:
     if options.debug_libs:
       libpath = os.path.join(NACL_SDK_ROOT, 'lib',
                             'glibc_%s' % arch_suffix, 'Debug')
     else:
       libpath = os.path.join(NACL_SDK_ROOT, 'lib',
                             'glibc_%s' % arch_suffix, 'Release')
     toolchain = '%s_x86_glibc' % osname
     sdk_lib_dir = os.path.join(NACL_SDK_ROOT, 'toolchain',
                                toolchain, 'x86_64-nacl')
     if arch == 'x86-64':
       sdk_lib_dir = os.path.join(sdk_lib_dir, 'lib')
     else:
       sdk_lib_dir = os.path.join(sdk_lib_dir, 'lib32')
     ldso = os.path.join(sdk_lib_dir, 'runnable-ld.so')
     cmd.append(ldso)
-    Log('LD.SO   = %s' % ldso)
+    Log('LD.SO = %s' % ldso)
     libpath += ':' + sdk_lib_dir
     cmd.append('--library-path')
     cmd.append(libpath)
 
 
-  cmd += args
+  if args:
+    # Append arguments for the executable itself.
+    cmd += args
+
   Log(cmd)
   rtn = subprocess.call(cmd)
   return rtn
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)