PNaCl Dynamic Linking: Added portable dependencies to shared objects.

pnacl/driver/filetype.py

 #!/usr/bin/python
 # Copyright (c) 2013 The Native Client 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 for determining (and overriding) the types of files
 """
 
 import os
 
@@ skipping 49 matching lines @@
 
 @SimpleCache
 def IsNativeObject(filename):
   return FileType(filename) == 'o'
 
 @SimpleCache
 def IsNativeDSO(filename):
   return FileType(filename) == 'so'
 
 @SimpleCache
+def IsPll(filename):
+  return FileType(filename) == 'pll'
+
+@SimpleCache
 def GetBitcodeMagic(filename):
   fp = driver_log.DriverOpen(filename, 'rb')
   header = fp.read(4)
   driver_log.DriverClose(fp)
   return header
 
 def IsLLVMBitcodeWrapperHeader(data):
   return data[:4] == LLVM_WRAPPER_MAGIC
 
 @SimpleCache
@@ skipping 262 matching lines @@
 
   if elftools.IsELF(filename):
     return GetELFType(filename)
 
   # If this is LLVM bitcode, we don't have a good way of determining if it
   # is an object file or a non-finalized program, so just say 'po' for now.
   if IsLLVMBitcode(filename):
     return 'po'
 
   if IsPNaClBitcode(filename):
+    # Although this file looks like a native ".so", it actually is in a

[Mark Seaborn, 2016/03/30 23:24:57]

"looks like" -> "has the same extension as"?

[Sean Klein, 2016/04/01 23:12:24]

Done.

+    # portable format and should be handled slightly differently.
+    if ext == 'so':
+      return 'pll'
     return 'pexe'
 
   if IsLinkerScript(filename):
     return 'ldscript'
 
   # Use the file extension if it is recognized
   if ext in ExtensionMap:
     return ExtensionMap[ext]
 
   driver_log.Log.Fatal('%s: Unrecognized file type', filename)
 
 # Map from GCC's -x file types and this driver's file types.
 FILE_TYPE_MAP = {
     'c'                 : 'c',
     'c++'               : 'c++',
     'assembler'         : 's',
     'assembler-with-cpp': 'S',
     'c-header'          : 'c-header',
     'c++-header'        : 'c++-header',
 }
 FILE_TYPE_MAP_REVERSE = dict([reversed(_tmp) for _tmp in FILE_TYPE_MAP.items()])
 
 def FileTypeToGCCType(filetype):
   return FILE_TYPE_MAP_REVERSE[filetype]
 
 def GCCTypeToFileType(gcctype):
   if gcctype not in FILE_TYPE_MAP:
     driver_log.Log.Fatal('language "%s" not recognized' % gcctype)
   return FILE_TYPE_MAP[gcctype]