Fix a bunch of issues blocking 64-bit orderfile generation.

tools/cygprofile/cyglog_to_orderfile.py

 #!/usr/bin/python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Symbolizes a log file produced by cyprofile instrumentation.
 
 Given a log file and the binary being profiled, creates an orderfile.
 """
 
@@ skipping 202 matching lines @@
     except SymbolNotFoundException:
       symbol_not_found_warnings.Write(
           'Did not find function in binary. offset: ' + hex(offset))
       success = False
   unknown_symbol_warnings.WriteEnd('no known section for symbol.')
   symbol_not_found_warnings.WriteEnd('symbol not found in the binary.')
   return success
 
 
 def main():
-  if len(sys.argv) != 4:
+  parser = optparse.OptionParser()
+  parser.add_option('--target_arch', action='store', type='string',

[Benoit L, 2015/02/04 17:12:57]

nit: maybe use "choice" here to limit the values to what we know works.

[azarchs, 2015/02/04 17:49:54]

Done.

+                    dest='arch', default='arm',
+                    help='The target architecture for libchrome.so')
+  options, argv = parser.parse_args(sys.argv)
+  if len(argv) != 4:
     logging.error('Usage: cyglog_to_orderfile.py <merged_cyglog> '
                   '<library> <output_filename>')
     return 1
-  (log_filename, lib_filename, output_filename) = sys.argv[1:]
+  (log_filename, lib_filename, output_filename) = argv[1:]
+  symbol_extractor.SetArchitecture(options.arch)
 
   obj_dir = os.path.abspath(os.path.join(
       os.path.dirname(lib_filename), '../obj'))
 
   log_file_lines = map(string.rstrip, open(log_filename).readlines())
   offsets = _ParseLogLines(log_file_lines)
   _WarnAboutDuplicates(offsets)
 
   offset_to_symbol_infos = _GroupLibrarySymbolInfosByOffset(lib_filename)
   symbol_to_section_map = _GetSymbolToSectionMapFromObjectFiles(obj_dir)
@@ skipping 15 matching lines @@
       output_file.close()
     if temp_filename:
       os.remove(temp_filename)
 
   return 0 if success else 1
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=logging.INFO)
   sys.exit(main())