Modify ARM .S code so it can be processed by both gnu-as and llvm-mc.

src/trusted/service_runtime/nacl.scons

 # -*- python -*-
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 Import('env')
 
 # So far, all tests involve native assembler
 
 HALT_SLED_SIZE=32
@@ skipping 26 matching lines @@
   raise Exception('unknown architecture')
 
 def NewAsmEnv(env, defines, rodata_address, rwdata_address):
 
   asm_env = env.Clone()
   # NOTE(robertm): convert this to pure C code so that most of this
   # special handling can be eliminated
   if asm_env.Bit('bitcode'):
     asm_env.PNaClForceNative()
     # NOTE: "PNACL_AS" controls small code adaptions needed for  the
-    # pnacl assembler
-    asm_env.Append(ASFLAGS='-DPNACL_AS=1')
+    # pnacl assembler but we do not use the pnacl assembler for ARM yet
+    # BUG: http://code.google.com/p/nativeclient/issues/detail?id=1968
+    if not env.Bit('target_arm'):
+      asm_env.Append(ASFLAGS='-DPNACL_AS=1')
     # Windows uses CC for assembling
     asm_env.Append(CFLAGS='-DPNACL_AS=1')
   link_cmd = ('${LD} -e _start ${TEXT_START} ${RO_START} ${RW_START}' +
                 ' -o ${TARGET} ${SOURCES}')
 
   if env.Bit('target_x86_32'):
     link_cmd += ' -melf_nacl'
   elif env.Bit('target_x86_64'):
     link_cmd += ' -melf64_nacl'
   elif env.Bit('target_arm'):
@@ skipping 101 matching lines @@
     base_name = 'nacl_text_' + variant + '_pad' + name_modifier + '_test'
     obj = asm_env.ComponentObject(base_name + '.o', nacl_text_pad_asm)
 
     nexe = asm_env.ComponentProgram(base_name, [obj])
 
     node = env.CommandSelLdrTestNacl(base_name + '.out',
                                      nexe)
     env.AddNodeToTestSuite(node,
                            ['small_tests', 'sel_ldr_sled_tests'],
                            'run_' + base_name)