Add rules for building ARM newlib nonsfi nexe with PNaCl toolchain.

build/untrusted.gypi

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'variables': {
       # Enable -Werror by default, but put it in a variable so it can
       # be optionally disabled.
       'werror%': '-Werror',
@@ skipping 67 matching lines @@
           'build_irt': 0,
           'build_nonsfi_helper': 0,
           'disable_glibc%': 0,
           'disable_bionic%': 1,
           'extra_args': [],
           'enable_x86_32': 1,
           'enable_x86_64': 1,
           'enable_arm': 0,
           'enable_mips': 0,
           'enable_x86_32_nonsfi': 0,
+          'enable_arm_nonsfi': 0,
           'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc',
           'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_newlib',
           'tc_lib_dir_newlib32': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32',
           'tc_lib_dir_newlib64': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64',
           'tc_lib_dir_glibc32': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
           'tc_lib_dir_glibc64': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
           'tc_lib_dir_irt32': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/lib32',
           'tc_lib_dir_irt64': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/lib64',
           'tc_lib_dir_nonsfi_helper32': '<(SHARED_INTERMEDIATE_DIR)/tc_nonsfi_helper/lib32',
           'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
@@ skipping 36 matching lines @@
           'build_irt': 0,
           'build_nonsfi_helper': 0,
           'disable_glibc%': 1,
           'disable_bionic%': 1,
           'extra_args': [],
           'enable_x86_32': 0,
           'enable_x86_64': 0,
           'enable_arm': 1,
           'enable_mips': 0,
           'enable_x86_32_nonsfi': 0,
+          'enable_arm_nonsfi': 0,
           'extra_deps': [],
           'extra_deps_newlib_arm': [],
+          'extra_deps_newlib_arm_nonsfi': [],
           'extra_deps_bionic_arm': [],
           'native_sources': [],
           'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_arm_glibc',
           'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib',
           'tc_lib_dir_bionic_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/libarm',
           'tc_lib_dir_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
           'tc_lib_dir_irt_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libarm',
+          'tc_lib_dir_nonsfi_helper_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_nonsfi_helper/libarm',
           'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
           'tc_include_dir_bionic': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/include',
           'include_dirs': ['<(DEPTH)'],
           'defines': [
             '<@(nacl_default_defines)',
             'NACL_BUILD_ARCH=arm',
            ],
            'sources': [],
            'link_flags': [],
          },
@@ skipping 16 matching lines @@
           'build_irt': 0,
           'build_nonsfi_helper': 0,
           'disable_glibc%': 1,
           'disable_bionic%': 1,
           'extra_args': [],
           'enable_x86_32': 0,
           'enable_x86_64': 0,
           'enable_arm': 0,
           'enable_mips': 1,
           'enable_x86_32_nonsfi': 0,
+          'enable_arm_nonsfi': 0,
           'extra_deps': [],
           'extra_deps_newlib_mips': [],
           'native_sources': [],
           'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_mips_glibc',
           'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_mips_newlib',
           'tc_lib_dir_newlib_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libmips',
           'tc_lib_dir_irt_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libmips',
           'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include',
           'include_dirs': ['<(DEPTH)'],
           'defines': [
@@ skipping 648 matching lines @@
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags=-Wno-unused-local-typedefs -Wno-psabi ^(gcc_irt_compile_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_irt_arm) ^(gcc_irt_link_flags) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
+

[Mark Seaborn, 2014/10/30 17:20:49]

Nit: remove empty line to match the style in the rest of the file

[mazda, 2014/10/31 02:30:42]

Done.

+          # ARM helper library build or PNaCl PPAPI shim for nonsfi
+          # build.
+          ['nlib_target!="" and (build_nonsfi_helper!=0 or (pnacl_native_biased!=0 and enable_arm_nonsfi==1))', {
+            'variables': {
+              'tool_name': 'nonsfi_helper',
+              'out_newlib_arm_nonsfi%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/libarm/>(nlib_target)',
+              'objdir_newlib_arm_nonsfi%': '>(INTERMEDIATE_DIR)/<(tool_name)-arm-nonsfi/>(_target_name)',
+            },
+            'actions': [
+              {
+                'action_name': 'build nonsfi_helper arm nlib',
+                'variables': {
+                  'source_list_newlib_arm_nonsfi%': '^|(<(tool_name)-arm-nonsfi.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
+                },
+                'msvs_cygwin_shell': 0,
+                'description': 'building >(out_newlib_arm_nonsfi)',
+                'inputs': [
+                  '<(DEPTH)/native_client/build/build_nexe.py',
+                  '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
+                  '>@(extra_deps)',
+                  '>@(extra_deps_newlib_arm_nonsfi)',
+                  '^(source_list_newlib_arm_nonsfi)',
+                  '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_arm_newlib/stamp.prep',
+                ],
+                'outputs': ['>(out_newlib_arm_nonsfi)'],
+                'action': [
+                  '<@(common_args)',
+                  '>@(extra_args)',
+                  '--arch', 'arm-nonsfi',
+                  '--build', 'newlib_nlib_pnacl',
+                  '--name', '>(out_newlib_arm_nonsfi)',
+                  '--objdir', '>(objdir_newlib_arm_nonsfi)',
+                  '--include-dirs=>(tc_include_dir_newlib) <(DEPTH)/native_client/src/public/linux_syscalls ^(include_dirs) >(_include_dirs)',
+                  '--compile_flags=--target=armv7-unknown-nacl-gnueabi --pnacl-bias=arm-nonsfi --pnacl-allow-translate --pnacl-allow-native -arch arm-nonsfi -mfloat-abi=hard ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
+                  '--gomadir', '<(gomadir)',
+                  '--defines=^(defines) >(_defines)',
+                  '--link_flags=-B>(tc_lib_dir_nonsfi_helper_arm) ^(link_flags) >(_link_flags)',
+                  '--source-list=^(source_list_newlib_arm_nonsfi)',
+                ],
+              },
+            ],
+          }],
+

[Mark Seaborn, 2014/10/30 17:20:49]

ditto

[mazda, 2014/10/31 02:30:42]

Done.

         ], # end target_conditions for arm newlib (nexe/nlib)
       },
     }], # end target_arch = arm
     ['target_arch=="mipsel"', {
       'target_defaults': {
         'target_conditions': [
           # mips newlib nexe action
           ['nexe_target!="" and build_newlib!=0', {
             'variables': {
                'tool_name': 'newlib',
@@ skipping 471 matching lines @@
     'target_conditions': [
       # pnacl actions for building pexes and translating them
       ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0 '
        'and pnacl_native_biased==0', {
          'variables': {
            'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
            'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
            'out_pnacl_newlib_arm_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_arm.nexe',
            'out_pnacl_newlib_mips_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_mips32.nexe',
            'out_pnacl_newlib_x86_32_nonsfi_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe',
+           'out_pnacl_newlib_arm_nonsfi_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_arm_nonsfi.nexe',
            'tool_name': 'pnacl_newlib',
            'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',
            'out_pnacl_newlib%': '<(PRODUCT_DIR)/>(nexe_target)_newlib.pexe',
            'objdir_pnacl_newlib%': '>(INTERMEDIATE_DIR)/<(tool_name)/>(_target_name)',
            'link_flags': [
              '-O3',
            ],
            'translate_flags': [],
          },
          'actions': [
@@ skipping 112 matching lines @@
                'action' : [
                  '<@(common_args)',
                  '--arch', 'arm',
                  '--build', 'newlib_translate',
                  '--name', '>(out_pnacl_newlib_arm_nexe)',
                  '--link_flags=^(translate_flags) >(translate_flags) -Wl,-L>(tc_lib_dir_pnacl_translate)/lib-arm',
                  '>(out_pnacl_newlib)',
                ],
              }],
            }],
+           [ 'enable_arm_nonsfi!=0 and translate_pexe_with_build!=0', {
+             'actions': [{
+               'action_name': 'translate newlib pexe to ARM-nonsfi nexe',
+               'msvs_cygwin_shell': 0,
+               'description': 'translating >(out_pnacl_newlib_arm_nonsfi_nexe)',
+               'inputs': [
+                 # Having this in the input somehow causes devenv warnings
+                 # when building pnacl browser tests.
+                 # '<(DEPTH)/native_client/build/build_nexe.py',
+                 '>(out_pnacl_newlib)',
+               ],
+               'outputs': [ '>(out_pnacl_newlib_arm_nonsfi_nexe)' ],
+               'action' : [
+                 '<@(common_args)',
+                 '--arch', 'arm-nonsfi',
+                 '--build', 'newlib_translate',
+                 '--name', '>(out_pnacl_newlib_arm_nonsfi_nexe)',
+                 '--link_flags=^(translate_flags) >(translate_flags) -Wl,-L>(tc_lib_dir_pnacl_translate)/lib-arm-nonsfi',
+                 '>(out_pnacl_newlib)',
+               ],
+             }],
+           }],
            [ 'enable_mips!=0 and translate_pexe_with_build!=0', {
              'actions': [{
                'action_name': 'translate newlib pexe to MIPS nexe',
                'msvs_cygwin_shell': 0,
                'description': 'translating >(out_pnacl_newlib_mips_nexe)',
                'inputs': [
                  # Having this in the input somehow causes devenv warnings
                  # when building pnacl browser tests.
                  # '<(DEPTH)/native_client/build/build_nexe.py',
                  '>(out_pnacl_newlib)',
@@ skipping 235 matching lines @@
                 ],
               },
             ],
           }],
         ],
       }], # end MIPS
       # end pnacl actions for building ABI-biased native libraries
     ], # end conditions for pnacl biased nlib
   },
 }