Revert 12382 "Deploy new x86 binutils"

trunk/src/native_client/SConstruct

Index: trunk/src/native_client/SConstruct
===================================================================
--- trunk/src/native_client/SConstruct	(revision 12384)
+++ trunk/src/native_client/SConstruct	(working copy)
@@ -2740,11 +2740,10 @@
     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)
 
@@ -3010,9 +3009,9 @@
 # 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')):