Merge commit 'c1d7373d6e25' from apple/master into swift/master-next

Author: git apple-llvm automerger

llvm/test/MC/AArch64/arm64-mapping-across-sections.s

@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj < %s | llvm-objdump -t - | FileCheck %s
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s | llvm-nm - | FileCheck %s
 
     .text
 // $x at 0x0000
@@ -18,6 +18,6 @@
 // $x at 0x0018
     add x0, x0, x0
 
-// CHECK: 00000004         .text  00000000 $d
-// CHECK-NEXT: 00000000         .text  00000000 $x
-// CHECK-NEXT: 00000064         .text  00000000 $x
+// CHECK:      0000000000000004 t $d.1
+// CHECK-NEXT: 0000000000000000 t $x.0
+// CHECK-NEXT: 0000000000000064 t $x.2

llvm/test/MC/AArch64/arm64-mapping-within-section.s

@@ -2,7 +2,7 @@
 // RUN:   | FileCheck %s --check-prefix=CHECK-ASM
 // RUN: llvm-mc %s -triple=aarch64-none-linux-gnu -filetype=obj -o %t
 // RUN: llvm-readobj -S --sd %t | FileCheck %s  --check-prefix=CHECK-OBJ
-// RUN: llvm-objdump -t %t | FileCheck %s  --check-prefix=CHECK-SYMS
+// RUN: llvm-readelf -s %t | FileCheck %s  --check-prefix=SYMS
 
     .section    .size.aarch64_size
 
@@ -31,9 +31,10 @@ aarch64_size:
 // CHECK-OBJ-NEXT:   0010: 00000000 0000                        |......|
 // CHECK-OBJ-NEXT: )
 
-// CHECK-SYMS:     0000000000000000         .size.aarch64_size	 00000000 $d.0
-// CHECK-SYMS:     0000000000000000 g     F .size.aarch64_size	 00000000 aarch64_size
-// CHECK-SYMS:     0000000000000000         *UND*		 00000000 also_double_word
-// CHECK-SYMS:     0000000000000000         *UND*		 00000000 double_word
-// CHECK-SYMS:     0000000000000000         *UND*		 00000000 full_word
-// CHECK-SYMS:     0000000000000000         *UND*		 00000000 half_word
+// SYMS:      Type   Bind   Vis     Ndx Name
+// SYMS:      NOTYPE LOCAL  DEFAULT   3 $d.0
+// SYMS-NEXT: FUNC   GLOBAL DEFAULT   3 aarch64_size
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND also_double_word
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND double_word
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND full_word
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND half_word

llvm/test/MC/AArch64/mapping-within-section.s

@@ -1,5 +1,6 @@
-# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s | llvm-objdump -t - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s | llvm-readelf -s - | FileCheck %s
 
-# CHECK: 0000000000000004 g     O *COM*  00000004 C
+# CHECK:    Value         Size Type   Bind   Vis     Ndx Name
+# CHECK: 0000000000000004    4 OBJECT GLOBAL DEFAULT COM C
         .comm   C,4,4
         .comm   C,4,4

llvm/test/MC/AArch64/size-directive.s

@@ -1,11 +1,11 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-freebsd13.0 %s -o %t
-# RUN: llvm-objdump -t %t | FileCheck %s
+# RUN: llvm-readelf -s %t | FileCheck %s
 
-# CHECK: 0000000000000000 gw    F .text  00000000 0x60 __impl_foo
-# CHECK: 0000000000000000 g     F .text  00000000 0x60 foo
-# CHECK: 0000000000000000 gw    F .text  00000000 0x60 foo@FBSD_1.1
-# CHECK: 0000000000000008 g     F .text  00000000 0x60 func
-# CHECK: 0000000000000008 gw    F .text  00000000 0x60 weak_func
+# CHECK:      Type Bind   Vis                     Ndx Name
+# CHECK:      FUNC GLOBAL DEFAULT [<other: 0x60>]   2 foo
+# CHECK-NEXT: FUNC WEAK   DEFAULT [<other: 0x60>]   2 foo@FBSD_1.1
+# CHECK-NEXT: FUNC GLOBAL DEFAULT [<other: 0x60>]   2 func
+# CHECK-NEXT: FUNC WEAK   DEFAULT [<other: 0x60>]   2 weak_func
 
 .text
 .abiversion 2