[NaCl SDK] Add msan support to SDK build system

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 argparse
 import os
@@ skipping 42 matching lines @@
   parser = argparse.ArgumentParser(description=__doc__, epilog=epilog)
   parser.add_argument('-v', '--verbose', action='store_true',
                       help='Verbose output')
   parser.add_argument('-d', '--debug', action='store_true',
                       help='Enable debug stub')
   parser.add_argument('-e', '--exceptions', action='store_true',
                       help='Enable exception handling interface')
   parser.add_argument('-p', '--passthrough-environment', action='store_true',
                       help='Pass environment of host through to nexe')
   parser.add_argument('--debug-libs', action='store_true',
-                      help='For dynamic executables, reference debug '
-                           'libraries rather then release')
+                      help='Legacy option, do not use')
+  parser.add_argument('--config', default='Release',
+                      help='Use a particular library configuration (normally '
+                           'Debug or Release)')
   parser.add_argument('executable', help='executable (.nexe) to run')
   parser.add_argument('args', nargs='*', help='argument to pass to exectuable')
   parser.add_argument('--library-path',
                       help='Pass extra library paths')
 
   # To enable bash completion for this command first install optcomplete
   # and then add this line to your .bashrc:
   #  complete -F _optcomplete sel_ldr.py
   try:
     import optcomplete
@@ skipping 67 matching lines @@
 
     arm_libpath = os.path.join(NACL_SDK_ROOT, 'tools', 'lib', 'arm_trusted')
     if not os.path.isdir(arm_libpath):
       raise Error('Could not find ARM library path: %s' % arm_libpath)
     qemu = [qemu_bin, '-cpu', 'cortex-a8', '-L', arm_libpath]
     # '-Q' disables platform qualification, allowing arm binaries to run.
     cmd = qemu + cmd + ['-Q']
 
   if dynamic:
     if options.debug_libs:
-      sdk_lib_dir = os.path.join(NACL_SDK_ROOT, 'lib',
-                                 'glibc_%s' % arch_suffix, 'Debug')
-    else:
-      sdk_lib_dir = os.path.join(NACL_SDK_ROOT, 'lib',
-                                 'glibc_%s' % arch_suffix, 'Release')
+      sys.stderr.write('warning: --debug-libs is deprecated (use --config).\n')
+      options.config = 'Debug'
+
+    sdk_lib_dir = os.path.join(NACL_SDK_ROOT, 'lib',
+                               'glibc_%s' % arch_suffix, options.config)
 
     if elf_arch == 'x86-64':
       lib_subdir = 'lib'
       tcarch = 'x86'
       tcsubarch = 'x86_64'
       usr_arch = 'x86_64'
     elif elf_arch == 'arm':
       lib_subdir = 'lib'
       tcarch = 'arm'
       tcsubarch = 'arm'
       usr_arch = 'arm'
     elif elf_arch == 'x86-32':
       lib_subdir = 'lib32'
       tcarch = 'x86'
       tcsubarch = 'x86_64'
       usr_arch = 'i686'
     else:
       raise Error("Unknown arch: %s" % elf_arch)
 
     toolchain = '%s_%s_glibc' % (osname, tcarch)
     toolchain_dir = os.path.join(NACL_SDK_ROOT, 'toolchain', toolchain)
     interp_prefix = os.path.join(toolchain_dir, tcsubarch + '-nacl')
     lib_dir = os.path.join(interp_prefix, lib_subdir)
     usr_lib_dir = os.path.join(toolchain_dir, usr_arch + '-nacl', 'usr', 'lib')
 
     libpath = [usr_lib_dir, sdk_lib_dir, lib_dir]
+
+    if options.config not in ['Debug', 'Release']:
+      config_fallback = 'Release'
+      if 'Debug' in options.config:
+        config_fallback = 'Debug'
+      libpath.append(os.path.join(NACL_SDK_ROOT, 'lib',
+                     'glibc_%s' % arch_suffix, config_fallback))
+
     if options.library_path:
       libpath.extend([os.path.abspath(p) for p
                       in options.library_path.split(':')])
     libpath = ':'.join(libpath)
     if elf_arch == 'arm':
       ldso = os.path.join(SCRIPT_DIR, 'elf_loader_arm.nexe')
       cmd.append('-E')
       cmd.append('LD_LIBRARY_PATH=%s' % libpath)
       cmd.append(ldso)
       cmd.append('--interp-prefix')
@@ skipping 13 matching lines @@
   Log(cmd)
   return subprocess.call(cmd)
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)