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

tools/cygprofile/symbol_extractor.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.
 
 """Utilities to get and manipulate symbols from a binary."""
 
 import collections
 import os
 import re
 import subprocess
 import sys
 
 sys.path.insert(
     0, os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
                     'third_party', 'android_platform', 'development',
                     'scripts'))
 import symbol
 
 
-# TODO(lizeb): Change symbol.ARCH to the proper value when "arm" is no longer
-# the only possible value.
-_OBJDUMP_BINARY = symbol.ToolPath('objdump')
-
-
 SymbolInfo = collections.namedtuple('SymbolInfo', ('name', 'offset', 'size',
                                                    'section'))
 
+def SetArchitecture(arch):
+  """Set the architecture for binaries to be symbolized."""
+  symbol.ARCH = arch
+
 
 def _FromObjdumpLine(line):
   """Create a SymbolInfo by parsing a properly formatted objdump output line.
 
   Args:
     line: line from objdump
 
   Returns:
     An instance of SymbolInfo if the line represents a symbol, None otherwise.
   """
@@ skipping 35 matching lines @@
 
 def SymbolInfosFromBinary(binary_filename):
   """Runs objdump to get all the symbols from a binary.
 
   Args:
     binary_filename: path to the binary.
 
   Returns:
     A list of SymbolInfo from the binary.
   """
-  command = (_OBJDUMP_BINARY, '-t', '-w', binary_filename)
+  command = (symbol.ToolPath('objdump'), '-t', '-w', binary_filename)
   p = subprocess.Popen(command, shell=False, stdout=subprocess.PIPE)
   try:
     result = _SymbolInfosFromStream(p.stdout)
     return result
   finally:
     p.wait()
 
 
 def GroupSymbolInfosByOffset(symbol_infos):
   """Create a dict {offset: [symbol_info1, ...], ...}.
@@ skipping 16 matching lines @@
 def CreateNameToSymbolInfo(symbol_infos):
   """Create a dict {name: symbol_info, ...}.
 
   Args:
     symbol_infos: iterable of SymbolInfo instances
 
   Returns:
     a dict {name: symbol_info, ...}
   """
   return {symbol_info.name: symbol_info for symbol_info in symbol_infos}