PNaCl Dynamic Linking: Added portable dependencies to shared objects.

pnacl/driver/pnacl-ld.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 from driver_tools import ArchMerge, DriverChain, GetArch, \
     ParseArgs, ParseTriple, RunDriver, RunWithEnv, SetArch, \
     SetExecutableMode, TempNameGen, UnrecognizedOption
 from driver_env import env
 from driver_log import Log
 import filetype
 import ldtools
+import os
 import pathtools
 
 EXTRA_ENV = {
   'ALLOW_NATIVE': '0', # Allow LD args which will change the behavior
                        # of native linking. This must be accompanied by
                        # -arch to produce a .nexe.
   'USE_IRT': '1',  # Use stable IRT interfaces.
 
   'INPUTS'   : '',
   'OUTPUT'   : '',
@@ skipping 315 matching lines @@
   inputs = ldtools.ExpandInputs(inputs,
                                 env.get('SEARCH_DIRS'),
                                 env.getbool('STATIC'),
                                 # Once all glibc bitcode link is purely
                                 # bitcode (e.g., even libc_nonshared.a)
                                 # we may be able to restrict this more.
                                 # This is also currently used by
                                 # pnacl_generate_pexe=0 with glibc,
                                 # for user libraries.
                                 ldtools.LibraryTypes.ANY)
+  (plls, inputs) = FilterPlls(inputs)
+  plls = [os.path.basename(pll) for pll in plls]
+
+  if not env.getbool('SHARED'):
+    assert(plls == [])
 
   # Make sure the inputs have matching arch.
   CheckInputsArch(inputs)
 
   regular_inputs, native_objects = SplitLinkLine(inputs)
 
   if env.getbool('RELOCATABLE'):
     bitcode_type = 'po'
     native_type = 'o'
   else:
@@ skipping 39 matching lines @@
       pre_simplify_shared = [
         # The following is a subset of "-pnacl-abi-simplify-preopt".  We don't
         # want to run the full "-pnacl-abi-simplify-preopt" because it
         # internalizes symbols that we want to export via "-convert-to-pso".
         '-nacl-global-cleanup',
         '-expand-varargs',
         '-rewrite-pnacl-library-calls',
         '-rewrite-llvm-intrinsic-calls',
         '-convert-to-pso',
       ]
+
+      # ConvertToPso takes a list of comma-separated PLL dependencies as an
+      # argument.
+      if plls != []:
+        pre_simplify_shared += ['-convert-to-pso-deps=' + ','.join(plls)]
       opt_args.append(pre_simplify_shared)
       # Post-opt is required, since '-convert-to-pso' adds metadata which must
       # be simplified before finalization. Additionally, all functions must be
       # simplified in the post-opt passes.
       abi_simplify = True
     elif abi_simplify:
       pre_simplify = ['-pnacl-abi-simplify-preopt']
       if env.getone('CXX_EH_MODE') == 'sjlj':
         pre_simplify += ['-enable-pnacl-sjlj-eh']
       else:
@@ skipping 87 matching lines @@
   result_libs = []
   for user_lib in user_libs:
     if user_lib in public_libs:
       result_libs.append(private_lib_for(user_lib))
       if can_coexist(user_lib):
         result_libs.append(user_lib)
     else:
       result_libs.append(user_lib)
   return result_libs
 
+def FilterPlls(inputs):
+  """ Split the input list into PLLs and other objects (.pll, other)
+  """
+  pll = []

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

Nit: "plls" plural?

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

Done.

+  other = []
+
+  for f in inputs:
+    if ldtools.IsFlag(f):

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

How about simplifying to "if ldtools.IsFlag(f) and not filetype.IsPll(f)"?

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

I'm pretty sure you mean "or", not "and". Updating to that version.

+      other.append(f)
+    elif filetype.IsPll(f):
+      pll.append(f)
+    else:
+      other.append(f)
+  return (pll, other)
+
 def SplitLinkLine(inputs):
   """ Split the input list into bitcode and native objects (.o, .a)
   """
   normal = []
   native = []
   # Group flags need special handling because they need to go into the right
   # list based on the type of the inputs in the group. If the group has both
   # native and bitcode files (which is unfortunately the case for
   # irt_browser_lib) then the group flags need to go in both lists.
   if '--start-group' in inputs:
@@ skipping 100 matching lines @@
   -O<opt-level>               Optimize output file
   -M, --print-map             Print map file on standard output
   --whole-archive             Include all objects from following archives
   --no-whole-archive          Turn off --whole-archive
   -s, --strip-all             Strip all symbols
   -S, --strip-debug           Strip debugging symbols
   -u SYM, --undefined=SYM     Start with undefined reference to SYM
 
   -help | -h                  Output this help.
 """