Use gcc by default for gyp untrusted ARM builds

build/untrusted.gypi

Index: build/untrusted.gypi
diff --git a/build/untrusted.gypi b/build/untrusted.gypi
index 84d8c6fcfc6eb423abbc39e7afe50560a87e2722..77941d609c85c3c5922cb4a2194bfed03a10d121 100755
--- a/build/untrusted.gypi
+++ b/build/untrusted.gypi
@@ -9,7 +9,6 @@
     '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__',
@@ -112,8 +111,8 @@
           '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': [],
@@ -315,8 +314,8 @@
     ['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',
@@ -349,7 +348,7 @@
                   '--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))',
@@ -357,8 +356,8 @@
               },
             ],
           }],
-          # 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',
@@ -391,7 +390,7 @@
                   '--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))',
@@ -399,8 +398,8 @@
               },
             ],
           }],
-          # 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',
@@ -435,14 +434,14 @@
                   '--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',