Use gcc by default for gyp untrusted ARM builds

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 49 matching lines @@
         'build_glibc': 0,
         'build_newlib': 1,
       },
       'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'],
       'link_flags': [
         '-lsrpc',
         '-limc_syscalls',
         '-lplatform',
         '-lgio',
         '-lm',
+        '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+        '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
       ],
       'conditions': [
         # See comment in native_client/src/untrusted/irt/nacl.scons
-        # regarding -Ttext-segment. Also see
-        # http://code.google.com/p/nativeclient/issues/detail?id=2691.
-        ['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'],
-           'asflags': ['-arch', 'arm'],
-           'link_flags': [
-             '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
-             '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
-             # TODO(olonho): rethink
-             '-L<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
-             '-Wt,-mtls-use-call',
-             '-Wl,--pnacl-irt-link',
-           ],
-         },
-       ],
+        # regarding -Ttext-segment.
+        ['target_arch=="arm"', {
+          'sources': ['<@(irt_sources)',
+                      'aeabi_read_tp.S'],
+        }],
       ],
       'dependencies': [
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ],
     },
     {
       'target_name': 'irt_browser_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libirt_browser.a',
         'build_glibc': 0,
         'build_newlib': 1,
       },
       'sources': ['<@(irt_sources)', '<@(irt_browser)'],
       'include_dirs': ['../../../../ppapi'],
       'conditions': [
         ['target_arch == "x64" or target_arch == "ia32"', {
           'link_flags': [
              '-r',
              '-nostartfiles',
           ],
         }],
+        ['target_arch=="arm"', {
+          'sources': [ 'aeabi_read_tp.S' ],
+        }],
       ],
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
       ],
     },
   ],
 }