Add option to force filetype=asm for testing

tests_lit/llvm2ice_tests/elf_container.ll

 ; Tests that we generate an ELF container with fields that make sense,
 ; cross-validating against llvm-mc.
 
 ; For the integrated ELF writer, we can't pipe the output because we need
 ; to seek backward and patch up the file headers. So, use a temporary file.
-; RUN: %p2i -i %s --filetype=obj --args -O2 --verbose none -o %t \
+; RUN: %p2i -i %s --filetype=obj --output %t --args -O2 --verbose none \
 ; RUN:   -allow-externally-defined-symbols \
 ; RUN:   && llvm-readobj -file-headers -sections -section-data \
 ; RUN:       -relocations -symbols %t | FileCheck %s
 
 ; RUN: %if --need=allow_dump --command %p2i -i %s --args -O2 --verbose none \
 ; RUN:   -allow-externally-defined-symbols \
 ; RUN:   | %if --need=allow_dump --command llvm-mc -triple=i686-nacl \
 ; RUN:     -filetype=obj -o - \
 ; RUN:   | %if --need=allow_dump --command llvm-readobj -file-headers \
 ; RUN:     -sections -section-data -relocations -symbols - \
 ; RUN:   | %if --need=allow_dump --command FileCheck %s
 
 ; Add a run that shows relocations in code inline.
-; RUN: %p2i -i %s --filetype=obj --args -O2 --verbose none -o %t \
+; RUN: %p2i -i %s --filetype=obj --output %t --args -O2 --verbose none \
 ; RUN:   -allow-externally-defined-symbols \
 ; RUN:   && le32-nacl-objdump -w -d -r -Mintel %t \
 ; RUN:   | FileCheck --check-prefix=TEXT-RELOCS %s
 
 ; Use intrinsics to test external calls.
 declare void @llvm.memcpy.p0i8.p0i8.i32(i8*, i8*, i32, i32, i1)
 declare void @llvm.memset.p0i8.i32(i8*, i8, i32, i32, i1)
 
 ; Try other external functions (for cross tests).
 ; Not testing external global variables since the NaCl bitcode writer
@@ skipping 44 matching lines @@
 ; Test intrinsics that call out to external functions.
 define internal void @test_memcpy(i32 %iptr_dst, i32 %len) {
 entry:
   %dst = inttoptr i32 %iptr_dst to i8*
   %src = bitcast [7 x i8]* @bytes to i8*
   call void @llvm.memcpy.p0i8.p0i8.i32(i8* %dst, i8* %src,
                                        i32 %len, i32 1, i1 false)
   ret void
 }
 ; TEXT-RELOCS-LABEL: test_memcpy
-; TEXT-RELOCS: mov {{.*}} R_386_32 bytes
+; TEXT-RELOCS: mov {{.*}} R_386_32 {{bytes|.data}}
 
 define internal void @test_memset(i32 %iptr_dst, i32 %wide_val, i32 %len) {
 entry:
   %val = trunc i32 %wide_val to i8
   %dst = inttoptr i32 %iptr_dst to i8*
   call void @llvm.memset.p0i8.i32(i8* %dst, i8 %val,
                                   i32 %len, i32 1, i1 false)
   ret void
 }
 ; TEXT-RELOCS-LABEL: test_memset
@@ skipping 10 matching lines @@
   call void @external_foo(i32 42)
   ret void
 }
 
 ; Test copying a function pointer, or a global data pointer.
 define internal i32 @test_ret_fp() {
   %r = ptrtoint float ()* @returnFloatConst to i32
   ret i32 %r
 }
 ; TEXT-RELOCS-LABEL: test_ret_fp
-; TEXT-RELOCS-NEXT: mov {{.*}} R_386_32 returnFloatConst
+; TEXT-RELOCS-NEXT: mov {{.*}} R_386_32 {{returnFloatConst|.text}}
 
 define internal i32 @test_ret_global_pointer() {
   %r = ptrtoint [7 x i8]* @bytes to i32
   ret i32 %r
 }
 ; TEXT-RELOCS-LABEL: test_ret_global_pointer
-; TEXT-RELOCS-NEXT: mov {{.*}} R_386_32 bytes
+; TEXT-RELOCS-NEXT: mov {{.*}} R_386_32 {{bytes|.data}}
 
 ; Test defining a non-internal function.
 define void @_start(i32) {
   %f = call float @returnFloatConst()
   %d = call double @returnDoubleConst()
   call void @test_memcpy(i32 0, i32 99)
   call void @test_memset(i32 0, i32 0, i32 99)
   %f2 = call float @test_call_internal()
   %p1 = call i32 @test_ret_fp()
   %p2 = call i32 @test_ret_global_pointer()
@@ skipping 507 matching lines @@
 ; CHECK:        Symbol {
 ; CHECK:          Name: memset
 ; CHECK-NEXT:     Value: 0x0
 ; CHECK-NEXT:     Size: 0
 ; CHECK-NEXT:     Binding: Global
 ; CHECK-NEXT:     Type: None
 ; CHECK-NEXT:     Other: 0
 ; CHECK-NEXT:     Section: Undefined
 ; CHECK-NEXT:   }
 ; CHECK: ]