Resurrect Petr's 64-bit dynamic code modification CL:...

tests/dynamic_code_loading/nacl.scons

Index: tests/dynamic_code_loading/nacl.scons
===================================================================
--- tests/dynamic_code_loading/nacl.scons	(revision 4097)
+++ tests/dynamic_code_loading/nacl.scons	(working copy)
@@ -38,10 +38,10 @@
                       template_obj],
                      EXTRA_LIBS=['testrunner', 'srpc', 'pthread'])
 
-# Uncomment once the toolchain gets the new syscalls:
-#env.ComponentProgram('dynamic_modify_test.nexe',
-#                     ['dynamic_modify_test.c',
-#                      template_obj])
+env.ComponentProgram('dynamic_modify_test.nexe',
+                     ['dynamic_modify_test.c',
+                      template_obj],
+                     EXTRA_LIBS=['testrunner', 'srpc', 'pthread'])
 
 env.ComponentProgram('write_to_dyncode.nexe',
                      ['write_to_dyncode.c'])
@@ -80,16 +80,17 @@
         sel_ldr_flags=["-c"],
         command=[env.File('debug_mode_test.nexe')],
         ),
-# Uncomment once the toolchain gets the new syscalls:
-#   env.CommandSelLdrTestNacl(
-#       'dynamic_modify_test_disabled.out',
-#       command=[env.File('dynamic_modify_test.nexe')],
-#       ),
-#   env.CommandSelLdrTestNacl(
-#       'dynamic_modify_test_enabled.out',
-#       command=[env.File('dynamic_modify_test.nexe')],
-#       osenv='NACL_ALLOW_DYNCODE_REPLACEMENT=1',
-#       ),
+   env.CommandSelLdrTestNacl(
+       'dynamic_modify_test_disabled.out',
+       command=[env.File('dynamic_modify_test.nexe')],
+       sel_ldr_flags=['-E', 'NACL_SRPC_STANDALONE=1'],
+       ),
+   env.CommandSelLdrTestNacl(
+       'dynamic_modify_test_enabled.out',
+       command=[env.File('dynamic_modify_test.nexe')],
+       sel_ldr_flags=['-E', 'NACL_SRPC_STANDALONE=1'],
+       osenv='NACL_ALLOW_DYNCODE_REPLACEMENT=1',
+       ),
   ]
 
 # TODO(kcc): non-standard linking options confuse Valgrind debug info reader.