13 files changed, 18 insertions, 83 deletions
diff --git a/llvm/test/MC/ARM/Inputs/1.s b/llvm/test/MC/ARM/Inputs/1.s
deleted file mode 100644
index 0afcc633f64..00000000000
--- a/llvm/test/MC/ARM/Inputs/1.s
+++ /dev/null
@@ -1,3 +0,0 @@
-        .section        .foobar,"ax",%progbits
-         nop
-        .word 32
diff --git a/llvm/test/MC/ARM/Inputs/2.s b/llvm/test/MC/ARM/Inputs/2.s
deleted file mode 100644
index 0ecdb294ab8..00000000000
--- a/llvm/test/MC/ARM/Inputs/2.s
+++ /dev/null
@@ -1,3 +0,0 @@
-        .section        .foobar,"",%progbits
-         nop
-        .word 32
diff --git a/llvm/test/MC/ARM/Inputs/3.s b/llvm/test/MC/ARM/Inputs/3.s
deleted file mode 100644
index 09392623fc1..00000000000
--- a/llvm/test/MC/ARM/Inputs/3.s
+++ /dev/null
@@ -1,3 +0,0 @@
-        .section        .foobar,"aw",%progbits
-         nop
-        .word 32
diff --git a/llvm/test/MC/ARM/Inputs/4.s b/llvm/test/MC/ARM/Inputs/4.s
deleted file mode 100644
index 28d8244bb41..00000000000
--- a/llvm/test/MC/ARM/Inputs/4.s
+++ /dev/null
@@ -1,2 +0,0 @@
-        .section        .foobar,"",%progbits
-        .word 32
diff --git a/llvm/test/MC/ARM/Inputs/5.s b/llvm/test/MC/ARM/Inputs/5.s
deleted file mode 100644
index 1faef539b13..00000000000
--- a/llvm/test/MC/ARM/Inputs/5.s
+++ /dev/null
@@ -1,2 +0,0 @@
-        .section        .foobar,"aw",%progbits
-        .word 32
diff --git a/llvm/test/MC/ARM/Inputs/6.s b/llvm/test/MC/ARM/Inputs/6.s
deleted file mode 100644
index 0fdb9daaf29..00000000000
--- a/llvm/test/MC/ARM/Inputs/6.s
+++ /dev/null
@@ -1,12 +0,0 @@
-        .section        .foo
-        .word 30
-        .word 31
-        .word 32
-        .word 33
-        nop
-        .word 34
-        .word 35
-        .word 36
-        .word 37
-        .word 38
-        nop
diff --git a/llvm/test/MC/ARM/Inputs/7.s b/llvm/test/MC/ARM/Inputs/7.s
deleted file mode 100644
index b92a61ec971..00000000000
--- a/llvm/test/MC/ARM/Inputs/7.s
+++ /dev/null
@@ -1,3 +0,0 @@
-        .section        .foobar,"aw",%progbits
-        .word 32
-        nop
diff --git a/llvm/test/MC/ARM/Inputs/attr.s b/llvm/test/MC/ARM/Inputs/attr.s
deleted file mode 100644
index 412cad76842..00000000000
--- a/llvm/test/MC/ARM/Inputs/attr.s
+++ /dev/null
@@ -1,5 +0,0 @@
-	.text
-	.syntax unified
-	.eabi_attribute	67, "2.09"	@ Tag_conformance
-	.cpu	arm7tdmi
-	.eabi_attribute	6, 2	@ Tag_CPU_arch
diff --git a/llvm/test/MC/ARM/Inputs/ident.s b/llvm/test/MC/ARM/Inputs/ident.s
deleted file mode 100644
index 19d65fcc7e0..00000000000
--- a/llvm/test/MC/ARM/Inputs/ident.s
+++ /dev/null
@@ -1 +0,0 @@
-	.ident	"LLVM ARM Compiler"
diff --git a/llvm/test/MC/ARM/data-in-code.ll b/llvm/test/MC/ARM/data-in-code.ll
index e579146acfb..c2194e9179c 100644
--- a/llvm/test/MC/ARM/data-in-code.ll
+++ b/llvm/test/MC/ARM/data-in-code.ll
@@ -60,6 +60,23 @@ exit:
 ;; ARM-NEXT:     Other:
 ;; ARM-NEXT:     Section: [[MIXED_SECT]]
 
+;; ARM:        Symbol {
+;; ARM:          Name: $d
+;; ARM-NEXT:     Value: 0x0
+;; ARM-NEXT:     Size: 0
+;; ARM-NEXT:     Binding: Local (0x0)
+;; ARM-NEXT:     Type: None (0x0)
+;; ARM-NEXT:     Other: 0
+;; ARM-NEXT:     Section: .ARM.exidx
+;; ARM-NEXT:   }
+
+;; ARM:        Symbol {
+;; ARM:          Name: $d
+;; ARM-NEXT:     Value: 0
+;; ARM-NEXT:     Size: 0
+;; ARM-NEXT:     Binding: Local
+;; ARM-NEXT:     Type: None
+
 ;; ARM-NOT:     ${{[atd]}}
 
 ;; TMB:        Symbol {
diff --git a/llvm/test/MC/ARM/mappingsymbols.s b/llvm/test/MC/ARM/mappingsymbols.s
deleted file mode 100644
index fff8e104781..00000000000
--- a/llvm/test/MC/ARM/mappingsymbols.s
+++ /dev/null
@@ -1,48 +0,0 @@
-# Check section containing code and data with permission executable for the section.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/1.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
-
-# Check section containing code and data with no permissions for the section.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/2.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
-
-# Check section containing code and data with read/write permissions for the section.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/3.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
-
-# Check section containing data with no permissions for the section.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/4.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
-
-# Check section containing only data with read/write permissions for the section.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/5.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
-
-# Check section containing the ident string with no permissions for the section.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/ident.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
-
-# Check section containing the attributes with no permissions for the section.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/attr.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
-
-# Check section containing code and data with no permissions for the section.
-# data comes before code.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/6.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MIX
-
-# Check section containing code and data with no permissions for the section.
-# data comes before code.
-@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/7.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
-
-#CHECK: $a
-#CHECK: $d
-
-#MIX: $a
-#MIX: $a
-#MIX: $d
-#MIX: $d
-
-#MAPPINGSYMBOLS-NOT: $a
-#MAPPINGSYMBOLS-NOT: $d
diff --git a/llvm/test/MC/ARM/multi-section-mapping.s b/llvm/test/MC/ARM/multi-section-mapping.s
index e4b7146e4b0..2b1b0efab53 100644
--- a/llvm/test/MC/ARM/multi-section-mapping.s
+++ b/llvm/test/MC/ARM/multi-section-mapping.s
@@ -29,6 +29,7 @@
 
 @ CHECK: 00000000 .text 00000000 $a
 @ CHECK-NEXT: 00000000 .wibble 00000000 $a
+@ CHECK-NEXT: 00000000 .starts_data 00000000 $d
 @ CHECK-NEXT: 00000000 .starts_thumb 00000000 $t
 @ CHECK-NOT: ${{[adt]}}
 
diff --git a/llvm/test/Object/ARM/nm-mapping-symbol.s b/llvm/test/Object/ARM/nm-mapping-symbol.s
index 9b7b5b583ea..485c1cc39d7 100644
--- a/llvm/test/Object/ARM/nm-mapping-symbol.s
+++ b/llvm/test/Object/ARM/nm-mapping-symbol.s
@@ -9,4 +9,3 @@
 
         .section        .foobar,"",%progbits
         .asciz  "foo"
-        nop