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

tools/cygprofile/patch_orderfile.py

 #!/usr/bin/python
 # Copyright 2013 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.
 
 """Patch an orderfile.
 
 Starting with a list of symbols in a binary and an orderfile (ordered list of
 symbols), matches the symbols in the orderfile and augments each symbol with the
 symbols residing at the same address (due to having identical code).
 
 Note: It is possible to have.
 - Several symbols mapping to the same offset in the binary.
 - Several offsets for a given symbol (because we strip the ".clone." suffix)
 
 TODO(lizeb): Since the suffix ".clone." is only used with -O3 that we don't
 currently use, simplify the logic by removing the suffix handling.
 
 The general pipeline is:
 1. Get the symbol infos (name, offset, size, section) from the binary
 2. Get the symbol names from the orderfile
 3. Find the orderfile symbol names in the symbols coming from the binary
 4. For each symbol found, get all the symbols at the same address
 5. Output them to an updated orderfile, with several different prefixes
 """
 
 import collections
 import logging
+import optparse
 import sys
 
 import symbol_extractor
 
 # Prefixes for the symbols. We strip them from the incoming symbols, and add
 # them back in the output file.
 _PREFIXES = ('.text.startup.', '.text.hot.', '.text.unlikely.', '.text.')
 
 
 def _RemoveClone(name):
@@ skipping 158 matching lines @@
   unique_outputs = set()
   for name in symbol_names:
     for prefix in _PREFIXES:
       linker_section = prefix + name
       if not linker_section in unique_outputs:
         output_file.write(linker_section + '\n')
         unique_outputs.add(linker_section)
 
 
 def main(argv):
+  parser = optparse.OptionParser()
+  parser.add_option('--target_arch', action='store', dest='arch',

[pasko, 2015/02/04 19:08:26]

please use --target-arch

[azarchs, 2015/02/05 09:40:02]

Done.

+                    default='arm',
+                    choices=['arm', 'arm64', 'x86', 'x86_64', 'x64', 'mips'],
+                    help='The target architecture for libchrome.so')
+  options, argv = parser.parse_args(argv)
   if len(argv) != 3:
     print 'Usage: %s <unpatched_orderfile> <libchrome.so>' % argv[0]

[pasko, 2015/02/04 19:08:26]

This has now changed, it would be better to use parser.print_help(), see:
https://docs.python.org/2/library/optparse.html#generating-help

[azarchs, 2015/02/05 09:40:02]

Done.

     return 1
   orderfile_filename = argv[1]
   binary_filename = argv[2]
+  symbol_extractor.SetArchitecture(options.arch)
   (offset_to_symbol_infos, name_to_symbol_infos) = _GroupSymbolInfosFromBinary(
       binary_filename)
   profiled_symbols = GetSymbolsFromOrderfile(orderfile_filename)
   expanded_symbols = _ExpandSymbols(
       profiled_symbols, name_to_symbol_infos, offset_to_symbol_infos)
   _PrintSymbolsWithPrefixes(expanded_symbols, sys.stdout)
   # The following is needed otherwise Gold only applies a partial sort.
   print '.text'    # gets methods not in a section, such as assembly
   print '.text.*'  # gets everything else
   return 0
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=logging.INFO)
   sys.exit(main(sys.argv))