Revert SCons portion of r14155

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 83 matching lines @@
         # '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-%s' % (tool_prefix, cc)),
@@ skipping 21 matching lines @@
                        '-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 566 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)