From 74283fc8534b729f5e15ae934de15c01fd6db9c0 Mon Sep 17 00:00:00 2001 From: Jez Ng Date: Sun, 11 Apr 2021 23:23:37 -0400 Subject: [PATCH] [lld-macho][nfc] Convert tabs to spaces --- lld/test/MachO/arm64-reloc-got-load.s | 24 ++++++------- lld/test/MachO/arm64-reloc-pointer-to-got.s | 6 ++-- lld/test/MachO/arm64-relocs.s | 14 ++++---- lld/test/MachO/indirect-symtab.s | 12 +++---- .../invalid/bad-got-to-dylib-tlv-reference.s | 2 +- lld/test/MachO/invalid/bad-tlv-def.s | 4 +-- lld/test/MachO/invalid/bad-tlv-opcode.s | 2 +- lld/test/MachO/mattrs.ll | 20 +++++------ lld/test/MachO/objc.s | 4 +-- lld/test/MachO/tlv-dylib.s | 2 +- lld/test/MachO/tlv.s | 34 +++++++++---------- lld/test/MachO/weak-binding.s | 12 +++---- lld/test/MachO/weak-reference.s | 2 +- lld/test/MachO/why-load.s | 2 +- lld/test/MachO/x86-64-reloc-got-load.s | 2 +- 15 files changed, 71 insertions(+), 71 deletions(-) diff --git a/lld/test/MachO/arm64-reloc-got-load.s b/lld/test/MachO/arm64-reloc-got-load.s index d627c8a04096..ee1ce1ea1aef 100644 --- a/lld/test/MachO/arm64-reloc-got-load.s +++ b/lld/test/MachO/arm64-reloc-got-load.s @@ -12,10 +12,10 @@ # RUN: llvm-objdump --macho -d --no-show-raw-insn --section-headers %t/main | FileCheck %s --check-prefix=DYLIB # STATIC-LABEL: _main: -# STATIC-NEXT: adrp x8, [[#]] ; 0x[[#%x,PAGE:]] -# STATIC-NEXT: add x8, x8, #[[#%u,FOO_OFF:]] -# STATIC-NEXT: adrp x8, [[#]] ; 0x[[#PAGE]] -# STATIC-NEXT: add x8, x8, #[[#%u,BAR_OFF:]] +# STATIC-NEXT: adrp x8, [[#]] ; 0x[[#%x,PAGE:]] +# STATIC-NEXT: add x8, x8, #[[#%u,FOO_OFF:]] +# STATIC-NEXT: adrp x8, [[#]] ; 0x[[#PAGE]] +# STATIC-NEXT: add x8, x8, #[[#%u,BAR_OFF:]] # STATIC-NEXT: ret # STATIC-LABEL: SYMBOL TABLE: @@ -23,10 +23,10 @@ # STATIC-DAG: {{0*}}[[#%x,PAGE+BAR_OFF]] g F __TEXT,__text _bar # DYLIB-LABEL: _main: -# DYLIB-NEXT: adrp x8, [[#]] ; 0x[[#%x,GOT:]] -# DYLIB-NEXT: ldr x8, [x8, #8] ; literal pool symbol address: _foo -# DYLIB-NEXT: adrp x8, [[#]] ; 0x[[#GOT]] -# DYLIB-NEXT: ldr x8, [x8] ; literal pool symbol address: _bar +# DYLIB-NEXT: adrp x8, [[#]] ; 0x[[#%x,GOT:]] +# DYLIB-NEXT: ldr x8, [x8, #8] ; literal pool symbol address: _foo +# DYLIB-NEXT: adrp x8, [[#]] ; 0x[[#GOT]] +# DYLIB-NEXT: ldr x8, [x8] ; literal pool symbol address: _bar # DYLIB-NEXT: ret # DYLIB-NEXT: Sections: # DYLIB-NEXT: Idx Name Size VMA Type @@ -36,10 +36,10 @@ .globl _main, _foo, _bar .p2align 2 _main: - adrp x8, _foo@GOTPAGE - ldr x8, [x8, _foo@GOTPAGEOFF] - adrp x8, _bar@GOTPAGE - ldr x8, [x8, _bar@GOTPAGEOFF] + adrp x8, _foo@GOTPAGE + ldr x8, [x8, _foo@GOTPAGEOFF] + adrp x8, _bar@GOTPAGE + ldr x8, [x8, _bar@GOTPAGEOFF] ret #--- foobar.s diff --git a/lld/test/MachO/arm64-reloc-pointer-to-got.s b/lld/test/MachO/arm64-reloc-pointer-to-got.s index 65ad802855af..3d9eba0555c8 100644 --- a/lld/test/MachO/arm64-reloc-pointer-to-got.s +++ b/lld/test/MachO/arm64-reloc-pointer-to-got.s @@ -8,9 +8,9 @@ ## POINTER_TO_GOT, we should still be able to relax this GOT_LOAD reference to ## it. # CHECK: _main: -# CHECK-NEXT: adrp x8, [[#]] ; -# CHECK-NEXT: ldr x8, [x8] ; literal pool symbol address: _foo -# CHECK-NEXT: ret +# CHECK-NEXT: adrp x8, [[#]] ; +# CHECK-NEXT: ldr x8, [x8] ; literal pool symbol address: _foo +# CHECK-NEXT: ret # CHECK: Idx Name Size VMA Type # CHECK: [[#]] __got 00000008 0000000100004000 DATA diff --git a/lld/test/MachO/arm64-relocs.s b/lld/test/MachO/arm64-relocs.s index bf5931a797e2..e45c5ddb1a72 100644 --- a/lld/test/MachO/arm64-relocs.s +++ b/lld/test/MachO/arm64-relocs.s @@ -13,17 +13,17 @@ # CHECK-LABEL: _foo: ## BRANCH26 relocations are 4-byte aligned, so 123 is truncated to 120 -# CHECK-NEXT: bl 0x[[#BAR+120]] +# CHECK-NEXT: bl 0x[[#BAR+120]] ## PAGE21 relocations are aligned to 4096 bytes -# CHECK-NEXT: adrp x2, [[#]] ; 0x[[#BAZ+4096-128]] -# CHECK-NEXT: ldr x2, [x2, #128] -# CHECK-NEXT: adrp x3, 8 ; 0x8000 -# CHECK-NEXT: ldr q0, [x3, #144] +# CHECK-NEXT: adrp x2, [[#]] ; 0x[[#BAZ+4096-128]] +# CHECK-NEXT: ldr x2, [x2, #128] +# CHECK-NEXT: adrp x3, 8 ; 0x8000 +# CHECK-NEXT: ldr q0, [x3, #144] # CHECK-NEXT: ret # CHECK-LABEL: Contents of (__DATA_CONST,__const) section -# CHECK: [[#PTR_1]] {{0*}}[[#BAZ]] 00000000 00000000 00000000 -# CHECK: [[#PTR_2]] {{0*}}[[#BAZ+123]] 00000000 00000000 00000000 +# CHECK: [[#PTR_1]] {{0*}}[[#BAZ]] 00000000 00000000 00000000 +# CHECK: [[#PTR_2]] {{0*}}[[#BAZ+123]] 00000000 00000000 00000000 .text .globl _foo, _bar, _baz, _quux diff --git a/lld/test/MachO/indirect-symtab.s b/lld/test/MachO/indirect-symtab.s index a3790fc7a106..b8b23698b92f 100644 --- a/lld/test/MachO/indirect-symtab.s +++ b/lld/test/MachO/indirect-symtab.s @@ -8,12 +8,12 @@ # CHECK: (__TEXT,__text) section # CHECK-NEXT: _main: -# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _foo -# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _bar -# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _foo_tlv -# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _bar_tlv -# CHECK-NEXT: callq {{.*}} ## symbol stub for: _foo_fn -# CHECK-NEXT: callq {{.*}} ## symbol stub for: _bar_fn +# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _foo +# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _bar +# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _foo_tlv +# CHECK-NEXT: movq {{.*}}(%rip), %rax ## literal pool symbol address: _bar_tlv +# CHECK-NEXT: callq {{.*}} ## symbol stub for: _foo_fn +# CHECK-NEXT: callq {{.*}} ## symbol stub for: _bar_fn # CHECK-NEXT: retq # CHECK: Indirect symbols for (__TEXT,__stubs) 2 entries diff --git a/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s b/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s index 6824282045fc..da1b30f3ea50 100644 --- a/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s +++ b/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s @@ -11,7 +11,7 @@ # CHECK: error: GOT_LOAD relocation requires that variable not be thread-local for `_foo' in [[FILE]]:(__text) #--- libtlv.s -.section __DATA,__thread_vars,thread_local_variables +.section __DATA,__thread_vars,thread_local_variables .globl _foo _foo: diff --git a/lld/test/MachO/invalid/bad-tlv-def.s b/lld/test/MachO/invalid/bad-tlv-def.s index 4806e429579f..316d2647de90 100644 --- a/lld/test/MachO/invalid/bad-tlv-def.s +++ b/lld/test/MachO/invalid/bad-tlv-def.s @@ -9,7 +9,7 @@ _main: ret -.section __DATA,__thread_vars,thread_local_variables -.globl _foo, _bar +.section __DATA,__thread_vars,thread_local_variables +.globl _foo, _bar _foo: movq _bar@GOTPCREL(%rip), %rax diff --git a/lld/test/MachO/invalid/bad-tlv-opcode.s b/lld/test/MachO/invalid/bad-tlv-opcode.s index 28d03048bf47..b6991d352ae9 100644 --- a/lld/test/MachO/invalid/bad-tlv-opcode.s +++ b/lld/test/MachO/invalid/bad-tlv-opcode.s @@ -10,5 +10,5 @@ _main: leaq _foo@TLVP(%rip), %rax ret -.section __DATA,__thread_vars,thread_local_variables +.section __DATA,__thread_vars,thread_local_variables _foo: diff --git a/lld/test/MachO/mattrs.ll b/lld/test/MachO/mattrs.ll index 8771f02e0c50..ed49b5dde575 100644 --- a/lld/test/MachO/mattrs.ll +++ b/lld/test/MachO/mattrs.ll @@ -10,18 +10,18 @@ ; RUN: llvm-objdump -d --section="__text" --no-leading-addr --no-show-raw-insn %t.dylib | FileCheck %s --check-prefix=NO-FMA ; FMA: <_foo>: -; FMA-NEXT: vrcpss %xmm0, %xmm0, %xmm1 -; FMA-NEXT: vfmsub213ss 7(%rip), %xmm1, %xmm0 -; FMA-NEXT: vfnmadd132ss %xmm1, %xmm1, %xmm0 -; FMA-NEXT: retq +; FMA-NEXT: vrcpss %xmm0, %xmm0, %xmm1 +; FMA-NEXT: vfmsub213ss 7(%rip), %xmm1, %xmm0 +; FMA-NEXT: vfnmadd132ss %xmm1, %xmm1, %xmm0 +; FMA-NEXT: retq ; NO-FMA: <_foo>: -; NO-FMA-NEXT: vrcpss %xmm0, %xmm0, %xmm1 -; NO-FMA-NEXT: vmulss %xmm1, %xmm0, %xmm0 -; NO-FMA-NEXT: vmovss 16(%rip), %xmm2 -; NO-FMA-NEXT: vsubss %xmm0, %xmm2, %xmm0 -; NO-FMA-NEXT: vmulss %xmm0, %xmm1, %xmm0 -; NO-FMA-NEXT: vaddss %xmm0, %xmm1, %xmm0 +; NO-FMA-NEXT: vrcpss %xmm0, %xmm0, %xmm1 +; NO-FMA-NEXT: vmulss %xmm1, %xmm0, %xmm0 +; NO-FMA-NEXT: vmovss 16(%rip), %xmm2 +; NO-FMA-NEXT: vsubss %xmm0, %xmm2, %xmm0 +; NO-FMA-NEXT: vmulss %xmm0, %xmm1, %xmm0 +; NO-FMA-NEXT: vaddss %xmm0, %xmm1, %xmm0 ; NO-FMA-NEXT: retq target triple = "x86_64-apple-darwin" diff --git a/lld/test/MachO/objc.s b/lld/test/MachO/objc.s index dafee74796d0..8a7226fe8eb0 100644 --- a/lld/test/MachO/objc.s +++ b/lld/test/MachO/objc.s @@ -40,11 +40,11 @@ _OBJC_CLASS_$_MyObject: #--- has-objc-category.s -.section __DATA,__objc_catlist +.section __DATA,__objc_catlist .quad 0x1234 #--- has-swift.s -.section __TEXT,__swift +.section __TEXT,__swift .quad 0x1234 #--- no-objc.s diff --git a/lld/test/MachO/tlv-dylib.s b/lld/test/MachO/tlv-dylib.s index 74e27e9e24d1..6393fe3ecd33 100644 --- a/lld/test/MachO/tlv-dylib.s +++ b/lld/test/MachO/tlv-dylib.s @@ -27,7 +27,7 @@ # CHECK-DAG: __DATA_CONST __got 0x{{0*}}[[#%x, BAZ]] pointer 0 libtlv _baz #--- libtlv.s -.section __DATA,__thread_vars,thread_local_variables +.section __DATA,__thread_vars,thread_local_variables .globl _foo, _bar, _baz _foo: _bar: diff --git a/lld/test/MachO/tlv.s b/lld/test/MachO/tlv.s index 1e1835bf78b9..6a3f5f1e02e4 100644 --- a/lld/test/MachO/tlv.s +++ b/lld/test/MachO/tlv.s @@ -76,24 +76,24 @@ _main: mov _bar@TLVP(%rip), %rax ret -.section __DATA,__thread_data,thread_local_regular +.section __DATA,__thread_data,thread_local_regular _foo$tlv$init: .quad 123 -.section __DATA,more_thread_data,thread_local_regular +.section __DATA,more_thread_data,thread_local_regular _bar$tlv$init: .quad 123 -.section __DATA,__thread_vars,thread_local_variables -.globl _foo, _bar +.section __DATA,__thread_vars,thread_local_variables +.globl _foo, _bar _foo: - .quad __tlv_bootstrap - .quad 0 - .quad _foo$tlv$init + .quad __tlv_bootstrap + .quad 0 + .quad _foo$tlv$init _bar: - .quad __tlv_bootstrap - .quad 0 - .quad _bar$tlv$init + .quad __tlv_bootstrap + .quad 0 + .quad _bar$tlv$init #--- tbss.s @@ -106,12 +106,12 @@ _f: .tbss _baz$tlv$init, 8, 3 .tbss _qux$tlv$init, 8, 3 -.section __DATA,__thread_vars,thread_local_variables +.section __DATA,__thread_vars,thread_local_variables _baz: - .quad __tlv_bootstrap - .quad 0 - .quad _baz$tlv$init + .quad __tlv_bootstrap + .quad 0 + .quad _baz$tlv$init _qux: - .quad __tlv_bootstrap - .quad 0 - .quad _qux$tlv$init + .quad __tlv_bootstrap + .quad 0 + .quad _qux$tlv$init diff --git a/lld/test/MachO/weak-binding.s b/lld/test/MachO/weak-binding.s index b237d106742a..d922d3602131 100644 --- a/lld/test/MachO/weak-binding.s +++ b/lld/test/MachO/weak-binding.s @@ -19,12 +19,12 @@ # CHECK-NEXT: {{[0-9a-f]+}} {{[0-9a-f ]*[1-9a-f]+[0-9a-f ]*}} # CHECK: <_main>: -# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_DY_GOT_ADDR:]] -# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_EXT_GOT_ADDR:]] -# CHECK-NEXT: leaq [[#]](%rip), %rax # [[#%X,WEAK_INT_GOT_ADDR:]] -# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_TLV_ADDR:]] -# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_DY_TLV_ADDR:]] -# CHECK-NEXT: leaq [[#]](%rip), %rax # [[#%X,WEAK_INT_TLV_ADDR:]] +# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_DY_GOT_ADDR:]] +# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_EXT_GOT_ADDR:]] +# CHECK-NEXT: leaq [[#]](%rip), %rax # [[#%X,WEAK_INT_GOT_ADDR:]] +# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_TLV_ADDR:]] +# CHECK-NEXT: movq [[#]](%rip), %rax # [[#%X,WEAK_DY_TLV_ADDR:]] +# CHECK-NEXT: leaq [[#]](%rip), %rax # [[#%X,WEAK_INT_TLV_ADDR:]] # CHECK-NEXT: callq 0x{{[0-9a-f]*}} # CHECK-NEXT: callq 0x{{[0-9a-f]*}} # CHECK-NEXT: callq 0x{{[0-9a-f]*}} diff --git a/lld/test/MachO/weak-reference.s b/lld/test/MachO/weak-reference.s index 4e4f488e1d4a..6847db1c5df3 100644 --- a/lld/test/MachO/weak-reference.s +++ b/lld/test/MachO/weak-reference.s @@ -101,7 +101,7 @@ _foo_fn: _weak_foo: _weak_foo_fn: -.section __DATA,__thread_vars,thread_local_variables +.section __DATA,__thread_vars,thread_local_variables .globl _foo_tlv _foo_tlv: diff --git a/lld/test/MachO/why-load.s b/lld/test/MachO/why-load.s index 22a22a957bc1..34de4fb2f8d4 100644 --- a/lld/test/MachO/why-load.s +++ b/lld/test/MachO/why-load.s @@ -61,7 +61,7 @@ # WHYOBJCALLFORCE-DAG: -force_load forced load of lib.a(objc.o) #--- objc.s -.section __DATA,__objc_catlist +.section __DATA,__objc_catlist .quad 0x1234 #--- foo.s diff --git a/lld/test/MachO/x86-64-reloc-got-load.s b/lld/test/MachO/x86-64-reloc-got-load.s index 236933403ee6..9bc65ecefa4d 100644 --- a/lld/test/MachO/x86-64-reloc-got-load.s +++ b/lld/test/MachO/x86-64-reloc-got-load.s @@ -6,7 +6,7 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o # RUN: %lld -o %t %t.o # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s -# CHECK: leaq [[#]](%rip), %rax # {{.*}} <_foo> +# CHECK: leaq [[#]](%rip), %rax # {{.*}} <_foo> .globl _main, _foo