Activate IRT building on ARM for NaCl.

chrome/nacl.gypi

Index: chrome/nacl.gypi
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index f5bf28afc0ca4910c429a397807233b070942094..6f13a795772f5183754a4095687ec7de18b0cfaf 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -135,6 +135,21 @@
                 },
               ],
             }],
+            ['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',
+                  ],
+                },
+              ],
+            }],
           ],
         },
       ],
@@ -312,16 +327,21 @@
                     ['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",
                       }
                     }],
                   ],
@@ -344,6 +364,7 @@
                              '-z', 'max-page-size=0x1000',
                              '--whole-archive', '<(bootstrap_lib)',
                              '--no-whole-archive',
+                             '<(bootstrap_extra_lib)',
                            ],
                 }
               ],