Remove wrapper-link-and-translate from PNaCl and pnacl_shared_newlib from SCons.

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 286 matching lines @@
 
   BitFromArgument(env, 'disable_flaky_tests', default=False,
     desc='Do not run potentially flaky tests - used on Chrome bots')
 
   BitFromArgument(env, 'use_sandboxed_translator', default=False,
     desc='use pnacl sandboxed translator for linking (not available for arm)')
 
   BitFromArgument(env, 'pnacl_generate_pexe', default=env.Bit('bitcode'),
     desc='use pnacl to generate pexes and translate in a separate step')
 
-  BitFromArgument(env, 'pnacl_shared_newlib', default=False,
-    desc='build newlib (and other libs) shared in PNaCl')
-
   BitFromArgument(env, 'translate_in_build_step', default=True,
     desc='Run translation during build phase (e.g. if do_not_run_tests=1)')
 
   BitFromArgument(env, 'browser_headless', default=False,
     desc='Where possible, set up a dummy display to run the browser on '
       'when running browser tests.  On Linux, this runs the browser through '
       'xvfb-run.  This Scons does not need to be run with an X11 display '
       'and we do not open a browser window on the user\'s desktop.  '
       'Unfortunately there is no equivalent on Mac OS X.')
 
@@ skipping 2597 matching lines @@
 nacl_env['INCLUDE_DIR'] = '${TARGET_ROOT}/include'
 # Remove the default $LIB_DIR element so that we prepend it without duplication.
 # Using PrependUnique alone would let it stay last, where we want it first.
 nacl_env.FilterOut(LIBPATH=['${LIB_DIR}'])
 nacl_env.PrependUnique(
     CPPPATH = ['${INCLUDE_DIR}'],
     LIBPATH = ['${LIB_DIR}'],
     )
 
 if nacl_env.Bit('bitcode'):
-  # This helps with NaClSdkLibrary() where some libraries share object files
-  # between static and shared libs. Without it scons will complain.
-  # NOTE: this is a standard scons mechanism
-  nacl_env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
   # passing -O when linking requests LTO, which does additional global
   # optimizations at link time
   nacl_env.Append(LINKFLAGS=['-O3'])
-  if not nacl_env.Bit('nacl_glibc') and not nacl_env.Bit('pnacl_shared_newlib'):
+  if not nacl_env.Bit('nacl_glibc'):
     nacl_env.Append(LINKFLAGS=['-static'])
 
   if nacl_env.Bit('translate_fast'):
     nacl_env.Append(LINKFLAGS=['-Xlinker', '-translate-fast'])
     nacl_env.Append(TRANSLATEFLAGS=['-translate-fast'])
 
   # With pnacl's clang base/ code uses the "override" keyword.
   nacl_env.Append(CXXFLAGS=['-Wno-c++11-extensions'])
   # Allow extraneous semicolons.  (Until these are removed.)
   # http://code.google.com/p/nativeclient/issues/detail?id=2861
@@ skipping 22 matching lines @@
 
 # Map certain flag bits to suffices on the build output.  This needs to
 # happen pretty early, because it affects any concretized directory names.
 target_variant_map = [
     ('bitcode', 'pnacl'),
     ('translate_fast', 'fast'),
     ('nacl_pic', 'pic'),
     ('use_sandboxed_translator', 'sbtc'),
     ('nacl_glibc', 'glibc'),
     ('pnacl_generate_pexe', 'pexe'),
-    ('pnacl_shared_newlib', 'shared'),
     ]
 for variant_bit, variant_suffix in target_variant_map:
   if nacl_env.Bit(variant_bit):
     nacl_env['TARGET_VARIANT'] += '-' + variant_suffix
 
 if nacl_env.Bit('bitcode'):
   nacl_env['TARGET_VARIANT'] += '-clang'
 
 nacl_env.Replace(TESTRUNNER_LIBS=['testrunner'])
 # TODO(mseaborn): Drop this once chrome side has inlined this.
@@ skipping 229 matching lines @@
 
 def NaClSharedLibrary(env, lib_name, *args, **kwargs):
   env_shared = env.Clone(COMPONENT_STATIC=False)
   soname = SCons.Util.adjustixes(lib_name, 'lib', '.so')
   env_shared.AppendUnique(SHLINKFLAGS=['-Wl,-soname,%s' % (soname)])
   return env_shared.ComponentLibrary(lib_name, *args, **kwargs)
 
 nacl_env.AddMethod(NaClSharedLibrary)
 
 def NaClSdkLibrary(env, lib_name, *args, **kwargs):
-  gen_shared = (not env.Bit('nacl_disable_shared') or
-                env.Bit('pnacl_shared_newlib'))
-  if 'no_shared_lib' in kwargs:
-    if kwargs['no_shared_lib']:
-      gen_shared = False
-    del kwargs['no_shared_lib']
   n = [env.ComponentLibrary(lib_name, *args, **kwargs)]
-  if gen_shared:
+  if not env.Bit('nacl_disable_shared'):
     n.append(env.NaClSharedLibrary(lib_name, *args, **kwargs))
   return n
 
 nacl_env.AddMethod(NaClSdkLibrary)
 
 
 # Special environment for untrusted test binaries that use raw syscalls
 def RawSyscallObjects(env, sources):
   raw_syscall_env = env.Clone()
   raw_syscall_env.Append(
@@ skipping 16 matching lines @@
 nacl_env.AddMethod(RawSyscallObjects)
 
 
 # The IRT-building environment was cloned from nacl_env, but it should
 # ignore the --nacl_glibc, nacl_pic=1 and bitcode=1 switches.
 # We have to reinstantiate the naclsdk.py magic after clearing those flags,
 # so it regenerates the tool paths right.
 # TODO(mcgrathr,bradnelson): could get cleaner if naclsdk.py got folded back in.
 nacl_irt_env.ClearBits('nacl_glibc')
 nacl_irt_env.ClearBits('nacl_pic')
-nacl_irt_env.ClearBits('pnacl_shared_newlib')
 # We build the IRT using the nnacl TC even when the pnacl TC is used otherwise.
 if nacl_irt_env.Bit('target_mips32') or nacl_irt_env.Bit('target_x86_64'):
   nacl_irt_env.SetBits('bitcode')
 else:
   nacl_irt_env.ClearBits('bitcode')
 nacl_irt_env.ClearBits('pnacl_generate_pexe')
 nacl_irt_env.ClearBits('use_sandboxed_translator')
 nacl_irt_env.Tool('naclsdk')
 # These are unfortunately clobbered by running Tool, which
 # we needed to do to get the destination directory reset.
@@ skipping 417 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:')