create_nmf can now determine arch of nexe files

native_client_sdk/src/tools/create_nmf.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 from __future__ import with_statement
 
 import errno
 import optparse
 import os
@@ skipping 18 matching lines @@
     # Names returned by x86_64-nacl-objdump:
     'elf64-nacl': 'x86-64',
     'elf32-nacl': 'x86-32',
 }
 
 ARCH_LOCATION = {
     'x86-32': 'lib32',
     'x86-64': 'lib64',
 }
 
-NAME_ARCH_MAP = {
-    '32.nexe': 'x86-32',
-    '64.nexe': 'x86-64',
-    'arm.nexe': 'arm'
-}
-
 # These constants are used within nmf files.
 RUNNABLE_LD = 'runnable-ld.so'  # Name of the dynamic loader
 MAIN_NEXE = 'main.nexe'  # Name of entry point for execution
 PROGRAM_KEY = 'program'  # Key of the program section in an nmf file
 URL_KEY = 'url'  # Key of the url field for a particular file in an nmf file
 FILES_KEY = 'files'  # Key of the files section in an nmf file
 
 # The proper name of the dynamic linker, as kept in the IRT.  This is
 # excluded from the nmf file by convention.
 LD_NACL_MAP = {
@@ skipping 160 matching lines @@
     '''Collect the list of dependencies for the main_files
 
     Returns:
       A dict with key=filename and value=ArchFile of input files.
           Includes the input files as well, with arch filled in if absent.
           Example: { '/path/to/my.nexe': ArchFile(my.nexe),
                      '/path/to/libfoo.so': ArchFile(libfoo.so) }'''
     if self.needed:
       return self.needed
 
-    runnable = (self.toolchain != 'newlib' and self.toolchain != 'pnacl')

[binji, 2012/09/17 19:12:22]

what about pnacl...?

[Sam Clegg, 2012/09/18 17:48:22]

Done.

     DebugPrint('GetNeeded(%s)' % self.main_files)
-    if runnable:
-      examined = set()
-      all_files, unexamined = self.GleanFromObjdump(
-          dict([(f, None) for f in self.main_files]))
-      for name, arch_file in all_files.items():
-        arch_file.url = name
-        if unexamined:
-          unexamined.add('/'.join([arch_file.arch, RUNNABLE_LD]))
-      while unexamined:
-        files_to_examine = {}
-        for arch_name in unexamined:
-          arch, name = arch_name.split('/')
-          for path in self.FindLibsInPath(name):
-            files_to_examine.setdefault(path, set()).add(arch)
-        new_files, needed = self.GleanFromObjdump(files_to_examine)
-        all_files.update(new_files)
-        examined |= unexamined
-        unexamined = needed - examined
-      # With the runnable-ld.so scheme we have today, the proper name of
-      # the dynamic linker should be excluded from the list of files.
-      ldso = [LD_NACL_MAP[arch] for arch in set(FORMAT_ARCH_MAP.values())]
-      for name, arch_map in all_files.items():
-        if arch_map.name in ldso:
-          del all_files[name]
-      self.needed = all_files
-    else:
-      need = {}
-      for filename in self.main_files:
-        arch = filename.split('_')[-1]
-        arch = NAME_ARCH_MAP[arch]
-        url = os.path.split(filename)[1]
-        need[filename] = ArchFile(arch=arch, name=os.path.basename(filename),
-                                  path=filename, url=url)
-      self.needed = need
 
+    examined = set()
+    all_files, unexamined = self.GleanFromObjdump(
+        dict([(f, None) for f in self.main_files]))
+    for name, arch_file in all_files.items():
+      arch_file.url = name
+      if unexamined:
+        unexamined.add('/'.join([arch_file.arch, RUNNABLE_LD]))
+    while unexamined:
+      files_to_examine = {}
+      for arch_name in unexamined:
+        arch, name = arch_name.split('/')
+        for path in self.FindLibsInPath(name):
+          files_to_examine.setdefault(path, set()).add(arch)
+      new_files, needed = self.GleanFromObjdump(files_to_examine)
+      all_files.update(new_files)
+      examined |= unexamined
+      unexamined = needed - examined
+
+    # With the runnable-ld.so scheme we have today, the proper name of
+    # the dynamic linker should be excluded from the list of files.
+    ldso = [LD_NACL_MAP[arch] for arch in set(FORMAT_ARCH_MAP.values())]
+    for name, arch_map in all_files.items():
+      if arch_map.name in ldso:
+        del all_files[name]
+
+    self.needed = all_files
     return self.needed
 
   def StageDependencies(self, destination_dir):
     '''Copies over the dependencies into a given destination directory
 
     Each library will be put into a subdirectory that corresponds to the arch.
 
     Args:
       destination_dir: The destination directory for staging the dependencies
     '''
@@ skipping 173 matching lines @@
 
 
 # Invoke this file directly for simple testing.
 if __name__ == '__main__':
   try:
     rtn = Main(sys.argv[1:])
   except Error, e:
     print "%s: %s" % (os.path.basename(__file__), e)
     rtn = 1
   sys.exit(rtn)