sanitizer_common: Change gen_dynamic_list.py to take a -o argument instead of writing to stdout.

[pcc]

Summary

This makes the script a little more gn friendly; gn does not support
redirecting the output of a script.

[serge-sans-paille]

LGTM. I would have kept the default behavior of printing to stdout if -o is not specified, but it's not critical.

cmake/Modules/SanitizerUtils.cmake

foreach(arch ${ARG_ARCHS})
     set(stamp ${CMAKE_CURRENT_BINARY_DIR}/${target_name}.syms-stamp)
     set(extra_args)
     foreach(arg ${ARG_EXTRA})
       list(APPEND extra_args "--extra" ${arg})
     endforeach()
     add_custom_command(OUTPUT ${stamp}
       COMMAND ${PYTHON_EXECUTABLE}
         ${SANITIZER_GEN_DYNAMIC_LIST} ${extra_args} $<TARGET_FILE:${target_name}>
-        > $<TARGET_FILE:${target_name}>.syms
+        -o $<TARGET_FILE:${target_name}>.syms
       COMMAND ${CMAKE_COMMAND} -E touch ${stamp}
       DEPENDS ${target_name} ${SANITIZER_GEN_DYNAMIC_LIST} ${ARG_EXTRA}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       COMMENT "Generating exported symbols for ${target_name}"
       VERBATIM)
     add_custom_target(${target_name}-symbols ALL
       DEPENDS ${stamp}
       SOURCES ${SANITIZER_GEN_DYNAMIC_LIST} ${ARG_EXTRA})
foreach(arg ${ARG_EXTRA})
     list(APPEND args "--extra" ${arg})
   endforeach()
   foreach(arg ${ARG_LIBS})
     list(APPEND args "$<TARGET_FILE:${arg}>")
   endforeach()
   add_custom_command(OUTPUT ${vers}
     COMMAND ${PYTHON_EXECUTABLE}
       ${SANITIZER_GEN_DYNAMIC_LIST} --version-list ${args}
-      > ${vers}
+      -o ${vers}
     DEPENDS ${SANITIZER_GEN_DYNAMIC_LIST} ${ARG_EXTRA} ${ARG_LIBS}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Generating version list for ${name}"
     VERBATIM)
 
   add_custom_target(${name}-version-list ALL
     DEPENDS ${vers})
 endmacro()

lib/sanitizer_common/scripts/gen_dynamic_list.py

 #!/usr/bin/env python
 #===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===#
 #
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #
 #===------------------------------------------------------------------------===#
 #
 # Generates the list of functions that should be exported from sanitizer
 # runtimes. The output format is recognized by --dynamic-list linker option.
 # Usage:
 #   gen_dynamic_list.py libclang_rt.*san*.a [ files ... ]
 #
 #===------------------------------------------------------------------------===#
+from __future__ import print_function
 import argparse
 import os
 import re
 import subprocess
 import sys
 import platform
 
 new_delete = set([
if len(cols) == 3 and cols[1] in func_symbols :
       functions.append(cols[2])
   return functions
 
 def main(argv):
   parser = argparse.ArgumentParser()
   parser.add_argument('--version-list', action='store_true')
   parser.add_argument('--extra', default=[], action='append')
   parser.add_argument('libraries', default=[], nargs='+')
+  parser.add_argument('-o', '--output', required=True)
   args = parser.parse_args()
 
   result = []
 
   all_functions = []
   for library in args.libraries:
     all_functions.extend(get_global_functions(library))
   function_set = set(all_functions)
if re.match('__sanitizer_(.*)', func):
       result.append(func)
 
   # Additional exported functions from files.
   for fname in args.extra:
     f = open(fname, 'r')
     for line in f:
       result.append(line.rstrip())
   # Print the resulting list in the format recognized by ld.
-  print('{')
+  with open(args.output, 'w') as f:
+    print('{', file=f)
     if args.version_list:
-    print('global:')
+      print('global:', file=f)
     result.sort()
-  for f in result:
-    print(u'  %s;' % f)
+    for sym in result:
+      print(u'  %s;' % sym, file=f)
     if args.version_list:
-    print('local:')
-    print('  *;')
-  print('};')
+      print('local:', file=f)
+      print('  *;', file=f)
+    print('};', file=f)
 
 if __name__ == '__main__':
   main(sys.argv)