[NaCl SDK] Fix create_nmf to include arm/glibc ELF loader

native_client_sdk/src/tools/lib/get_shared_deps.py

 # Copyright 2014 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.
 
 """Helper script to close over all transitive dependencies of a given .nexe
 executable.
 
 e.g. Given
 A -> B
 B -> C
 B -> D
 C -> E
 
 where "A -> B" means A depends on B, then GetNeeded(A) will return A, B, C, D
 and E.
 """
 
 import os
 import re
 import subprocess
 
 import elf
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 SDK_DIR = os.path.dirname(os.path.dirname(SCRIPT_DIR))
 
 NeededMatcher = re.compile('^ *NEEDED *([^ ]+)\n$')
 FormatMatcher = re.compile('^(.+):\\s*file format (.+)\n$')
 
-RUNNABLE_LD = 'runnable-ld.so'  # Name of the dynamic loader
+LOADER_X86 = 'runnable-ld.so'  # Name of the dynamic loader
+LOADER_ARM = 'elf_loader_arm.nexe'  # Name of the ARM dynamic loader
 
 OBJDUMP_ARCH_MAP = {
     # Names returned by Linux's objdump:
     'elf64-x86-64': 'x86-64',
     'elf32-i386': 'x86-32',
     'elf32-little': 'arm',
     'elf32-littlearm': 'arm',
     # Names returned by old x86_64-nacl-objdump:
     'elf64-nacl': 'x86-64',
     'elf32-nacl': 'x86-32',
@@ skipping 41 matching lines @@
   if dynamic:
     return _GetNeededDynamic(main_files, objdump, lib_path)
   else:
     return _GetNeededStatic(main_files)
 
 
 def _GetNeededDynamic(main_files, objdump, lib_path):
   examined = set()
   all_files, unexamined = GleanFromObjdump(main_files, None, objdump, lib_path)
   for arch in all_files.itervalues():
-    if unexamined and arch != 'arm':
-      unexamined.add((RUNNABLE_LD, arch))
+    if unexamined:
+      if arch == 'arm':
+        unexamined.add((LOADER_ARM, arch))
+      else:
+        unexamined.add((LOADER_X86, arch))
 
   while unexamined:
     files_to_examine = {}
 
     # Take all the currently unexamined files and group them
     # by architecture.
     for name, arch in unexamined:
       files_to_examine.setdefault(arch, []).append(name)
 
     # Call GleanFromObjdump() for each architecture.
@@ skipping 120 matching lines @@
     raise Error('cannot find library %s' % name)
   return files
 
 
 def _GetNeededStatic(main_files):
   needed = {}
   for filename in main_files:
     arch = elf.ParseElfHeader(filename)[0]
     needed[filename] = arch
   return needed