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

src/untrusted/nacl/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')
 
 # NACL_GC_WRAP_SYSCALL uses ({...}) syntax.
 env.FilterOut(CCFLAGS=['-pedantic'])
@@ skipping 45 matching lines @@
     'unlink.c',
     'write.c',
 ]
 
 SRCS_NEWLIB_MISC = [
     'malloc.c',        # malloc wrapper
     'stacktrace.c',    # stack tracing for use with "-finstrument"
     'start.c',         # contains _start, preventing us from making this a .so
     'nacl_add_tp.c',
     'nacl_read_tp.c',
+    'pthread_initialize_minimal.c',
     'pthread_stubs.c', # weak version of __pthread_initialize
-]
-
-SRCS_NEWLIB_STATIC = [
-    'pthread_initialize_minimal.c',
     'tls.c',
 ]
 
-SRCS_NEWLIB_SHARED = [
-    'pthread_initialize_minimal_using_ldso.c',
-    'tls_using_ldso.c',
-]
 
 # used by both glibc and newlib
 SRCS_NACL_EXTENSIONS = [
     'gc_hooks.c',
     'nacl_irt.c',
     'nacl_tls_get.c',
     'nacl_tls_init.c',
     ]
 
 if env.Bit('nacl_glibc'):
   # For nacl-glibc, the standard interfaces are provided by glibc, so
   # we do not build them here.
   sources = SRCS_NACL_EXTENSIONS
 else:
   sources = SRCS_NACL_EXTENSIONS + SRCS_NEWLIB_SYSCALL + SRCS_NEWLIB_MISC
-  if env.Bit('pnacl_shared_newlib'):
-    sources += SRCS_NEWLIB_SHARED
-  else:
-    sources += SRCS_NEWLIB_STATIC
-    if env.Bit('target_arm') and not env.Bit('bitcode'):
-      sources.append('aeabi_read_tp.S')
+  if env.Bit('target_arm') and not env.Bit('bitcode'):
+    sources.append('aeabi_read_tp.S')
 
 # Do not make a shared version of libnacl.
 libnacl = env.ComponentLibrary('libnacl', sources)
 
 env.AddLibraryToSdk(libnacl)
 header_install = env.AddHeaderToSdk(['nacl_startup.h', 'nacl_thread.h'])
 env.Requires('libnacl', header_install)
 
 libnacl_dyncode = env.NaClSdkLibrary('libnacl_dyncode', ['dyncode.c'])
 env.AddLibraryToSdk(libnacl_dyncode)
@@ skipping 47 matching lines @@
   # the libnacl_sys_private one.  Putting everything important into a
   # single .o file avoids this scenario.
   private_combine = [env.ComponentObject(module, '%s.c' % module)
                      for module in ['gc_hooks_private',
                                     'sys_private']]
   sys_private.append(env.Command('combined_private${OBJSUFFIX}',
                                  private_combine,
                                  '${LD} -relocatable -o ${TARGET} ${SOURCES}'))
 
 env.ComponentLibrary('libnacl_sys_private', sys_private)