Revert 12382 "Deploy new x86 binutils"

trunk/src/native_client/src/trusted/service_runtime/nacl.scons

 # -*- 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.
 
 Import('env')
 
 # All tests below involve native assembler
 
 HALT_SLED_SIZE=32
@@ skipping 38 matching lines @@
     asm_env.PNaClForceNative()
     asm_env.Append(ASPPFLAGS=['-DPNACL_AS=1'])
     # On Windows, assembly pre-preprocessing uses $CCCOM instead of $ASPPCOM,
     # so we need to set PNACL_AS=1 in CCFLAGS as well.
     asm_env.Append(CCFLAGS=['-DPNACL_AS=1'])
 
   link_cmd = ('${LD} -static -e _start ${TEXT_START} ${RO_START} ${RW_START}' +
                 ' -o ${TARGET} ${SOURCES}')
 
   if env.Bit('target_x86_32'):
-    link_cmd += ' -melf_i386_nacl'
+    link_cmd += ' -melf_nacl'
   elif env.Bit('target_x86_64'):
-    link_cmd += ' -melf_x86_64_nacl'
+    link_cmd += ' -melf64_nacl'
   elif env.Bit('target_arm'):
     link_cmd += ' -marmelf_nacl'
   elif env.Bit('target_mips32'):
     link_cmd += ' -mmipselelf_nacl'
   else:
     raise Exception('unknown architecture')
 
   asm_env['LINKCOM'] = link_cmd
 
   asm_env.Append(CPPDEFINES = [
@@ skipping 117 matching lines @@
     else:
       expected_exit_status = 0
 
     node = env.CommandSelLdrTestNacl(base_name + '.out', nexe,
                                      exit_status=expected_exit_status)
 
     env.AddNodeToTestSuite(node,
                            ['small_tests', 'sel_ldr_sled_tests',
                             'nonpexe_tests'],
                            'run_' + base_name)