GYP build for ARM untrusted runtime.

src/untrusted/irt/irt.gyp

 # Copyright (c) 2012 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.
 
 {
   'includes': [
     '../../../build/common.gypi',
   ],
   'variables': {
     'irt_sources': [
@@ skipping 28 matching lines @@
     ],
     'irt_browser': [
       'irt_interfaces_ppapi.c',
       'irt_entry_ppapi.c',
       'irt_ppapi.c',
       'irt_manifest.c',
       'irt_nameservice.c',
       'irt_random.c',
     ],
   },
-  'conditions': [
-    # NOTE: We do not support untrusted gyp build on arm yet.
-    ['target_arch!="arm"', {
-      'targets': [
-        {
-          'target_name': 'irt_core_nexe',
-          'type': 'none',
+  'targets': [
+    {
+      'target_name': 'irt_core_nexe',
+      'type': 'none',
+      'variables': {
+        'nexe_target': 'irt_core',
+        'build_glibc': 0,
+        'build_newlib': 1,
+        'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'],
+        'conditions': [
+          # See comment in native_client/src/untrusted/irt/nacl.scons
+          # regarding -Ttext-segment.
+          ['target_arch!="arm"',
+           {
+             'link_flags': [
+               '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+               '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
+             ]
+           }, { # target_arch == "arm"
+             'sources': ['<@(irt_sources)',
+                         'aeabi_read_tp.S'],
+             'cflags': ['--pnacl-allow-translate',
+                        '-arch', 'arm'],
+             'asflags': ['-arch', 'arm'],
+             'link_flags': [
+               '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+               '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
+               '--pnacl-allow-native',
+               '-arch', 'arm',
+               '-Wt,-mtls-use-call',
+               # TODO(olonho): rethink
+               '-L<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
+             ],
+           },
+         ],
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
+      ],
+    },
+    {
+      'target_name': 'irt_browser_lib',

[robertm, 2012/03/23 15:03:38]

not sure what this is - maybe add a comment

[Nikolay, 2012/03/26 13:29:56]

All those lines are not really changed - I just removed if target != arm
condition and all formatting changes.
Yet another beauty of GYP :(. I have not written this code, so unsure if can
provide 100% comments on intentions in naming, but I think it's NaCl untrusted
runtime used in browser, vs. runtime used in standalone mode.

On 2012/03/23 15:03:38, robertm wrote:

+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libirt_browser.a',
+        'build_glibc': 0,
+        'build_newlib': 1,
+        'sources': ['<@(irt_sources)', '<@(irt_browser)'],
+      },
+      'conditions': [
+        ['target_arch == "x64" or target_arch == "ia32"', {

[robertm, 2012/03/23 15:03:38]

this looks suspicious does this build for arm at all?
also, you may want to change the condition to
['target_arch!="arm" 
to be consistent

[Nikolay, 2012/03/26 13:29:56]

Same as above. This is not new or modified code.

On 2012/03/23 15:03:38, robertm wrote:

           'variables': {
-            'nexe_target': 'irt_core',
-            'build_glibc': 0,
-            'build_newlib': 1,
-            'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'],
             'link_flags': [
-              '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
-              '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
+              '-r',
+              '-nostartfiles',
             ],
           },
-          'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
-          ],
-        },
-        {
-          'target_name': 'irt_browser_lib',
-          'type': 'none',
-          'variables': {
-            'nlib_target': 'libirt_browser.a',
-            'build_glibc': 0,
-            'build_newlib': 1,
-            'sources': ['<@(irt_sources)', '<@(irt_browser)'],
-          },
-          'conditions': [
-            ['target_arch == "x64" or target_arch == "ia32"', {
-              'variables': {
-                'link_flags': [
-                  '-r',
-                  '-nostartfiles',
-                ],
-              },
-            }],
-          ],
-          'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
-          ],
-        },
+        }],
       ],
-    }],
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
+      ],
+    },
   ],
 }