Add nacl-clang testing to SCons

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 81 matching lines @@
         tool_prefix = tooldir
         # The lib directory may have an alternate name, i.e.
         # 'lib32' in the x86_64-nacl tooldir.
         libdir = os.path.join(tooldir, subarch_spec.get('other_libdir', 'lib'))
         break
 
   if tool_prefix is None:
     raise Exception("Cannot find a toolchain for %s in %s" %
                     (env['TARGET_FULLARCH'], sdk_path))
 
+  cc = 'clang' if env.Bit('nacl_clang') else 'gcc'
+  cxx = 'clang++' if env.Bit('nacl_clang') else 'g++'
+  # Eventually nacl-clang will default to -no-integrated-as but for now we have
+  # to use the integrated as for compilation because of
+  # https://code.google.com/p/nativeclient/issues/detail?id=3966
+  # However clang's as' support of some of the nacl syntax is incomplete, so for
+  # now use binutils as for our asm files.
+  as_flags = '-no-integrated-as' if env.Bit('nacl_clang') else []
+
   env.Replace(# Replace header and lib paths.
               # where to put nacl extra sdk headers
               # TODO(robertm): switch to using the mechanism that
               #                passes arguments to scons
               NACL_SDK_INCLUDE='%s/%s/include' % (sdk_path, tool_prefix),
               # where to find/put nacl generic extra sdk libraries
               NACL_SDK_LIB='%s/%s' % (sdk_path, libdir),
               # Replace the normal unix tools with the NaCl ones.
-              CC=os.path.join(bin_path, '%s-gcc' % tool_prefix),
-              CXX=os.path.join(bin_path, '%s-g++' % tool_prefix),
+              CC=os.path.join(bin_path, '%s-%s' % (tool_prefix, cc)),
+              CXX=os.path.join(bin_path, '%s-%s' % (tool_prefix, cxx)),
               AR=os.path.join(bin_path, '%s-ar' % tool_prefix),
               AS=os.path.join(bin_path, '%s-as' % tool_prefix),
-              ASPP=os.path.join(bin_path, '%s-gcc' % tool_prefix),
+              ASPP=os.path.join(bin_path, '%s-%s' % (tool_prefix, cc)),
               GDB=os.path.join(bin_path, '%s-gdb' % tool_prefix),
               # NOTE: use g++ for linking so we can handle C AND C++.
-              LINK=os.path.join(bin_path, '%s-g++' % tool_prefix),
+              LINK=os.path.join(bin_path, '%s-%s' % (tool_prefix, cxx)),
               # Grrr... and sometimes we really need ld.
               LD=os.path.join(bin_path, '%s-ld' % tool_prefix) + ld_mode_flag,
               RANLIB=os.path.join(bin_path, '%s-ranlib' % tool_prefix),
               NM=os.path.join(bin_path, '%s-nm' % tool_prefix),
               OBJDUMP=os.path.join(bin_path, '%s-objdump' % tool_prefix),
               STRIP=os.path.join(bin_path, '%s-strip' % tool_prefix),
               ADDR2LINE=os.path.join(bin_path, '%s-addr2line' % tool_prefix),
               BASE_LINKFLAGS=[cc_mode_flag],
               BASE_CFLAGS=[cc_mode_flag],
               BASE_CXXFLAGS=[cc_mode_flag],
               BASE_ASFLAGS=[as_mode_flag],
               BASE_ASPPFLAGS=[cc_mode_flag],
               CFLAGS=['-std=gnu99'],
               CCFLAGS=['-O3',
                        '-Werror',
                        '-Wall',
                        '-Wno-variadic-macros',
                        '-Wswitch-enum',
                        '-g',
                        '-fno-stack-protector',
                        '-fdiagnostics-show-option',
                        '-pedantic',
                        '-D__linux__',
                        ],
-              ASFLAGS=[],
+              ASFLAGS=as_flags,
               )
 
   # NaClSdk environment seems to be inherited from the host environment.
   # On Linux host, this probably makes sense. On Windows and Mac, this
   # introduces nothing except problems.
   # For now, simply override the environment settings as in
   # <scons>/engine/SCons/Platform/posix.py
   env.Replace(LIBPREFIX='lib',
               LIBSUFFIX='.a',
               SHLIBPREFIX='$LIBPREFIX',
@@ skipping 505 matching lines @@
     env['TEMPFILE'] = NaClTempFileMunge
     for com in ['LINKCOM', 'SHLINKCOM', 'ARCOM']:
       env[com] = "${TEMPFILE('%s')}" % env[com]
 
   # Get root of the SDK.
   root = env.GetToolchainDir()
 
   # if bitcode=1 use pnacl toolchain
   if env.Bit('bitcode'):
     _SetEnvForPnacl(env, root)
+  elif env.Bit('built_elsewhere'):
+    _StubOutEnvToolsForBuiltElsewhere(env)
+  else:
+    _SetEnvForNativeSdk(env, root)
 
+  if (env.Bit('bitcode') or env.Bit('nacl_clang')) and env.Bit('target_x86'):
     # Get GDB from the nacl-gcc toolchain even when using PNaCl.
     # TODO(mseaborn): We really want the nacl-gdb binary to be in a
     # separate tarball from the nacl-gcc toolchain, then this step
     # will not be necessary.
     # See http://code.google.com/p/nativeclient/issues/detail?id=2773
-    if env.Bit('target_x86'):
-      temp_env = env.Clone()
-      temp_env.ClearBits('bitcode')
-      temp_root = temp_env.GetToolchainDir()
-      _SetEnvForNativeSdk(temp_env, temp_root)
-      env.Replace(GDB=temp_env['GDB'])
-  elif env.Bit('built_elsewhere'):
-    _StubOutEnvToolsForBuiltElsewhere(env)
-  else:
-    _SetEnvForNativeSdk(env, root)
+    temp_env = env.Clone()
+    temp_env.ClearBits('bitcode', 'nacl_clang')
+    temp_root = temp_env.GetToolchainDir()
+    _SetEnvForNativeSdk(temp_env, temp_root)
+    env.Replace(GDB=temp_env['GDB'])
 
   env.Prepend(LIBPATH='${NACL_SDK_LIB}')
 
   # Install our scanner for (potential) linker scripts.
   # It applies to "source" files ending in .a or .so.
   # Dependency files it produces are to be found in ${LIBPATH}.
   # It is applied recursively to those dependencies in case
   # some of them are linker scripts too.
   ldscript_scanner = SCons.Scanner.Base(
       function=ScanLinkerScript,
@@ skipping 15 matching lines @@
     # translation.
     if not os.path.exists(version_file) or env.Bit('use_sandboxed_translator'):
       version_file = os.path.join(os.path.dirname(root), 'pnacl_translator',
                                   '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)