PNaCl. Enables Unsandboxed nonsfi ARM32.

toolchain_build/pnacl_targetlibs.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.
 
 """Recipes for PNaCl target libs."""
 
 import fnmatch
 import os
 import sys
@@ skipping 612 matching lines @@
 
   When the commands are executed, temporary files are created in the current
   directory, and .o files are created in the out_dir directory.  If arch isn't
   among a whitelist, an empty list of commands is returned.
   """
   # LlcArchArgs contains arguments extracted from pnacl-translate.py.
   if arch == 'x86-32-linux':
     LlcArchArgs = [ '-mtriple=i686-linux-gnu', '-mcpu=pentium4m']
   elif arch == 'x86-32':
     LlcArchArgs = [ '-mtriple=i686-none-nacl-gnu', '-mcpu=pentium4m']
+  if arch == 'arm-linux':

[Jim Stichnoth, 2015/10/31 16:21:23]

elif ?

[John, 2015/10/31 17:22:24]

doh!

+    LlcArchArgs = [ '-mtriple=arm-linux-gnu', '-mcpu=cortex-a9']
+  elif arch == 'arm':
+    LlcArchArgs = [ '-mtriple=arm-none-nacl-gnu', '-mcpu=cortex-a9']
   else:
     return []
   return [
     command.Command([
         PnaclTool('clang'), '-O2',
         '-c', command.path.join('%(subzero_src)s', 'runtime', 'szrt.c'),
         '-o', 'szrt.tmp.bc']),
     command.Command([
         PnaclTool('opt'), '-pnacl-abi-simplify-preopt',
         '-pnacl-abi-simplify-postopt', '-pnaclabi-allow-debug-metadata',
@@ skipping 163 matching lines @@
                                'unwind-dw2-fde-glibc.o', arch, no_nacl_gcc),
               command.Command([PnaclTool('ar'), 'rc',
                                command.path.join('%(output)s', 'libgcc_eh.a'),
                                'unwind-dw2.o', 'unwind-dw2-fde-glibc.o']),
           ],
       },
     })
   return libs
 
 def UnsandboxedRuntime(arch, is_canonical):
+  prefix = {
+    'arm-linux': 'arm-linux-gnueabihf-',
+    'x86-32-linux': '',
+  }[arch]

[Jim Stichnoth, 2015/10/31 16:21:23]

This fails e.g. when arch='x86-32-mac'.  Maybe this should fall back to the
empty string when the key is not present?

Same for arch_cflags.

[John, 2015/10/31 17:22:24]

Done.

+  arch_cflags = {
+    'arm-linux': ['-mcpu=cortex-a9', '-D__arm_nonsfi_linux__'],
+    'x86-32-linux': ['-m32'],
+  }[arch]
+
   libs = {
       GSDJoin('unsandboxed_runtime', arch): {
           'type': TargetLibBuildType(is_canonical),
           'output_subdir': os.path.join('translator', arch, 'lib'),
           'dependencies': [ 'subzero_src', 'target_lib_compiler'],
           # This lib #includes
           # arbitrary stuff from native_client/src/{include,untrusted,trusted}
           'inputs': { 'support': os.path.join(NACL_DIR, 'src', 'nonsfi', 'irt'),
                       'untrusted': os.path.join(
                           NACL_DIR, 'src', 'untrusted', 'irt'),
                       'include': os.path.join(NACL_DIR, 'src'), },
           'commands': [
               # The NaCl headers insist on having a platform macro such as
               # NACL_LINUX defined, but src/nonsfi/irt_interfaces.c does not
               # itself use any of these macros, so defining NACL_LINUX here
               # even on non-Linux systems is OK.
               # TODO(dschuff): this include path breaks the input encapsulation
               # for build rules.
-              command.Command([
-                  'gcc', '-m32', '-O2', '-Wall', '-Werror',
-                  '-I%(top_srcdir)s/..', '-DNACL_LINUX=1', '-DDEFINE_MAIN',
+              command.Command([prefix + 'gcc'] + arch_cflags + ['-O2', '-Wall',
+                  '-Werror', '-I%(top_srcdir)s/..',
+                  '-DNACL_LINUX=1', '-DDEFINE_MAIN',
                   '-c', command.path.join('%(support)s', 'irt_interfaces.c'),
                   '-o', command.path.join('%(output)s', 'unsandboxed_irt.o')]),
-              command.Command([
-                  'gcc', '-m32', '-O2', '-Wall', '-Werror',
-                  '-I%(top_srcdir)s/..',
+              command.Command([prefix + 'gcc'] + arch_cflags + ['-O2', '-Wall',
+                  '-Werror', '-I%(top_srcdir)s/..',
                   '-c', command.path.join('%(support)s', 'irt_random.c'),
                   '-o', command.path.join('%(output)s', 'irt_random.o')]),
-              command.Command([
-                  'gcc', '-m32', '-O2', '-Wall', '-Werror',
-                  '-I%(top_srcdir)s/..',
+              command.Command([prefix + 'gcc'] + arch_cflags + ['-O2', '-Wall',
+                  '-Werror', '-I%(top_srcdir)s/..',
                   '-c', command.path.join('%(untrusted)s', 'irt_query_list.c'),
                   '-o', command.path.join('%(output)s', 'irt_query_list.o')]),
           ] + SubzeroRuntimeCommands(arch, '%(output)s'),
       },
   }
   return libs
 
 
 def SDKCompiler(arches):
   arch_packages = ([GSDJoin('newlib', arch) for arch in arches] +
@@ skipping 38 matching lines @@
                  'includedir=' +os.path.join('%(output)s',
                                              TripleFromArch(MultilibArch(arch)),
                                              'include'),
                  'libdir=' + os.path.join('%(output)s', MultilibLibDir(arch)),
                  'install'] + scons_flags,
                 cwd=NACL_DIR),
           ],
       }
   }
   return libs