Simplify check_tls on ARM, now that llvm emits mapping symbols.

src/untrusted/irt/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')
 
 # TODO(mseaborn): Enable -Wstrict-prototypes here.  Currently
 # dlmalloc/malloc.c does not build with this warning.
@@ skipping 126 matching lines @@
 # ensure all TLS accesses use a call to __nacl_read_tp (or __aeabi_read_tp
 # for ARM), which the IRT code overrides to segregate IRT-private TLS
 # from user TLS.
 if ((env.Bit('build_arm') or env.Bit('build_x86_32'))
     # Do not try to run OBJDUMP if 'built_elsewhere', since that *might*
     # mean that a toolchain is not even present. E.g., the arm buildbots
     # do not have the pnacl toolchain, since that is built for x86 hosts.
     and not env.Bit('built_elsewhere')):
   check_tls_arch = '${TARGET_FULLARCH}'
   if env.Bit('build_arm'):
-    if env.Bit('bitcode'):
-      check_tls_arch = 'arm-pnacl'
-    else:
-      check_tls_arch = 'arm-gcc'
+    check_tls_arch = 'arm'
   node = env.CommandTest('irt_core_tls_test.out',
                          ['${PYTHON}', env.File('check_tls.py'),
                           check_tls_arch, '${OBJDUMP}', irt_core_library],
                          # don't run ${PYTHON} under the emulator.
                          direct_emulation=False)
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test')