Remove some unused references to the pnacl-nativeld tool

src/trusted/service_runtime/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')
 
 # All tests below involve native assembler
 
 HALT_SLED_SIZE=32
 
 # Valgrind gets confused by these tests
 
 if env.IsRunningUnderValgrind():
   Return()
 
 # glibc linker script enforces gap; test needs to be updated to use
 # custom linker script in this case.
 if env.Bit('nacl_glibc'):
   Return()
 
 # TODO(dschuff): either re-enable this test after we have fully transitioned

[jvoung (off chromium), 2014/06/12 22:45:58]

Should this not be a TODO() then?

[Mark Seaborn, 2014/06/13 00:06:44]

I left it as a TODO because one of the options was "remove all pnacl-specific
stuff below and in the asm files", and I didn't do that fully.

I can do that if you insist (and go through the asm files to clean them up), but
it might be better to spend the time to rewrite the tests to be independent of a
linker.  But this is getting into yak-shave territory. :-)

(I initially just wanted to make pnacl-nativeld private so that I can refactor
it to make it easier to change.)

[jvoung (off chromium), 2014/06/13 01:01:51]

Okay I see -- this is fine.

Usually, the linker will leave plenty of space for the IRT so these tests are
not a high priority thing anymore.  The only case that could be worrying is
generating the pnacl-llc.nexe/ld.nexe which don't use the IRT. Otherwise, the
service runtime's behavior is covered by gcc.

 # to new-style layout and ironed out any potential gold issues, or remove
 # all pnacl-specific stuff below and in the asm files.
+#
+# It is unlikely that we will re-enable these tests under the PNaCl
+# toolchain, because they depend on invoking "ld" directly, which is not
+# really a supported use of the PNaCl toolchain.  These tests are too
+# dependent on the layout that the linker happens to produce, so the tests
+# are likely to break or become ineffective if the linker is changed.
 if env.Bit('bitcode'):
   Return()
 
 # ----------------------------------------------------------
 # Tests that require a NaCl module
 # ----------------------------------------------------------
 
 if env.Bit('target_x86_32'):
   nacl_text_pad_asm = 'arch/x86_32/nacl_text_pad_test.S'
 elif env.Bit('target_x86_64'):
   nacl_text_pad_asm = 'arch/x86_64/nacl_text_pad_test.S'
 elif env.Bit('target_arm'):
   nacl_text_pad_asm = 'arch/arm/nacl_text_pad_test.S'
 elif env.Bit('target_mips32'):
   nacl_text_pad_asm = 'arch/mips/nacl_text_pad_test.S'

[jvoung (off chromium), 2014/06/12 22:45:58]

mips might end up being untested then (if the only untrusted toolchain is for
bitcode=1)

[Mark Seaborn, 2014/06/13 00:06:44]

Yes, arch/mips/nacl_text_pad_test.S is definitely unused at the moment, without
this change (but then the MIPS folks haven't enabled tests on the bots yet).

[jvoung (off chromium), 2014/06/13 01:01:51]

Okay, I guess there is already the early Return() from the if
env.Bit('bitcode'), so this was already the case.

 else:
   raise Exception('unknown architecture')
 
 def NewAsmEnv(env, defines, rodata_address, rwdata_address):
-
   asm_env = env.Clone()
   # NOTE(robertm): convert this to pure C code so that most of this
   # special handling can be eliminated
-  if asm_env.Bit('bitcode'):
-    asm_env.PNaClForceNative()
-    asm_env.Append(ASPPFLAGS=['-DPNACL_AS=1'])
-    # On Windows, assembly pre-preprocessing uses $CCCOM instead of $ASPPCOM,
-    # so we need to set PNACL_AS=1 in CCFLAGS as well.
-    asm_env.Append(CCFLAGS=['-DPNACL_AS=1'])
-
   link_cmd = ('${LD} -static -e _start ${TEXT_START} ${RO_START} ${RW_START}' +
                 ' -o ${TARGET} ${SOURCES}')
 
   if env.Bit('target_x86_32'):
     link_cmd += ' -melf_i386_nacl'
   elif env.Bit('target_x86_64'):
     link_cmd += ' -melf_x86_64_nacl'
   elif env.Bit('target_arm'):
     link_cmd += ' -marmelf_nacl'
   elif env.Bit('target_mips32'):
@@ skipping 119 matching lines @@
         expected_exit_status = 'naclabort_coverage'
       else:
         expected_exit_status = 'trusted_sigabrt'
     else:
       expected_exit_status = 0
 
     node = env.CommandSelLdrTestNacl(base_name + '.out', nexe,
                                      exit_status=expected_exit_status)
 
     env.AddNodeToTestSuite(node,
-                           ['small_tests', 'sel_ldr_sled_tests',
-                            'nonpexe_tests'],
+                           ['small_tests', 'sel_ldr_sled_tests'],
                            'run_' + base_name)