[NaCL SDK] Add initial support for nacl-clang

native_client_sdk/src/tools/nacl_config.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.
 
 """A helper script to print paths of NaCl binaries, includes, libs, etc.
 
 It is similar in behavior to pkg-config or sdl-config.
 """
 
@@ skipping 26 matching lines @@
   'x86_64': 'x86_64'
 }
 
 ARCH_BASE_NAME = {
   'arm': 'arm',
   'x86_32': 'x86',
   'i686': 'x86',
   'x86_64': 'x86'
 }
 
-NACL_TOOLCHAINS = ('newlib', 'glibc', 'pnacl', 'bionic')
+NACL_TOOLCHAINS = ('newlib', 'glibc', 'pnacl', 'bionic', 'clang-newlib')
 HOST_TOOLCHAINS = ('linux', 'mac', 'win')
 VALID_TOOLCHAINS = list(HOST_TOOLCHAINS) + list(NACL_TOOLCHAINS) + ['host']
 
 # This is not an exhaustive list of tools, just the ones that need to be
 # special-cased.
 
 # e.g. For PNaCL cc => pnacl-clang
 #      For NaCl  cc => pnacl-gcc
 #
 # Most tools will be passed through directly.
 # e.g. For PNaCl foo => pnacl-foo
 #      For NaCl  foo => x86_64-nacl-foo.
-PNACL_TOOLS = {
+CLANG_TOOLS = {
   'cc': 'clang',
   'c++': 'clang++',
   'gcc': 'clang',
   'g++': 'clang++',
   'ld': 'clang++'
 }
 
-NACL_TOOLS = {
+GCC_TOOLS = {
   'cc': 'gcc',
   'c++': 'g++',
   'gcc': 'gcc',
   'g++': 'g++',
   'ld': 'g++'
 }
 
 
 class Error(Exception):
   pass
@@ skipping 67 matching lines @@
   if getos.GetPlatform() == 'win':
     return sdk_path.replace('\\', '/')
   else:
     return sdk_path
 
 
 def GetToolchainDir(toolchain, arch=None):
   ExpectToolchain(toolchain, NACL_TOOLCHAINS)
   root = GetPosixSDKPath()
   platform = getos.GetPlatform()
-  if toolchain == 'pnacl':
+  if toolchain in ('pnacl', 'clang-newlib'):
     subdir = '%s_pnacl' % platform
   else:
     assert arch is not None
     subdir = '%s_%s_%s' % (platform, GetArchBaseName(arch), toolchain)
 
   return posixpath.join(root, 'toolchain', subdir)
 
 
 def GetToolchainArchDir(toolchain, arch):
   ExpectToolchain(toolchain, NACL_TOOLCHAINS)
   assert arch is not None
   toolchain_dir = GetToolchainDir(toolchain, arch)
   arch_dir = '%s-nacl' % GetArchName(arch)
   return posixpath.join(toolchain_dir, arch_dir)
 
 
 def GetToolchainBinDir(toolchain, arch=None):
   ExpectToolchain(toolchain, NACL_TOOLCHAINS)
   return posixpath.join(GetToolchainDir(toolchain, arch), 'bin')
 
 
 def GetSDKIncludeDirs(toolchain):
   root = GetPosixSDKPath()
   base_include = posixpath.join(root, 'include')
+  if toolchain == 'clang-newlib':
+    toolchain = 'newlib'
   return [base_include, posixpath.join(base_include, toolchain)]
 
 
 def GetSDKLibDir():
   return posixpath.join(GetPosixSDKPath(), 'lib')
 
 
 # Commands
 
 def GetToolPath(toolchain, arch, tool):
   if tool == 'gdb':
     # Always use the same gdb; it supports multiple toolchains/architectures.
     # NOTE: this is always a i686 executable. i686-nacl-gdb is a symlink to
     # x86_64-nacl-gdb.
     return posixpath.join(GetToolchainBinDir('newlib', 'x86_64'),
                         'x86_64-nacl-gdb')
 
   if toolchain == 'pnacl':
     CheckValidToolchainArch(toolchain, arch)
-    tool = PNACL_TOOLS.get(tool, tool)
+    tool = CLANG_TOOLS.get(tool, tool)
     full_tool_name = 'pnacl-%s' % tool
   else:
     CheckValidToolchainArch(toolchain, arch, arch_required=True)
     ExpectArch(arch, VALID_ARCHES)
-    tool = NACL_TOOLS.get(tool, tool)
+    if toolchain == 'clang-newlib':
+      tool = CLANG_TOOLS.get(tool, tool)
+    else:
+      tool = GCC_TOOLS.get(tool, tool)
     full_tool_name = '%s-nacl-%s' % (GetArchName(arch), tool)
   return posixpath.join(GetToolchainBinDir(toolchain, arch), full_tool_name)
 
 
 def GetCFlags(toolchain):
   ExpectToolchain(toolchain, VALID_TOOLCHAINS)
   return ' '.join('-I%s' % dirname for dirname in GetSDKIncludeDirs(toolchain))
 
 
 def GetIncludeDirs(toolchain):
@@ skipping 46 matching lines @@
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)