GYP build for ARM untrusted runtime.

build/untrusted.gypi

Index: build/untrusted.gypi
===================================================================
--- build/untrusted.gypi	(revision 8104)
+++ build/untrusted.gypi	(working copy)
@@ -9,9 +9,24 @@
     'NACL_IRT_DATA_START': '0x3ef00000',
     # Expected address for beginning of code in for the IRT.
     'NACL_IRT_TEXT_START': '0x0fc00000',
+    # Default C compiler defines.
+    'default_defines': [
+      '-D__linux__',
+      '-D__STDC_LIMIT_MACROS=1',
+      '-D__STDC_FORMAT_MACROS=1',
+      '-D_GNU_SOURCE=1',
+      '-D_BSD_SOURCE=1',
+      '-D_POSIX_C_SOURCE=199506',
+      '-D_XOPEN_SOURCE=600',
+      '-DDYNAMIC_ANNOTATIONS_ENABLED=1',
+      '-DDYNAMIC_ANNOTATIONS_PREFIX=NACL_',
+    ],
+    'default_compile_flags': [
+      #'-std=gnu99',  Added by build_nexe
+      '-O3',
+    ],
   },
   'conditions': [
-    # NOTE: we do not support untrusted gyp build on arm yet.
     ['target_arch!="arm"', {
       'target_defaults': {
         'conditions': [
@@ -39,20 +54,11 @@
           'lib_dirs': [],
           'include_dirs': ['<(DEPTH)','<(DEPTH)/ppapi'],
           'defines': [
+            '<@(default_defines)',

[Mark Seaborn, 2012/03/28 07:21:02]

I think you don't need the 'defines'/'default_defines' split.  I think if you
write 'defines' in both cases, this part will just append to the list.

[Nikolay, 2012/03/28 13:24:23]

If I used defines, instead of default_defines, gyp falls into infinite variable
expansion recursion for some reasons.
Same with compile flags, so I made this (indeed pretty artificial) split. If you
do have an idea how to fix that - would be perfect. Late expansion (>@(defines))
also doesn't help.


On 2012/03/28 07:21:02, Mark Seaborn wrote:

             '-DNACL_BUILD_ARCH=x86',
-            '-D__linux__',
-            '-D__STDC_LIMIT_MACROS=1',
-            '-D__STDC_FORMAT_MACROS=1',
-            '-D_GNU_SOURCE=1',
-            '-D_BSD_SOURCE=1',
-            '-D_POSIX_C_SOURCE=199506',
-            '-D_XOPEN_SOURCE=600',
-            '-DDYNAMIC_ANNOTATIONS_ENABLED=1',
-            '-DDYNAMIC_ANNOTATIONS_PREFIX=NACL_',
            ],
           'compile_flags': [
-            #'-std=gnu99',  Added by build_nexe
-            '-O3',
+            '<@(default_compile_flags)',
             '-fomit-frame-pointer',
             '-mtls-use-call'
            ],
@@ -68,6 +74,40 @@
           ],
         },
       },
+    }, {
+      # ARM case
+      'target_defaults': {
+        'variables': {
+          'python_exe': 'python',
+          'nexe_target': '',
+          'nlib_target': '',
+          'build_newlib': 0,
+          'build_glibc': 0,
+          'disable_glibc%': 1,
+          'extra_args': [],
+          'enable_arm': 1,
+          'extra_deps_arm': [],
+          'lib_dirs': [],
+          'include_dirs': ['<(DEPTH)','<(DEPTH)/ppapi'],
+          'defines': [
+            '<@(default_defines)',
+            '-DNACL_BUILD_ARCH=arm',
+           ],
+           'compile_flags': [
+             '<@(default_compile_flags)',
+           ],
+           'link_flags': [],
+           'get_sources': [
+             '>(python_exe)', '<(DEPTH)/native_client/build/scan_sources.py',
+             # This is needed to open the .c filenames, which are given
+             # relative to the .gyp file.
+             '-I.',
+             # This is needed to open the .h filenames, which are given
+             # relative to the native_client directory's parent.
+             '-I<(DEPTH)',
+           ],
+         },
+      },
     }],
     ['target_arch=="x64" or OS=="win"', {
       'target_defaults': {
@@ -189,7 +229,7 @@
                    '--name', '>(out32)',
                    '--objdir', '>(objdir)',
                    '--include-dirs', '>(inst_dir)/include >(include_dirs) >(include_dirs)',
-                   '--lib-dirs', '>(lib_dirs) ',
+                   '--lib-dirs', '>(lib_dirs)',
                    '--compile_flags', '-m32 >@(compile_flags)',
                    '>@(defines)', '-DNACL_BUILD_SUBARCH=32',
                    '--link_flags', '-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 >(link_flags)',
@@ -245,42 +285,42 @@
         ],
       },
     }],
-    ['target_arch=="x64" or OS=="win"', {
+    ['target_arch=="arm"', {
       'target_defaults': {
         'target_conditions': [
-           ['nexe_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
+           ['nexe_target!="" and build_newlib!=0', {

[Mark Seaborn, 2012/03/28 07:21:02]

It's a bit disconcerting that this chunk appears as a modification to an
existing chunk.  Is that just an artefact of the ordering?  I think it's because
of whitespace changes.  See below...

[Nikolay, 2012/03/28 13:24:23]

Thanks, it was indeed indent changes which confused diff. Fixed.

On 2012/03/28 07:21:02, Mark Seaborn wrote:

              'variables': {
-                'tool_name': 'glibc',
-                'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
-                'out64%': '<(PRODUCT_DIR)/>(nexe_target)_glibc_x64.nexe',
-                'objdir%': '>(INTERMEDIATE_DIR)/>(tool_name)-x86-64/>(_target_name)',
+               'tool_name': 'newlib',
+               'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
+               'out_arm%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_arm.nexe',
+               'objdir%': '>(INTERMEDIATE_DIR)/>(tool_name)-arm/>(_target_name)',
              },
              'actions': [
                {
-                 'action_name': 'build glibc x86-64 nexe',
+                 'action_name': 'build newlib arm nexe',
                  'msvs_cygwin_shell': 0,
-                 'description': 'building >(out64)',
+                 'description': 'building >(out_arm)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
                     '<(DEPTH)/ppapi/ppapi_cpp.gypi',
                     '>!@(>(get_sources) >(sources))',
-                    '>@(extra_deps64)',
+                    '>@(extra_deps_arm)',
                  ],
-                 'outputs': ['>(out64)'],
+                 'outputs': ['>(out_arm)'],
                  'action': [
                    '>(python_exe)',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '>@(extra_args)',
-                   '--arch', 'x86-64',
-                   '--build', 'glibc_nexe',
+                   '--arch', 'arm',
+                   '--build', 'newlib_nexe',
                    '--root', '<(DEPTH)',
-                   '--name', '>(out64)',
+                   '--name', '>(out_arm)',
                    '--objdir', '>(objdir)',
                    '--include-dirs', '>(inst_dir)/include >(include_dirs) >(include_dirs)',
                    '--lib-dirs', '>(lib_dirs) ',
-                   '--compile_flags', '-m64 >@(compile_flags) ',
-                   '>@(defines)', '-DNACL_BUILD_SUBARCH=64',
-                   '--link_flags', '-B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64 >(link_flags) ',
+                   '--compile_flags', '>@(compile_flags)',
+                   '>@(defines)', '-DNACL_BUILD_SUBARCH=32',
+                   '--link_flags', '-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32 >(link_flags)',
                    '>@(sources)',
                  ],
                },
@@ -289,9 +329,97 @@
         ],
       },
     }],
+    ['target_arch=="arm"', {
+      'target_defaults': {
+        'target_conditions': [
+          ['nlib_target!="" and build_newlib!=0', {
+            'variables': {
+              'tool_name': 'newlib',
+              'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
+              'out_arm%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/libarm/>(nlib_target)',
+              'objdir%': '>(INTERMEDIATE_DIR)/>(tool_name)-arm/>(_target_name)',
+            },
+            'actions': [
+              {
+                'action_name': 'build newlib arm nlib',
+                'msvs_cygwin_shell': 0,
+                'description': 'building >(out_arm)',
+                'inputs': [
+                  '<(DEPTH)/native_client/build/build_nexe.py',
+                  '<(DEPTH)/ppapi/ppapi_cpp.gypi',
+                  '>!@(>(get_sources) >(sources))',
+                  '>@(extra_deps_arm)',
+                ],
+                'outputs': ['>(out_arm)'],
+                'action': [
+                  '>(python_exe)',
+                  '<(DEPTH)/native_client/build/build_nexe.py',
+                  '>@(extra_args)',
+                  '--arch', 'arm',
+                  '--build', 'newlib_nlib',
+                  '--root', '<(DEPTH)',
+                  '--name', '>(out_arm)',
+                  '--objdir', '>(objdir)',
+                  '--include-dirs', '>(inst_dir)/include >(include_dirs) >(include_dirs)',
+                  '--lib-dirs', '>(lib_dirs) ',
+                  '--compile_flags', '>@(compile_flags)',
+                  '>@(defines)', '-DNACL_BUILD_SUBARCH=32',
+                  '--link_flags', '-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm >(link_flags)',
+                  '>@(sources)',
+                ],
+              },
+            ],
+          }],
+        ],
+      },
+    }],
     ['target_arch=="x64" or OS=="win"', {
       'target_defaults': {
         'target_conditions': [
+          ['nexe_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
+            'variables': {
+              'tool_name': 'glibc',

[Mark Seaborn, 2012/03/28 07:21:02]

I think you've changed the indentation in this block (the x86-64 glibc nexe
case), which is why it appears as an insertion.  Please change it back so that
only the ARM cases appear as insertions.

[Nikolay, 2012/03/28 13:24:23]

Done.

+              'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
+              'out64%': '<(PRODUCT_DIR)/>(nexe_target)_glibc_x64.nexe',
+              'objdir%': '>(INTERMEDIATE_DIR)/>(tool_name)-x86-64/>(_target_name)',
+            },
+            'actions': [
+              {
+                'action_name': 'build glibc x86-64 nexe',
+                'msvs_cygwin_shell': 0,
+                'description': 'building >(out64)',
+                'inputs': [
+                  '<(DEPTH)/native_client/build/build_nexe.py',
+                  '<(DEPTH)/ppapi/ppapi_cpp.gypi',
+                  '>!@(>(get_sources) >(sources))',
+                  '>@(extra_deps64)',
+                ],
+                'outputs': ['>(out64)'],
+                'action': [
+                  '>(python_exe)',
+                  '<(DEPTH)/native_client/build/build_nexe.py',
+                  '>@(extra_args)',
+                  '--arch', 'x86-64',
+                  '--build', 'glibc_nexe',
+                  '--root', '<(DEPTH)',
+                  '--name', '>(out64)',
+                  '--objdir', '>(objdir)',
+                  '--include-dirs', '>(inst_dir)/include >(include_dirs) >(include_dirs)',
+                  '--lib-dirs', '>(lib_dirs) ',
+                  '--compile_flags', '-m64 >@(compile_flags) ',
+                  '>@(defines)', '-DNACL_BUILD_SUBARCH=64',
+                  '--link_flags', '-B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64 >(link_flags) ',
+                  '>@(sources)',
+                ],
+              },
+            ],
+          }],
+        ],
+      },
+    }],
+    ['target_arch=="x64" or OS=="win"', {
+      'target_defaults': {
+        'target_conditions': [
            ['nlib_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
              'variables': {
                 'tool_name': 'glibc',