Use gcc by default for gyp untrusted ARM builds

src/untrusted/irt/irt.gyp

Index: src/untrusted/irt/irt.gyp
diff --git a/src/untrusted/irt/irt.gyp b/src/untrusted/irt/irt.gyp
index b34fe69139b74ff2397ea302c5002bd6b509fd75..e30e92d0caca83d7573e8d7d431708e137e5bf88 100644
--- a/src/untrusted/irt/irt.gyp
+++ b/src/untrusted/irt/irt.gyp
@@ -67,31 +67,16 @@
         '-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',
@@ -119,6 +104,9 @@
              '-nostartfiles',
           ],
         }],
+        ['target_arch=="arm"', {
+          'sources': [ 'aeabi_read_tp.S' ],
+        }],
       ],
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',