PNaCl driver: Add libgcc to mixed native/bitcode links

pnacl/driver/driver_env.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.
 #
 # IMPORTANT NOTE: If you make local mods to this file, you must run:
 #   %  pnacl/build.sh driver
 # in order for them to take effect in the scons build.  This command
 # updates the copy in the toolchain/ tree.
 
@@ skipping 32 matching lines @@
   'BASE_LIB'        : '${BASE}/lib',
   'BASE_USR_ARCH'   : '${BASE_USR_%BCLIB_ARCH%}',
   'BASE_USR_X8632'  : '${BASE}/usr-bc-x86-32',
   'BASE_USR_X8664'  : '${BASE}/usr-bc-x86-64',
   'BASE_USR_ARM'    : '${BASE}/usr-bc-arm',
   'BASE_LIB_ARCH'   : '${BASE_LIB_%BCLIB_ARCH%}',
   'BASE_LIB_X8632'  : '${BASE}/lib-bc-x86-32',
   'BASE_LIB_X8664'  : '${BASE}/lib-bc-x86-64',
   'BASE_LIB_ARM'    : '${BASE}/lib-bc-arm',
 
+  'LIBS_NATIVE_ARCH' : '${LIBS_NATIVE_%ARCH%}',
+  'LIBS_NATIVE_ARM' : '${BASE_LIB_NATIVE}arm',
+  'LIBS_NATIVE_ARM_NONSFI' : '${BASE_LIB_NATIVE}arm-nonsfi',
+  'LIBS_NATIVE_X8632' : '${BASE_LIB_NATIVE}x86-32',
+  'LIBS_NATIVE_X8632_NONSFI' : '${BASE_LIB_NATIVE}x86-32-nonsfi',
+  'LIBS_NATIVE_X8664' : '${BASE_LIB_NATIVE}x86-64',
+  'LIBS_NATIVE_MIPS32' : '${BASE_LIB_NATIVE}mips32',
+
   'BASE_LLVM_BIN'   : '${BASE_LLVM}/bin',
   'TRANSLATOR_BIN'  :
     '${BASE_TOOLCHAIN}/pnacl_translator/${STANDARD_ARCH}/bin',
 
   # TODO(pdox): Unify this with ARCH.
   'STANDARD_ARCH'       : '${STANDARD_ARCH_%ARCH%}',
   'STANDARD_ARCH_X8632' : 'i686',
   'STANDARD_ARCH_X8664' : 'x86_64',
   'STANDARD_ARCH_ARM'   : 'armv7',
   'STANDARD_ARCH_MIPS32': 'mips32',
@@ skipping 137 matching lines @@
   m = {}
   for ss in strset:
     m[s.find(ss, pos)] = ss
   if -1 in m:
     del m[-1]
   if len(m) == 0:
     return (None, len(s))
   pos = min(m)
   return (m[pos], pos)
 
+# Find the first instance of a terminating character, skipping over nested
+# brace expressions.
+def FindTerm(s, pos, terminators):
+  depth = 0
+  end = pos
+  for c in s[pos:]:
+    if c == '{':
+      depth += 1
+    elif depth > 0 and c == '}':
+      depth -= 1
+    else:
+      for t in terminators:
+        if s.find(t, end) == end:
+          return end
+    end += 1
+  return end
+
 class Environment(object):
   functions = {}
 
   @classmethod
   def register(cls, func):
     """ Register a function for use in the evaluator """
     cls.functions[func.__name__] = func
     return func
 
   def __init__(self):
@@ skipping 240 matching lines @@
       if varname not in self.data:
         ParseError(s, pos, i, "Undefined variable '%s'" % varname)
       vardata = self.data[varname]
       contents = self.eval(vardata)
       return (contents, i)
     else:
       # Ternary Mode
       (is_cond_true,i) = self.eval_bool_expr(s, pos, ['?']+terminators)
       assert(i < len(s) and s[i] == '?')
 
-      (if_true_expr, j) = self.eval_expr(s, i+1, [' : ']+terminators)
+      if is_cond_true:
+        (if_true_expr, j) = self.eval_expr(s, i+1, [' : ']+terminators)
+      else:
+        # Don't evaluate the expr (it won't be used), just find its end.
+        assert terminators[0] == '}'
+        j = FindTerm(s, i+1, [' : '] + terminators)
       if j == len(s):
         return ('', j) # Error one level up
 
       if s[j:j+3] == ' : ':
-        (if_false_expr,j) = self.eval_expr(s, j+3, terminators)
+        if not is_cond_true:
+          (if_false_expr,j) = self.eval_expr(s, j+3, terminators)
+        else:
+          # Don't evaluate the expr (it won't be used), just find its end.
+          assert terminators[0] == '}'
+          j = FindTerm(s, j + 3, terminators)
         if j == len(s):
           # This is an error condition one level up.
           return ('', j)
       else:
         if_false_expr = ''
 
       if is_cond_true:
         contents = if_true_expr.strip()
       else:
         contents = if_false_expr.strip()
@@ skipping 17 matching lines @@
 
 
 env = Environment()
 
 def override_env(meth_name, func):
   """Override a method in the global |env|, given the method name
   and the new function.
   """
   global env
   setattr(env, meth_name, types.MethodType(func, env, Environment))