Switch nacl-clang back to gas in SCons

site_scons/site_tools/naclsdk.py

Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index 441fa43a36e90b4487fe46dbdbb41448618e0170..f4a82032f126a25fe313c6b4aac8ec432bfbc280 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -101,12 +101,6 @@ def _SetEnvForNativeSdk(env, 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
@@ -148,7 +142,7 @@ def _SetEnvForNativeSdk(env, sdk_path):
                        '-pedantic',
                        '-D__linux__',
                        ],
-              ASFLAGS=as_flags,
+              ASFLAGS=[],
               )
 
   # NaClSdk environment seems to be inherited from the host environment.