Update NaCl ARM build flags now that gcc used as default compiler.

ppapi/native_client/native_client.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_untrusted.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
@@ skipping 96 matching lines @@
               '-lgpu_ipc_untrusted',
               '-lipc_untrusted',
               '-lbase_untrusted',
               '-lshared_memory_support_untrusted',
               '-lsrpc',
               '-limc_syscalls',
               '-lplatform',
               '-lgio',
               '-Wl,--end-group',
               '-lm',
+              '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+              '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
             ],
-            # See http://code.google.com/p/nativeclient/issues/detail?id=2691.
-            # The PNaCl linker (gold) does not implement the "-Ttext-segment"
-            # option.  However, with the linker for x86, the "-Ttext" option
-            # does not affect the executable's base address.
-            # TODO(olonho): simplify flags handling and avoid duplication
-            # with NaCl logic.
             'conditions': [
-              ['target_arch!="arm"',
-               {
-                 'link_flags': [
-                   '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
-                   '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
-                 ]
-               }, { # target_arch == "arm"
-                 # TODO(mcgrathr): This knowledge really belongs in
+              ['target_arch=="arm"',
+               { # TODO(mcgrathr): This knowledge really belongs in
                  # native_client/src/untrusted/irt/irt.gyp instead of here.
                  # But that builds libirt_browser.a as bitcode, so a native
                  # object does not fit happily there.
                  'sources': [
                    '../../native_client/src/untrusted/irt/aeabi_read_tp.S',

[Derek Schuff, 2013/03/29 05:43:36]

This should probably still be moved to irt.gyp per the comment; it could maybe
be another CL but since you're doing a simultaneous DEPS roll+update already,
it's probably better to roll it into this one.

[Sam Clegg, 2013/03/29 18:29:21]

Done.

                  ],
-                 'link_flags': [
-                   '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
-                   '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
-                   '--pnacl-allow-native',
-                   '-arch', 'arm',
-                   '-Wt,-mtls-use-call',
-                   '-Wl,--pnacl-irt-link',
-                 ],
                },
              ],
              # untrusted.gypi and build_nexe.py currently build
              # both x86-32 and x86-64 whenever target_arch is some
              # flavor of x86.  However, on non-windows platforms
              # we only need one architecture.
              ['OS!="win" and target_arch=="ia32"',
                {
                  'enable_x86_64': 0
                }
@@ skipping 170 matching lines @@
             '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
             '../../native_client/src/shared/platform/platform.gyp:platform_lib',
             '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
             '../../native_client/src/shared/gio/gio.gyp:gio_lib',
           ],
         },
       ],
     }],
   ],
 }