Index: llvm/trunk/test/Object/Inputs/mri-crlf.mri
===================================================================
--- llvm/trunk/test/Object/Inputs/mri-crlf.mri
+++ llvm/trunk/test/Object/Inputs/mri-crlf.mri
@@ -1,2 +0,0 @@
-; this file intentionally has crlf line endings
-end
Index: llvm/trunk/test/Object/mri-addlib.test
===================================================================
--- llvm/trunk/test/Object/mri-addlib.test
+++ llvm/trunk/test/Object/mri-addlib.test
@@ -1,14 +0,0 @@
-; RUN: echo create %t.a > %t.mri
-; RUN: echo addlib %p/Inputs/GNU.a >> %t.mri
-; RUN: echo addlib %p/Inputs/archive-test.a-gnu-minimal >> %t.mri
-; RUN: echo save >> %t.mri
-; RUN: echo end >> %t.mri
-
-; RUN: llvm-ar -M  < %t.mri
-; RUN: llvm-ar t %t.a | FileCheck %s
-
-; CHECK: evenlen
-; CHECK-NEXT: oddlen
-; CHECK-NEXT: very_long_bytecode_file_name.bc
-; CHECK-NEXT: IsNAN.o
-; CHECK-NEXT: test
Index: llvm/trunk/test/Object/mri-addmod.test
===================================================================
--- llvm/trunk/test/Object/mri-addmod.test
+++ llvm/trunk/test/Object/mri-addmod.test
@@ -1,82 +0,0 @@
-# RUN: yaml2obj -docnum=1 %s > %t.elf-x86-64
-# RUN: echo create %t.a > %t.mri
-# RUN: echo 'addmod "%t.elf-x86-64"' >> %t.mri
-# RUN: echo save >> %t.mri
-# RUN: echo end >> %t.mri
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_X86_64
-Sections:
-  - Name:  .text
-    Type:  SHT_PROGBITS
-    Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-Symbols:
-  - Name:    main
-    Type:    STT_FUNC
-    Section: .text
-    Binding: STB_GLOBAL
-    Size:    0x0000000000000024
-  - Name:    SomeOtherFunction
-    Binding: STB_GLOBAL
-  - Name:    puts
-    Binding: STB_GLOBAL
-
-# RUN: llvm-ar -M  < %t.mri
-# RUN: llvm-nm -M %t.a | FileCheck %s
-
-# CHECK:      Archive map
-# CHECK-NEXT: main in {{.*}}elf-x86-64
-
-# CHECK:      {{.*}}elf-x86-64:
-# CHECK-NEXT:                  U SomeOtherFunction
-# CHECK-NEXT: 0000000000000000 T main
-# CHECK-NEXT:                  U puts
-
-## Now test that CREATE overwrites an existing file.
-# RUN: yaml2obj -docnum=2 %s > %t2.elf-x86-64
-
-# RUN: echo create %t.a > %t2.mri
-# RUN: echo addmod %t2.elf-x86-64 >> %t2.mri
-# RUN: echo save >> %t2.mri
-# RUN: echo end >> %t2.mri
-
-# RUN: llvm-ar -M  < %t2.mri
-# RUN: llvm-nm -M %t.a | FileCheck --check-prefix=NEW %s
-
-# NEW: Archive map
-# NEW-NEXT: foo in {{.*}}2.elf-x86-64
-# NEW-NEXT: main in {{.*}}2.elf-x86-64
-
-# NEW: {{.*}}2.elf-x86-64:
-# NEW-NEXT: 0000000000000000 t bar
-# NEW-NEXT: 0000000000000006 T foo
-# NEW-NEXT: 0000000000000016 T main
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_X86_64
-Sections:
-  - Name:  .text
-    Type:  SHT_PROGBITS
-    Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-Symbols:
-  - Name:    bar
-    Type:    STT_FUNC
-    Section: .text
-  - Name:    foo
-    Type:    STT_FUNC
-    Section: .text
-    Binding: STB_GLOBAL
-    Value:   0x0000000000000006
-  - Name:    main
-    Type:    STT_FUNC
-    Section: .text
-    Binding: STB_GLOBAL
-    Value:   0x0000000000000016
Index: llvm/trunk/test/Object/mri-crlf.test
===================================================================
--- llvm/trunk/test/Object/mri-crlf.test
+++ llvm/trunk/test/Object/mri-crlf.test
@@ -1 +0,0 @@
-; RUN: llvm-ar -M  < %S/Inputs/mri-crlf.mri
Index: llvm/trunk/test/Object/mri1.test
===================================================================
--- llvm/trunk/test/Object/mri1.test
+++ llvm/trunk/test/Object/mri1.test
@@ -1,6 +0,0 @@
-; RUN: echo create %t.a > %t.mri
-; RUN: echo save >> %t.mri
-; RUN: echo end >> %t.mri
-
-; RUN: llvm-ar -M  < %t.mri
-; RUN: llvm-ar t %t.a
Index: llvm/trunk/test/Object/mri2.test
===================================================================
--- llvm/trunk/test/Object/mri2.test
+++ llvm/trunk/test/Object/mri2.test
@@ -1,7 +0,0 @@
-; RUN: echo create %t.a > %t.mri
-; RUN: echo create %t.a >> %t.mri
-; RUN: echo save >> %t.mri
-; RUN: echo end >> %t.mri
-
-; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
-; CHECK: error: script line 2: editing multiple archives not supported
Index: llvm/trunk/test/Object/mri3.test
===================================================================
--- llvm/trunk/test/Object/mri3.test
+++ llvm/trunk/test/Object/mri3.test
@@ -1,6 +0,0 @@
-; RUN: echo save > %t.mri
-; RUN: echo create %t.a >> %t.mri
-; RUN: echo end >> %t.mri
-
-; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
-; CHECK: error: script line 2: file already saved
Index: llvm/trunk/test/Object/mri4.test
===================================================================
--- llvm/trunk/test/Object/mri4.test
+++ llvm/trunk/test/Object/mri4.test
@@ -1,4 +0,0 @@
-; RUN: echo abc > %t.mri
-
-; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
-; CHECK: error: script line 1: unknown command: abc
Index: llvm/trunk/test/Object/mri5.test
===================================================================
--- llvm/trunk/test/Object/mri5.test
+++ llvm/trunk/test/Object/mri5.test
@@ -1,2 +0,0 @@
-; RUN: not llvm-ar -M t < %s 2>&1 | FileCheck %s
-; CHECK: error: cannot mix -M and other options
Index: llvm/trunk/test/tools/llvm-ar/Inputs/mri-crlf.mri
===================================================================
--- llvm/trunk/test/tools/llvm-ar/Inputs/mri-crlf.mri
+++ llvm/trunk/test/tools/llvm-ar/Inputs/mri-crlf.mri
@@ -0,0 +1,2 @@
+; this file intentionally has crlf line endings
+end
Index: llvm/trunk/test/tools/llvm-ar/mri-crlf.test
===================================================================
--- llvm/trunk/test/tools/llvm-ar/mri-crlf.test
+++ llvm/trunk/test/tools/llvm-ar/mri-crlf.test
@@ -0,0 +1 @@
+; RUN: llvm-ar -M  < %S/Inputs/mri-crlf.mri
Index: llvm/trunk/test/tools/llvm-ar/mri1.test
===================================================================
--- llvm/trunk/test/tools/llvm-ar/mri1.test
+++ llvm/trunk/test/tools/llvm-ar/mri1.test
@@ -0,0 +1,6 @@
+; RUN: echo create %t.a > %t.mri
+; RUN: echo save >> %t.mri
+; RUN: echo end >> %t.mri
+
+; RUN: llvm-ar -M  < %t.mri
+; RUN: llvm-ar t %t.a
Index: llvm/trunk/test/tools/llvm-ar/mri2.test
===================================================================
--- llvm/trunk/test/tools/llvm-ar/mri2.test
+++ llvm/trunk/test/tools/llvm-ar/mri2.test
@@ -0,0 +1,7 @@
+; RUN: echo create %t.a > %t.mri
+; RUN: echo create %t.a >> %t.mri
+; RUN: echo save >> %t.mri
+; RUN: echo end >> %t.mri
+
+; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
+; CHECK: error: script line 2: editing multiple archives not supported
Index: llvm/trunk/test/tools/llvm-ar/mri3.test
===================================================================
--- llvm/trunk/test/tools/llvm-ar/mri3.test
+++ llvm/trunk/test/tools/llvm-ar/mri3.test
@@ -0,0 +1,6 @@
+; RUN: echo save > %t.mri
+; RUN: echo create %t.a >> %t.mri
+; RUN: echo end >> %t.mri
+
+; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
+; CHECK: error: script line 2: file already saved
Index: llvm/trunk/test/tools/llvm-ar/mri4.test
===================================================================
--- llvm/trunk/test/tools/llvm-ar/mri4.test
+++ llvm/trunk/test/tools/llvm-ar/mri4.test
@@ -0,0 +1,4 @@
+; RUN: echo abc > %t.mri
+
+; RUN: not llvm-ar -M  < %t.mri 2>&1 | FileCheck %s
+; CHECK: error: script line 1: unknown command: abc
Index: llvm/trunk/test/tools/llvm-ar/mri5.test
===================================================================
--- llvm/trunk/test/tools/llvm-ar/mri5.test
+++ llvm/trunk/test/tools/llvm-ar/mri5.test
@@ -0,0 +1,2 @@
+; RUN: not llvm-ar -M t < %s 2>&1 | FileCheck %s
+; CHECK: error: cannot mix -M and other options