Revert 12382 "Deploy new x86 binutils"

trunk/src/native_client/SConstruct

 #! -*- 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 atexit
 import os
 import platform
 import re
 import subprocess
@@ skipping 2722 matching lines @@
     # These are settings for in-tree, non-browser tests to use.
     # They use libraries that circumvent the IRT-based implementations
     # in the public libraries.
     NONIRT_LIBS = ['nacl_sys_private'],
     PTHREAD_LIBS = ['pthread_private'],
     DYNCODE_LIBS = ['nacl_dyncode_private'],
     EXCEPTION_LIBS = ['nacl_exception_private'],
     LIST_MAPPINGS_LIBS = ['nacl_list_mappings_private'],
     )
 
-# TODO(mcgrathr): Remove this after the new binutils has settled.
 def IsNewLinker(env):
   """Return True if using a new-style linker with the new-style layout.
 That means the linker supports the -Trodata-segment switch."""
-  return True
+  return env.Bit('target_arm') or env.Bit('bitcode')
 
 nacl_env.AddMethod(IsNewLinker)
 
 def UsesAbiNote(env):
   """Return True if using a new-style GCC with .note.NaCl.ABI.* notes.
 This means there will always be an RODATA segment, even if just for the note."""
   return env.Bit('target_arm') and not env.Bit('bitcode')
 
 nacl_env.AddMethod(UsesAbiNote)
 
@@ skipping 245 matching lines @@
 
 nacl_env.Replace(TESTRUNNER_LIBS=['testrunner'])
 # TODO(mseaborn): Drop this once chrome side has inlined this.
 nacl_env.Replace(PPAPI_LIBS=['ppapi'])
 
 # TODO(mseaborn): Make nacl-glibc-based static linking work with just
 # "-static", without specifying a linker script.
 # See http://code.google.com/p/nativeclient/issues/detail?id=1298
 def GetLinkerScriptBaseName(env):
   if env.Bit('build_x86_64'):
-    return 'elf_x86_64_nacl'
+    return 'elf64_nacl'
   else:
-    return 'elf_i386_nacl'
+    return 'elf_nacl'
 
 if (nacl_env.Bit('nacl_glibc') and
     nacl_env.Bit('nacl_static_link')):
   if nacl_env.IsNewLinker():
     nacl_env.Append(LINKFLAGS=['-static'])
   else:
     # The "-lc" is necessary because libgcc_eh depends on libc but for
     # some reason nacl-gcc is not linking with "--start-group/--end-group".
     nacl_env.Append(LINKFLAGS=[
         '-static',
@@ skipping 688 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')