llvm · klensy · May 27, 2024 · Feb 3, 2025 · Feb 3, 2025 · Feb 3, 2025
diff --git a/lld/test/COFF/duplicate.test b/lld/test/COFF/duplicate.test
@@ -6,7 +6,7 @@ RUN: not lld-link /out:beta.dll /dll alpha.obj beta.obj alpha.lib 2>&1 | FileChe
 
 CHECK-ALPHA: error: duplicate symbol: f
 CHECK-ALPHA: defined at {{.*}}alpha.obj
-CHECK-APLHA: defined at alpha.dll
+CHECK-ALPHA: defined at alpha.lib(alpha.dll)
 
 RUN: llc -mtriple x86_64-windows-msvc -filetype obj -o gamma.obj %S/Inputs/gamma.ll
 RUN: not lld-link /out:gamma.exe /subsystem:console /entry:mainCRTStartup gamma.obj alpha.lib 2>&1 | FileCheck %s -check-prefix CHECK-GAMMA

diff --git a/lld/test/COFF/pdb-local-constants.test b/lld/test/COFF/pdb-local-constants.test
@@ -18,4 +18,4 @@ CHECK-NEXT:           type = 0x1002 (const int), value = 321
 
 CHECK:                          Symbols
 CHECK:           220 | S_CONSTANT [size = 12] `i`
-CHECK-NEXT            type = 0x0074 (int), value = 123
+CHECK-NEXT:           type = 0x0074 (int), value = 123
diff --git a/lld/test/COFF/pdb_char8_t.ll b/lld/test/COFF/pdb_char8_t.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llc -mtriple x86_64-windows-msvc -filetype obj -o %t.obj %s
 ; RUN: lld-link /nodefaultlib /noentry /dll /debug /out:%t.exe /pdb:%t.pdb %t.obj
-; RUN: llvm-pdbutil dump -type-index=0x7c %t.pdb
+; RUN: llvm-pdbutil dump -type-index=0x7c %t.pdb | FileCheck %s
 
 ; CHECK: 0x007C (char8_t) | char8_t
 

diff --git a/lld/test/ELF/aarch64-cortex-a53-843419-thunk-align.s b/lld/test/ELF/aarch64-cortex-a53-843419-thunk-align.s
@@ -7,7 +7,7 @@
 // RUN:                  *(.text.02) } \
 // RUN:                  .foo : { *(.foo_sec) } } " > %t.script
 // RUN: ld.lld -pie --fix-cortex-a53-843419 --script=%t.script %t.o -o %t2
-// RUN: llvm-objdump --no-show-raw-insn --triple=aarch64-linux-gnu -d %t2
+// RUN: llvm-objdump --no-show-raw-insn --triple=aarch64-linux-gnu -d %t2 | FileCheck %s
 
 
 /// %t2 is > 128 Megabytes, so delete it early.
@@ -36,13 +36,13 @@ t3_ff8_ldr:
  ret
 
 /// Expect thunk and patch to be inserted here
-// CHECK: 0000000000011008 __AArch64ADRPThunk_far_away:
-// CHECK-NEXT: 11008: adrp    x16, #134221824
-// CHECK-NEXT:        add     x16, x16, #16
-// CHECK-NEXT:        br      x16
-// CHECK: 0000000000012008 __CortexA53843419_11000:
-// CHECK-NEXT: 12008: ldr     x0, [x0, #168]
-// CHECK-NEXT:        b       #-4104 <t3_ff8_ldr+0xc>
+// CHECK-LABEL: 0000000000011008 <__AArch64ADRPThunk_far_away>:
+// CHECK-NEXT: 11008: adrp      x16, 0x8012000
+// CHECK-NEXT:        add     x16, x16, #0x10
+// CHECK-NEXT::       br      x16
+// CHECK-LABEL: 0000000000012008 <__CortexA53843419_11000>:
+// CHECK-NEXT: 12008: ldr     x0, [x0, #0xb8]
+// CHECK-NEXT: 1200c: b       0x11004 <t3_ff8_ldr+0xc>
 
  .section .text.02, "ax", %progbits
  .globl far_away
@@ -52,15 +52,13 @@ far_away:
  ret
 /// Expect thunk for _start not to have size rounded up to 4KiB as it is at
 /// the end of the OutputSection
-// CHECK: 0000000008012010 far_away:
-// CHECK-NEXT:  8012010: bl      #8
-// CHECK-NEXT:           ret
-// CHECK: 0000000008012018 __AArch64ADRPThunk__start:
-// CHECK-NEXT:  8012018: adrp    x16, #-134225920
-// CHECK-NEXT:           add     x16, x16, #0
-// CHECK-NEXT:           br      x16
-// CHECK: 0000000008012024 foo:
-// CHECK-NEXT:  8012024: ret
+// CHECK-LABEL: 0000000008012010 <far_away>:
+// CHECK-NEXT: 8012010: bl      0x8012018 <__AArch64ADRPThunk__start>
+// CHECK-NEXT: 8012014: ret
+// CHECK-LABEL: 0000000008012018 <__AArch64ADRPThunk__start>:
+// CHECK-NEXT: 8012018: adrp    x16, 0x10000
+// CHECK-NEXT: 801201c: add     x16, x16, #0x0
+// CHECK-NEXT: 8012020: br      x16
  .section .foo_sec, "ax", %progbits
  .globl foo
  .type foo, function

diff --git a/lld/test/ELF/arm-thumb-branch-rangethunk.s b/lld/test/ELF/arm-thumb-branch-rangethunk.s
@@ -1,8 +1,8 @@
 // REQUIRES: arm
 // RUN: llvm-mc -arm-add-build-attributes -filetype=obj -triple=thumbv7a-none-linux-gnueabi %s -o %t
 // RUN: llvm-mc -arm-add-build-attributes -filetype=obj -triple=thumbv7a-none-linux-gnueabi %S/Inputs/far-arm-thumb-abs.s -o %tfar
-// RUN: ld.lld  %t %tfar -o %t2
-// RUN: llvm-objdump -d %t2
+// RUN: ld.lld -Ttext=0x20000 %t %tfar -o %t2
+// RUN: llvm-objdump --no-show-raw-insn -d %t2 | FileCheck %s
  .syntax unified
  .thumb
  .section .text, "ax",%progbits
@@ -16,22 +16,16 @@ _start:
  b   too_far2
  beq.w too_far3
 
-// CHECK: Disassembly of section .text:
+// CHECK-LABEL: 00020000 <_start>:
+// CHECK-NEXT: 20000: bl      0x2000c <__Thumbv7ABSLongThunk_too_far1>
+// CHECK-NEXT:        b.w     0x20010 <__Thumbv7ABSLongThunk_too_far2>
+// CHECK-NEXT:        beq.w   0x20014 <__Thumbv7ABSLongThunk_too_far3>
 // CHECK-EMPTY:
-// CHECK-NEXT: _start:
-// CHECK-NEXT:    20000:       00 f0 04 f8     bl      #8
-// CHECK-NEXT:    20004:       00 f0 07 b8     b.w     #14 <__Thumbv7ABSLongThunk_too_far2>
-// CHECK-NEXT:    20008:       00 f0 0a 80     beq.w   #20 <__Thumbv7ABSLongThunk_too_far3>
-// CHECK: __Thumbv7ABSLongThunk_too_far1:
-// CHECK-NEXT:    2000c:       40 f2 05 0c     movw    r12, #5
-// CHECK-NEXT:    20010:       c0 f2 02 1c     movt    r12, #258
-// CHECK-NEXT:    20014:       60 47   bx      r12
-// CHECK: __Thumbv7ABSLongThunk_too_far2:
-// CHECK-NEXT:    20016:       40 f2 09 0c     movw    r12, #9
-// CHECK-NEXT:    2001a:       c0 f2 02 1c     movt    r12, #258
-// CHECK-NEXT:    2001e:       60 47   bx      r12
-// CHECK: __Thumbv7ABSLongThunk_too_far3:
-// CHECK-NEXT:    20020:       40 f2 0d 0c     movw    r12, #13
-// CHECK-NEXT:    20024:       c0 f2 12 0c     movt    r12, #18
-// CHECK-NEXT:    20028:       60 47   bx      r12
-// CHECK-NEXT:    2002a:       00 00   movs    r0, r0
+// CHECK-NEXT: 0002000c <__Thumbv7ABSLongThunk_too_far1>:
+// CHECK-NEXT: 2000c: b.w     0x1020004
+// CHECK-EMPTY:
+// CHECK-NEXT: 00020010 <__Thumbv7ABSLongThunk_too_far2>:
+// CHECK-NEXT: 20010: b.w     0x1020008
+// CHECK-EMPTY:
+// CHECK-NEXT: 00020014 <__Thumbv7ABSLongThunk_too_far3>:
+// CHECK-NEXT: 20014: b.w     0x12000c
diff --git a/lld/test/ELF/dso-undef-size.s b/lld/test/ELF/dso-undef-size.s
@@ -3,30 +3,60 @@
 # RUN: ld.lld -shared %t1.o -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
 # RUN: ld.lld -shared %t2.o %t1.so -o %t2.so
-# RUN: llvm-readobj --symbols --dyn-syms %t2.so
+# RUN: llvm-readobj --symbols --dyn-syms %t2.so | FileCheck %s
 
-# CHECK:      Symbols [
-# CHECK-NEXT:   Symbol {
-# CHECK-NEXT:     Name: foo
-# CHECK-NEXT:     Value:
-# CHECK-NEXT:     Size: 0
-# CHECK-NEXT:     Binding:
-# CHECK-NEXT:     Type:
-# CHECK-NEXT:     Other:
-# CHECK-NEXT:     Section: Undefined
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
-# CHECK:      DynamicSymbols [
-# CHECK-NEXT:   Symbol {
-# CHECK-NEXT:     Name: foo
-# CHECK-NEXT:     Value:
-# CHECK-NEXT:     Size: 0
-# CHECK-NEXT:     Binding:
-# CHECK-NEXT:     Type:
-# CHECK-NEXT:     Other:
-# CHECK-NEXT:     Section: Undefined
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
+# CHECK: Symbols [
+# CHECK-NEXT:  Symbol {
+# CHECK-NEXT:    Name:  (0)
+# CHECK-NEXT:    Value: 0x0
+# CHECK-NEXT:    Size: 0
+# CHECK-NEXT:    Binding: Local (0x0)
+# CHECK-NEXT:    Type: None (0x0)
+# CHECK-NEXT:    Other: 0
+# CHECK-NEXT:    Section: Undefined (0x0)
+# CHECK-NEXT:  }
+# CHECK-NEXT:  Symbol {
+# CHECK-NEXT:    Name: _DYNAMIC (5)
+# skip actual value here:
+# CHECK-NEXT:    Value:
+# CHECK-NEXT:    Size: 0
+# CHECK-NEXT:    Binding: Local (0x0)
+# CHECK-NEXT:    Type: None (0x0)
+# CHECK-NEXT:    Other [ (0x2)
+# CHECK-NEXT:      STV_HIDDEN (0x2)
+# CHECK-NEXT:    ]
+# CHECK-NEXT:    Section: .dynamic (0x6)
+# CHECK-NEXT:  }
+# CHECK-NEXT:  Symbol {
+# CHECK-NEXT:    Name: foo (1)
+# CHECK-NEXT:    Value: 0x0
+# CHECK-NEXT:    Size: 0
+# CHECK-NEXT:    Binding: Global (0x1)
+# CHECK-NEXT:    Type: None (0x0)
+# CHECK-NEXT:    Other: 0
+# CHECK-NEXT:    Section: Undefined (0x0)
+# CHECK-NEXT:  }
+# CHECK-NEXT:]
+# CHECK-NEXT:DynamicSymbols [
+# CHECK-NEXT:  Symbol {
+# CHECK-NEXT:    Name:  (0)
+# CHECK-NEXT:    Value: 0x0
+# CHECK-NEXT:    Size: 0
+# CHECK-NEXT:    Binding: Local (0x0)
+# CHECK-NEXT:    Type: None (0x0)
+# CHECK-NEXT:    Other: 0
+# CHECK-NEXT:    Section: Undefined (0x0)
+# CHECK-NEXT:  }
+# CHECK-NEXT:  Symbol {
+# CHECK-NEXT:    Name: foo (1)
+# CHECK-NEXT:    Value: 0x0
+# CHECK-NEXT:    Size: 0
+# CHECK-NEXT:    Binding: Global (0x1)
+# CHECK-NEXT:    Type: None (0x0)
+# CHECK-NEXT:    Other: 0
+# CHECK-NEXT:    Section: Undefined (0x0)
+# CHECK-NEXT:  }
+# CHECK-NEXT:]
 
 .text
 .global foo
diff --git a/lld/test/ELF/lto/ctor-dtor-alias2.ll b/lld/test/ELF/lto/ctor-dtor-alias2.ll
@@ -7,7 +7,7 @@
 ; RUN: opt -module-summary a.ll -o a.bc
 ; RUN: opt -module-summary b.ll -o b.bc
 ; RUN: ld.lld -shared a.bc b.bc -o out.so
-; RUN: llvm-nm -D out.so
+; RUN: llvm-nm -D out.so | FileCheck %s
 
 ;; Although D0/D2 in b.bc is non-prevailing, keep D1/D2 as definitions, otherwise
 ;; the output may have an undefined and unsatisfied D1.

diff --git a/lld/test/ELF/lto/sparcv9.ll b/lld/test/ELF/lto/sparcv9.ll
@@ -5,7 +5,7 @@
 ; RUN: ld.lld %t.bc -o %t
 ; RUN: llvm-readobj -h %t | FileCheck %s
 
-; CHECK    Class: 64-bit
+; CHECK:   Class: 64-bit
 ; CHECK:   DataEncoding: BigEndian
 ; CHECK: Machine: EM_SPARCV9
 

diff --git a/lld/test/MachO/compact-unwind-foldings.s b/lld/test/MachO/compact-unwind-foldings.s
@@ -23,8 +23,9 @@
 ## Check that [1] offset starts at c's address + 3 (its length).
 # CHECK-LABEL: Contents of __unwind_info section:
 # CHECK:  Top level indices: (count = 2)
-# CHECK-NEXT : [0]: function offset=[[#%#.7x,MAIN_ADDR]]
-# CHECK-NEXT : [1]: function offset=[[#%#.7x,C_ADDR + 3]]
+# FIXME: next two lines commented out, they broken
+# COM: CHECK-NEXT: [0]: function offset=[[#%#.7x,MAIN_ADDR]]
+# COM: CHECK-NEXT: [1]: function offset=[[#%#.7x,C_ADDR + 3]]
 
 #--- fold-tail.s
         .text

diff --git a/lld/test/MachO/eh-frame.s b/lld/test/MachO/eh-frame.s
@@ -66,8 +66,8 @@
 # CHECK:     [2]: function offset=0x[[#%.8x,H - BASE]], LSDA offset=0x[[#%.8x,EXCEPT2 - BASE]]
 # CHECK:   Second level indices:
 # CHECK:     Second level index[0]:
-# CHECK       [0]: function offset=0x[[#%.8x,F - BASE]],              encoding[{{.*}}]=0x52{{.*}}
-# CHECK       [1]: function offset=0x[[#%.8x,NO_UNWIND - BASE]],      encoding[{{.*}}]=0x00000000
+# CHECK:      [0]: function offset=0x[[#%.8x,F - BASE]],              encoding[{{.*}}]=0x52{{.*}}
+# CHECK:      [1]: function offset=0x[[#%.8x,NO_UNWIND - BASE]],      encoding[{{.*}}]=0x00000000
 # CHECK:      [2]: function offset=0x[[#%.8x,G - BASE]],              encoding[{{.*}}]=0x0[[#%x,DWARF_ENC]][[#%.6x, G_DWARF_OFF:]]
 # CHECK:      [3]: function offset=0x[[#%.8x,H - BASE]],              encoding[{{.*}}]=0x0[[#%x,DWARF_ENC]][[#%.6x, H_DWARF_OFF:]]
 # CHECK:      [4]: function offset=0x[[#%.8x,MY_PERSONALITY - BASE]], encoding[{{.*}}]=0x00000000

diff --git a/lld/test/MachO/invalid/undef-debug.s b/lld/test/MachO/invalid/undef-debug.s
@@ -6,7 +6,7 @@
 # CHECK-NEXT: >>> referenced by test.c:3
 # CHECK-NEXT: >>>               {{.*}}.o:(symbol _main+0x0)
 # CHECK-NEXT: >>> referenced by test.c:2
-# CHECK-NEXT  >>>               {{.*}}.o:(symbol _ptr+0x0)
+# CHECK-NEXT: >>>               {{.*}}.o:(symbol _ptr+0x0)
 
 ## This is the output of `clang -g2 -O2 -fdebug-compilation-dir=. -fno-ident` called on the following file, with the
 ## Apple DWARF tables removed:

diff --git a/lld/test/wasm/tag-section.ll b/lld/test/wasm/tag-section.ll
@@ -44,7 +44,7 @@ define void @_start() {
 ; NOPIC:        - Type:            GLOBAL
 
 ; NOPIC-EXPORT-ALL:   - Type:            EXPORT
-; NOPIC-EXPORT-ALL-NEXT Exports:
+; NOPIC-EXPORT-ALL-NEXT: Exports:
 ; NOPIC-EXPORT-ALL:       - Name:            __cpp_exception
 ; NOPIC-EXPORT-ALL:         Kind:            TAG
 ; NOPIC-EXPORT-ALL:         Index:           0