Revert 12382 "Deploy new x86 binutils"

trunk/src/native_client/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 24 matching lines @@
             'cc_flag': '',
             'ld_flag': '',
             },
         },
     'x86': {
         '32': {
             'tooldir': 'i686-nacl',
             'other_libdir': 'lib32',
             'as_flag': '--32',
             'cc_flag': '-m32',
-            'ld_flag': ' -melf_i386_nacl',
+            'ld_flag': ' -melf_nacl',
             },
         '64': {
             'tooldir': 'x86_64-nacl',
             'other_libdir': 'lib64',
             'as_flag': '--64',
             'cc_flag': '-m64',
-            'ld_flag': ' -melf_x86_64_nacl',
+            'ld_flag': ' -melf64_nacl',
             },
         },
     }
 
 def _StubOutEnvToolsForBuiltElsewhere(env):
   """Stub out all tools so that they point to 'true'.
 
   Some machines have their code built by another machine, they'll therefore
   run 'true' instead of running the usual build tools.
 
@@ skipping 742 matching lines @@
   if 'toolchain_feature_version' in SCons.Script.ARGUMENTS:
     version = int(SCons.Script.ARGUMENTS['toolchain_feature_version'])
   else:
     version_file = os.path.join(root, '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)