Activate IRT building on ARM for NaCl.

chrome/nacl.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.
 
 {
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
     },
     'target_conditions': [
@@ skipping 117 matching lines @@
                   'inputs': [
                     '<!@(<(irt_inputs_cmd) --platform=x86-64)',
                   ],
                   'outputs': ['<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'],
                   'action': [
                     '<@(irt_build_cmd)', '--platform', 'x86-64',
                   ],
                 },
               ],
             }],
+            ['OS!="win" and target_arch=="arm"', {

[noelallen_use_chromium, 2011/10/21 00:16:51]

Inconsistent check here.  You check for win, but in the previous scons you
didn't.

[jasonwkim, 2011/10/21 20:16:56]

I am just following the established pattern. First case was 
OS == win and arch== x86.
The rest of the cases including what I added are all 

OS != win and arch == x86/arm ...

+              'actions': [
+                {
+                  'action_name': 'nacl_irt',
+                  'message': 'Building NaCl IRT',
+                  'inputs': [
+                    '<!@(<(irt_inputs_cmd) --platform=arm)',
+                  ],
+                  'outputs': ['<(PRODUCT_DIR)/nacl_ir.nexe'],
+                  'action': [
+                    '<@(irt_build_cmd)', '--platform', 'arm',
+                  ],
+                },
+              ],
+            }],
           ],
         },
       ],
       'conditions': [
         ['OS=="win"', {
           'targets': [
             {
               'target_name': 'nacl_win64',
               'type': 'static_library',
               'variables': {
@@ skipping 157 matching lines @@
                      '../tools/ld_bfd/ld',
                   ],
                   'outputs': [
                     '<(PRODUCT_DIR)/nacl_helper_bootstrap_raw',
                   ],
                   'message': 'Linking nacl_helper_bootstrap_raw',
                   'conditions': [
                     ['target_arch=="x64"', {
                       'variables': {
                         'linker_emulation': 'elf_x86_64',
+                        'bootstrap_extra_lib': '',
                       }
                     }],
                     ['target_arch=="ia32"', {
                       'variables': {
                         'linker_emulation': 'elf_i386',
+                        'bootstrap_extra_lib': '',
                       }
                     }],
                     ['target_arch=="arm"', {
                       'variables': {
                         'linker_emulation': 'armelf_linux_eabi',
+                        # ARM requires linking against libc due to ABI dependencies on
+                        # memset
+                        'bootstrap_extra_lib' : "${SYSROOT}/usr/lib/libc.a",
                       }
                     }],
                   ],
                   'action': ['../tools/ld_bfd/ld',
                              '-m', '<(linker_emulation)',
                              '--build-id',
                              # This program is (almost) entirely standalone.  It
                              # has its own startup code, so no crt1.o for it.  It is
                              # statically linked, and on x86 it does not use
                              # libc at all.  However, on ARM it needs a few (safe)
                              # things from libc.
                              '-static',
                              # Link with custom linker script for special layout.
                              '--script=<(linker_script)',
                              '-o', '<@(_outputs)',
                              # On x86-64, the default page size with some
                              # linkers is 2M rather than the real Linux page
                              # size of 4K.  A larger page size is incompatible
                              # with our custom linker script's special layout.
                              '-z', 'max-page-size=0x1000',
                              '--whole-archive', '<(bootstrap_lib)',
                              '--no-whole-archive',
+                             '<(bootstrap_extra_lib)',
                            ],
                 }
               ],
             },
             {
               'target_name': 'nacl_helper_bootstrap',
               'dependencies': [
                 'nacl_helper_bootstrap_raw',
                 'nacl_helper_bootstrap_munge_phdr#host',
               ],
@@ skipping 26 matching lines @@
               'target_name': 'nacl_win64',
               'type': 'none',
               'sources': [],
             },
           ],
         }],
       ],
     }],
   ],
 }