Use gcc by default for gyp untrusted ARM builds

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': {
     # See native_client/Sconstruct for more details.
     # Expected address for beginning of data in for the IRT.
     'NACL_IRT_DATA_START': '0x3ef00000',
     # Expected address for beginning of code in for the IRT.
     'NACL_IRT_TEXT_START': '0x0fa00000',
-    'nacl_enable_arm_gcc%': 0,
     # Default C compiler defines.
     'nacl_default_defines': [
       '__linux__',
       '__STDC_LIMIT_MACROS=1',
       '__STDC_FORMAT_MACROS=1',
       '_GNU_SOURCE=1',
       '_BSD_SOURCE=1',
       '_POSIX_C_SOURCE=199506',
       '_XOPEN_SOURCE=600',
       'DYNAMIC_ANNOTATIONS_ENABLED=1',
@@ skipping 82 matching lines @@
         'defines': [],
         'sources': [],
         'compile_flags': [],
         'link_flags': [],
         'include_dirs': [],
         'variables': {
           'python_exe': 'python',
           'nexe_target': '',
           'nlib_target': '',
           'nso_target': '',
+          'force_arm_pnacl': 0,
           'build_newlib': 0,
-          'nacl_enable_arm_gcc%': 0,
           'build_glibc': 0,
           'disable_glibc%': 1,
           'extra_args': [],
           'enable_x86_32': 0,
           'enable_x86_64': 0,
           'enable_arm': 1,
           'extra_deps_newlib_arm': [],
           'native_sources': [],
           'lib_dirs_newlib_arm': [],
           'include_dirs': ['<(DEPTH)', '<(DEPTH)/ppapi'],
@@ skipping 181 matching lines @@
                  ],
                },
              ],
            }],
         ],
       },
     }],
     ['target_arch=="arm"', {
       'target_defaults': {
         'target_conditions': [
-          # GCC ARM build
-          ['nacl_enable_arm_gcc!=0 and nexe_target!="" and build_newlib!=0', {
+          # GCC ARM build (the default)
+          ['force_arm_pnacl==0 and nexe_target!="" and build_newlib!=0', {
             'variables': {
                'tool_name': 'newlib',
                'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
                'out_newlib_arm%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_arm.nexe',
                'objdir_newlib_arm%': '>(INTERMEDIATE_DIR)/<(tool_name)-arm/>(_target_name)',
                'source_list_newlib_arm%': '<(tool_name)-arm.>(_target_name).source_list.gypcmd',
             },
             'actions': [
               {
                 'action_name': 'build newlib arm nexe',
@@ skipping 12 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nexe',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
                   '--lib-dirs=>(lib_dirs_newlib_arm) ',
-                  '--compile_flags=^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=-Wno-unused-local-typedefs -Wno-psabi -mtp=soft ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',

[Derek Schuff, 2013/03/28 17:49:31]

putting this here is the equivalent of x86's use of newlib_tls_flags in every
newlib build, which as Roland noted is undesirable. The reason newlib_tls_flags
is on every newlib build is because it was easier than putting it on every
library linked into the IRT.

                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',
                   '--source-list=^|(<(source_list_newlib_arm) ^(_sources) ^(sources) ^(native_sources))',
                 ],
               },
             ],
           }],
-          # GCC ARM library build
-          ['nacl_enable_arm_gcc!=0 and nlib_target!="" and build_newlib!=0', {
+          # GCC ARM library build (the default)
+          ['force_arm_pnacl==0 and nlib_target!="" and build_newlib!=0', {
             'variables': {
               'tool_name': 'newlib',
               'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
               'out_newlib_arm%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/libarm/>(nlib_target)',
               'objdir_newlib_arm%': '>(INTERMEDIATE_DIR)/<(tool_name)-arm/>(_target_name)',
               'source_list_newlib_arm%': '<(tool_name)-arm.>(_target_name).source_list.gypcmd',
             },
             'actions': [
               {
                 'action_name': 'build newlib arm nlib',
@@ skipping 12 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
                   '--lib-dirs=>(lib_dirs_newlib_arm)',
-                  '--compile_flags=^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=-Wno-unused-local-typedefs -Wno-psabi -mtp=soft ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',
                   '--source-list=^|(<(source_list_newlib_arm) ^(_sources) ^(sources) ^(native_sources))',
                 ],
               },
             ],
           }],
-          # pnacl ARM build is the default (unless nacl_enable_arm_gcc is set)
-          ['nacl_enable_arm_gcc==0 and nexe_target!="" and build_newlib!=0', {
+          # pnacl ARM build (only used if force_arm_pnacl is set)

[Derek Schuff, 2013/03/28 17:33:41]

in the future we may be able to remove the pnacl ARM build since the shims are
just libraries. Maybe save for a future cleanup CL though. Probably we can make
the shims always built with pnacl (instead of building them with nacl-gcc on
x86-64 and pnacl on arm)

[Sam Clegg, 2013/03/28 23:02:59]

Yup.  We should be able to completely remove this block, but I'll leave that for
a separate CL if thats OK.

+          ['force_arm_pnacl==1 and nexe_target!="" and build_newlib!=0', {
             'variables': {
               'tool_name': 'newlib',
               'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
               'out_newlib_arm%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_arm.nexe',
               'objdir_newlib_arm%': '>(INTERMEDIATE_DIR)/<(tool_name)-arm/>(_target_name)',
               'source_list_newlib_arm%': '<(tool_name)-arm.>(_target_name).source_list.gypcmd',
              },
             'actions': [
               {
                 'action_name': 'build newlib arm nexe (via pnacl)',
@@ skipping 14 matching lines @@
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nexe_pnacl',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
                   '--lib-dirs=>(lib_dirs_newlib_arm) ',
                   '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                   '--defines=^(defines) >(_defines)',
-                  '--link_flags=-arch arm --pnacl-allow-translate --pnacl-allow-native -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',
+                  '--link_flags=-arch arm --pnacl-allow-translate --pnacl-allow-native -Wl,--pnacl-irt-link -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',

[Derek Schuff, 2013/03/28 17:33:41]

pnacl-irt-link should no longer be necessary, especially since the shims are
just archives with native .o files (i suspect this is just a leftover from
previous testing)

[Sam Clegg, 2013/03/28 23:02:59]

I'm not sure its worth messing with this block right now
given that its going to be removed soon anyway.

                   '--source-list=^|(<(source_list_newlib_arm) ^(_sources) ^(sources))',
                  ],
               },
             ],
           }],
           # pnacl ARM library build
-          ['nacl_enable_arm_gcc==0 and nlib_target!="" and build_newlib!=0', {
+          ['force_arm_pnacl==1 and nlib_target!="" and build_newlib!=0', {
             'variables': {
               'tool_name': 'newlib',
               'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
               'out_newlib_arm%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/libarm/>(nlib_target)',
               'objdir_newlib_arm%': '>(INTERMEDIATE_DIR)/<(tool_name)-arm/>(_target_name)',
               'source_list_newlib_arm%': '<(tool_name)-arm.>(_target_name).source_list.gypcmd',
             },
             'actions': [
               {
                 'action_name': 'build newlib arm nlib (via pnacl)',
@@ skipping 301 matching lines @@
         # compiled with high level of optimizations and without debug info,
         # compiler is requested to generate unwind tables explicitly. This
         # is the default behavior on x86-64 and when compiling C++ with
         # exceptions enabled, the change is for the benefit of x86-32 C.
         # These are only required for the IRT but are here for all
         # nacl-gcc-compiled binaries because the IRT depends on other libs
         '-fasynchronous-unwind-tables',
       ],
       'newlib_tls_flags': [
         # This option is currently only honored by x86/x64 builds.  The
         # equivalent arm option is apparently -mtp=soft but we don't need use

[Derek Schuff, 2013/03/28 17:49:31]

Maybe change this comment to
"This option is currently only used by x86/x64 builds. The equivalent ARM option
is -mtp=soft, but we only use it on the IRT and its libraries instead of
everywhere."

[Roland McGrath, 2013/03/28 18:00:06]

IMHO we should be consistent.  -mtp=soft has exactly the same meaning and
issues as -mtls-use-call.  Either it's too much hassle to selectively use
it in only the places it's needed, or it's worth it to avoid the
de-optimization of other things (SDK libraries and PPAPI tests, I guess).
The question doesn't differ between ARM and x86.

Note that the test that verifies that no place that mattered was missing
this option (by examining the IRT binary) got disabled in Chrome because it
was being too slow on Windows and annoying Chrome developers.  So
conservatism says we should not do a more-specific enabling of the option,
which is subject to possibly missing a spot, before we have that test
re-enabled in some fashion.

[Sam Clegg, 2013/03/28 23:02:59]

Done. Made it consistent.

         # it at this point.
         '-mtls-use-call',
       ],
       'pnacl_compile_flags': [
         '-Wno-extra-semi',
         '-Wno-unused-private-field',
       ],
     },
     'target_conditions': [
       ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
@@ skipping 157 matching lines @@
               '--defines=^(defines) >(_defines)',
               '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib ^(link_flags) >(_link_flags)',
               '--source-list=^|(<(source_list_pnacl_newlib) ^(_sources) ^(sources))',
             ],
           },
         ],
       }],
     ],
   },
 }