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

pnacl/driver/pnacl-translate.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.
 #
 # IMPORTANT NOTE: If you make local mods to this file, you must run:
 #   %  pnacl/build.sh driver
 # in order for them to take effect in the scons build.  This command
 # updates the copy in the toolchain/ tree.
 #
@@ skipping 13 matching lines @@
 
   # Determine if we should build nexes compatible with the IRT
   'USE_IRT' : '1',
 
   # Allow C++ exception handling in the pexe.
   'ALLOW_CXX_EXCEPTIONS' : '0',
 
   # Use the IRT shim by default. This can be disabled with an explicit
   # flag (--noirtshim) or via -nostdlib.
   'USE_IRT_SHIM'  : '${!SHARED ? 1 : 0}',
-  # Experimental mode exploring newlib as a shared library
-  'NEWLIB_SHARED_EXPERIMENT': '0',
 
   # To simulate the sandboxed translator better and avoid user surprises,
   # reject LLVM bitcode (non-finalized) by default, accepting only PNaCl
   # (finalized) bitcode. --allow-llvm-bitcode-input has to be passed
   # explicitly to override this.
   'ALLOW_LLVM_BITCODE_INPUT': '0',
 
   # Flags for pnacl-nativeld
   'LD_FLAGS': '${STATIC ? -static} ${SHARED ? -shared}',
 
@@ skipping 19 matching lines @@
   'LD_ARGS_IRT_SHIM': '-l:libpnacl_irt_shim.a',
   'LD_ARGS_IRT_SHIM_DUMMY': '-l:libpnacl_irt_shim_dummy.a',
 
   'LD_ARGS_ENTRY': '--entry=__pnacl_start',
 
   # TODO(eliben): remove SHARED stuff altogether
   'STATIC_CRTBEGIN' : '${ALLOW_CXX_EXCEPTIONS ? ' +
                       '-l:crtbegin_for_eh.o : -l:crtbegin.o}',
   'CRTBEGIN' : '${SHARED ? -l:crtbeginS.o : ${STATIC_CRTBEGIN}}',
   'CRTEND'   : '${SHARED ? -l:crtendS.o : -l:crtend.o}',
-  # static and dynamic newlib images link against the static libgcc_eh
-  'LIBGCC_EH': '${STATIC || NEWLIB_SHARED_EXPERIMENT && !SHARED ? ' +
-               '-l:libgcc_eh.a : ' +
-               # NOTE: libgcc_s.so drags in "glibc.so"
-               # TODO(robertm): provide a "better" libgcc_s.so
-               ' ${NEWLIB_SHARED_EXPERIMENT ? : -l:libgcc_s.so.1}}',
+  'LIBGCC_EH': '${STATIC ? -l:libgcc_eh.a : -l:libgcc_s.so.1}',
 
   'LD_ARGS_nostdlib': '-nostdlib ${ld_inputs}',
 
   # These are just the dependencies in the native link.
   'LD_ARGS_normal':
     '${CRTBEGIN} ${ld_inputs} ' +
     '${USE_IRT_SHIM ? ${LD_ARGS_IRT_SHIM} : ${LD_ARGS_IRT_SHIM_DUMMY}} ' +
     '${STATIC ? --start-group} ' +
     '${USE_DEFAULTLIBS ? ${DEFAULTLIBS}} ' +
     '${STATIC ? --end-group} ' +
@@ skipping 117 matching lines @@
   ( '-shared',         "env.set('SHARED', '1')"),
   ( '-nostdlib',       "env.set('STDLIB', '0')"),
 
   # Disables the default libraries.
   # This flag is needed for building libgcc_s.so.
   ( '-nodefaultlibs',  "env.set('USE_DEFAULTLIBS', '0')"),
 
   ( '--noirt',         "env.set('USE_IRT', '0')\n"
                        "env.append('LD_FLAGS', '--noirt')"),
   ( '--noirtshim',     "env.set('USE_IRT_SHIM', '0')"),
-  ( '--newlib-shared-experiment',  "env.set('NEWLIB_SHARED_EXPERIMENT', '1')"),
   ( '(--pnacl-nativeld=.+)', "env.append('LD_FLAGS', $0)"),
 
   # Allowing C++ exception handling causes a specific set of native objects to
   # get linked into the nexe.
   ( '--pnacl-allow-exceptions', "env.set('ALLOW_CXX_EXCEPTIONS', '1')"),
 
   ( '--allow-llvm-bitcode-input', "env.set('ALLOW_LLVM_BITCODE_INPUT', '1')"),
 
   ( '-rpath-link=(.+)', "env.append('LD_FLAGS', '-L'+$0)"),
 
@@ skipping 259 matching lines @@
 
 ADVANCED OPTIONS:
   -mattr=<+feat1,-feat2>  Toggle specific cpu features on and off.
   -mcpu=<cpu-name>        Target a specific cpu type.  Tunes code as well as
                           turns cpu features on and off.
   -S                      Generate native assembly only.
   -c                      Generate native object file only.
   --pnacl-sb              Use the translator which runs inside the NaCl sandbox.
   -O[0-3]                 Change translation-time optimization level.
 """