diff --git a/lld/test/COFF/arm64-import2.test b/lld/test/COFF/arm64-import2.test --- a/lld/test/COFF/arm64-import2.test +++ b/lld/test/COFF/arm64-import2.test @@ -7,11 +7,13 @@ # RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS # BEFORE: Disassembly of section .text: +# BEFORE-EMPTY: # BEFORE: 0: 00 00 00 94 bl #0 # BEFORE: 4: 00 00 00 94 bl #0 # BEFORE: 8: c0 03 5f d6 ret # AFTER: Disassembly of section .text: +# AFTER-EMPTY: # AFTER: 140001000: 03 00 00 94 bl #12 # AFTER: 140001004: 05 00 00 94 bl #20 # AFTER: 140001008: c0 03 5f d6 ret diff --git a/lld/test/COFF/arm64-relocs-imports.test b/lld/test/COFF/arm64-relocs-imports.test --- a/lld/test/COFF/arm64-relocs-imports.test +++ b/lld/test/COFF/arm64-relocs-imports.test @@ -6,6 +6,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER # BEFORE: Disassembly of section .text: +# BEFORE-EMPTY: # BEFORE: 0: fe 0f 1f f8 str x30, [sp, #-16]! # BEFORE: 4: 00 00 00 90 adrp x0, #0 # BEFORE: 8: 00 08 00 91 add x0, x0, #2 @@ -48,6 +49,7 @@ # BEFORE: 9c: 01 00 00 00 udf #1 # AFTER: Disassembly of section .text: +# AFTER-EMPTY: # AFTER: 140001000: fe 0f 1f f8 str x30, [sp, #-16]! # AFTER: 140001004: 00 00 00 b0 adrp x0, #4096 # AFTER: 140001008: 00 18 00 91 add x0, x0, #6 diff --git a/lld/test/COFF/armnt-blx23t.test b/lld/test/COFF/armnt-blx23t.test --- a/lld/test/COFF/armnt-blx23t.test +++ b/lld/test/COFF/armnt-blx23t.test @@ -6,6 +6,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER # BEFORE: Disassembly of section .text: +# BEFORE-EMPTY: # BEFORE: 0: 70 47 bx lr # BEFORE: 2: 00 bf nop # BEFORE: 4: 2d e9 00 48 push.w {r11, lr} @@ -16,6 +17,7 @@ # BEFORE: 12: bd e8 00 88 pop.w {r11, pc} # AFTER: Disassembly of section .text: +# AFTER-EMPTY: # AFTER: 1000: 70 47 bx lr # AFTER: 1002: 00 bf nop # AFTER: 1004: 2d e9 00 48 push.w {r11, lr} diff --git a/lld/test/COFF/armnt-branch24t.test b/lld/test/COFF/armnt-branch24t.test --- a/lld/test/COFF/armnt-branch24t.test +++ b/lld/test/COFF/armnt-branch24t.test @@ -6,12 +6,14 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER # BEFORE: Disassembly of section .text: +# BEFORE-EMPTY: # BEFORE: 0: 70 47 bx lr # BEFORE: 2: 00 bf nop # BEFORE: 4: 20 20 movs r0, #32 # BEFORE: 6: 00 f0 00 b8 b.w #0 # AFTER: Disassembly of section .text: +# AFTER-EMPTY: # AFTER: .text: # AFTER: 1000: 70 47 bx lr # AFTER: 1002: 00 bf nop diff --git a/lld/test/COFF/armnt-mov32t-exec.test b/lld/test/COFF/armnt-mov32t-exec.test --- a/lld/test/COFF/armnt-mov32t-exec.test +++ b/lld/test/COFF/armnt-mov32t-exec.test @@ -6,6 +6,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER # BEFORE: Disassembly of section .text: +# BEFORE-EMPTY: # BEFORE: 0: 70 47 bx lr # BEFORE: 2: 00 bf nop # BEFORE: 4: 40 f2 00 00 movw r0, #0 @@ -13,6 +14,7 @@ # BEFORE: c: 70 47 bx lr # AFTER: Disassembly of section .text: +# AFTER-EMPTY: # AFTER: 1000: 70 47 bx lr # AFTER: 1002: 00 bf nop # AFTER: 1004: 41 f2 01 00 movw r0, #4097 diff --git a/lld/test/COFF/armnt-movt32t.test b/lld/test/COFF/armnt-movt32t.test --- a/lld/test/COFF/armnt-movt32t.test +++ b/lld/test/COFF/armnt-movt32t.test @@ -6,11 +6,13 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER # BEFORE: Disassembly of section .text: +# BEFORE-EMPTY: # BEFORE: 0: 40 f2 00 00 movw r0, #0 # BEFORE: 4: c0 f2 00 00 movt r0, #0 # BEFORE: 8: 70 47 bx lr # AFTER: Disassembly of section .text: +# AFTER-EMPTY: # AFTER: 0: 42 f2 00 00 movw r0, #8192 # AFTER: 4: c0 f2 40 00 movt r0, #64 # AFTER: 8: 70 47 bx lr diff --git a/lld/test/COFF/autoimport-refptr.s b/lld/test/COFF/autoimport-refptr.s --- a/lld/test/COFF/autoimport-refptr.s +++ b/lld/test/COFF/autoimport-refptr.s @@ -19,6 +19,7 @@ # IMPORTS-NEXT: } # DISASM: Disassembly of section .text: +# DISASM-EMPTY: # DISASM: .text: # Relative offset at 0x1002 pointing at the IAT at 0x2060 # DISASM: 140001000: 48 8b 05 59 10 00 00 movq 4185(%rip), %rax diff --git a/lld/test/COFF/autoimport-x86.s b/lld/test/COFF/autoimport-x86.s --- a/lld/test/COFF/autoimport-x86.s +++ b/lld/test/COFF/autoimport-x86.s @@ -19,6 +19,7 @@ # IMPORTS-NEXT: } # DISASM: Disassembly of section .text: +# DISASM-EMPTY: # DISASM: .text: # Relative offset at 0x1002 pointing at the IAT at 0x2080. # DISASM: 140001000: 8b 05 7a 10 00 00 movl 4218(%rip), %eax diff --git a/lld/test/COFF/imports.test b/lld/test/COFF/imports.test --- a/lld/test/COFF/imports.test +++ b/lld/test/COFF/imports.test @@ -12,6 +12,7 @@ # RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s TEXT: Disassembly of section .text: +TEXT-EMPTY: TEXT-NEXT: .text: TEXT-NEXT: subq $40, %rsp TEXT-NEXT: movq $0, %rcx diff --git a/lld/test/COFF/lto-comdat.ll b/lld/test/COFF/lto-comdat.ll --- a/lld/test/COFF/lto-comdat.ll +++ b/lld/test/COFF/lto-comdat.ll @@ -42,12 +42,14 @@ ; HEADERS-11: AddressOfEntryPoint: 0x1000 ; TEXT-11: Disassembly of section .text: +; TEXT-11-EMPTY: ; TEXT-11-NEXT: .text: ; TEXT-11-NEXT: xorl %eax, %eax ; TEXT-11-NEXT: retq ; HEADERS-01: AddressOfEntryPoint: 0x1000 ; TEXT-01: Disassembly of section .text: +; TEXT-01-EMPTY: ; TEXT-01-NEXT: .text: ; TEXT-01-NEXT: subq $40, %rsp ; TEXT-01-NEXT: callq 23 @@ -65,6 +67,7 @@ ; HEADERS-10: AddressOfEntryPoint: 0x1020 ; TEXT-10: Disassembly of section .text: +; TEXT-10-EMPTY: ; TEXT-10-NEXT: .text: ; TEXT-10-NEXT: subq $40, %rsp ; TEXT-10-NEXT: callq 55 diff --git a/lld/test/COFF/lto.ll b/lld/test/COFF/lto.ll --- a/lld/test/COFF/lto.ll +++ b/lld/test/COFF/lto.ll @@ -34,6 +34,7 @@ ; HEADERS-11: AddressOfEntryPoint: 0x1000 ; TEXT-11: Disassembly of section .text: +; TEXT-11-EMPTY: ; TEXT-11-NEXT: .text: ; TEXT-11-NEXT: xorl %eax, %eax ; TEXT-11-NEXT: retq @@ -55,6 +56,7 @@ ; HEADERS-01: AddressOfEntryPoint: 0x1000 ; TEXT-01: Disassembly of section .text: +; TEXT-01-EMPTY: ; TEXT-01-NEXT: .text: ; TEXT-01-NEXT: subq $40, %rsp ; TEXT-01-NEXT: callq 23 @@ -81,6 +83,7 @@ ; HEADERS-10: AddressOfEntryPoint: 0x1020 ; TEXT-10: Disassembly of section .text: +; TEXT-10-EMPTY: ; TEXT-10-NEXT: .text: ; TEXT-10-NEXT: retq ; TEXT-10-NEXT: nop diff --git a/lld/test/ELF/aarch64-call26-thunk.s b/lld/test/ELF/aarch64-call26-thunk.s --- a/lld/test/ELF/aarch64-call26-thunk.s +++ b/lld/test/ELF/aarch64-call26-thunk.s @@ -10,6 +10,7 @@ bl big // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 210000: 02 00 00 94 bl #8 // CHECK: __AArch64AbsLongThunk_big: diff --git a/lld/test/ELF/aarch64-condb-reloc.s b/lld/test/ELF/aarch64-condb-reloc.s --- a/lld/test/ELF/aarch64-condb-reloc.s +++ b/lld/test/ELF/aarch64-condb-reloc.s @@ -11,6 +11,7 @@ # 0x11028 - 24 = 0x11010 # 0x1102c - 16 = 0x1101c # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: _foo: # CHECK-NEXT: 210000: {{.*}} nop # CHECK-NEXT: 210004: {{.*}} nop @@ -53,6 +54,7 @@ #DSOREL-NEXT:] #DSO: Disassembly of section .text: +#DSO-EMPTY: #DSO-NEXT: _foo: #DSO-NEXT: 10000: {{.*}} nop #DSO-NEXT: 10004: {{.*}} nop @@ -69,7 +71,9 @@ #DSO-NEXT: 10024: {{.*}} b.eq #44 #DSO-NEXT: 10028: {{.*}} b.eq #56 #DSO-NEXT: 1002c: {{.*}} b.eq #68 +#DSO-EMPTY: #DSO-NEXT: Disassembly of section .plt: +#DSO-EMPTY: #DSO-NEXT: .plt: #DSO-NEXT: 10030: {{.*}} stp x16, x30, [sp, #-16]! #DSO-NEXT: 10034: {{.*}} adrp x16, #131072 diff --git a/lld/test/ELF/aarch64-copy.s b/lld/test/ELF/aarch64-copy.s --- a/lld/test/ELF/aarch64-copy.s +++ b/lld/test/ELF/aarch64-copy.s @@ -77,6 +77,7 @@ // CHECK: ] // CODE: Disassembly of section .text: +// CODE-EMPTY: // CODE-NEXT: _start: // S(x) = 0x230000, A = 0, P = 0x210000 // S + A - P = 0x20000 = 131072 diff --git a/lld/test/ELF/aarch64-gnu-ifunc-address-pie.s b/lld/test/ELF/aarch64-gnu-ifunc-address-pie.s --- a/lld/test/ELF/aarch64-gnu-ifunc-address-pie.s +++ b/lld/test/ELF/aarch64-gnu-ifunc-address-pie.s @@ -33,7 +33,9 @@ # CHECK-NEXT: 10008: 08 41 00 91 add x8, x8, #16 # x8 = 0x10010 = .plt for myfunc # CHECK-NEXT: 1000c: c0 03 5f d6 ret +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section .plt: +# CHECK-EMPTY: # CHECK-NEXT: 0000000000010010 myfunc: # CHECK-NEXT: 10010: 10 01 00 90 adrp x16, #131072 # CHECK-NEXT: 10014: 11 02 40 f9 ldr x17, [x16] diff --git a/lld/test/ELF/aarch64-gnu-ifunc-address.s b/lld/test/ELF/aarch64-gnu-ifunc-address.s --- a/lld/test/ELF/aarch64-gnu-ifunc-address.s +++ b/lld/test/ELF/aarch64-gnu-ifunc-address.s @@ -28,6 +28,7 @@ # CHECK-NEXT: 1000c: c0 03 5f d6 ret # CHECK: Disassembly of section .got: +# CHECK-EMPTY: # CHECK-NEXT: 00000000000200a0 .got: # CHECK-RELOCS: Relocations [ diff --git a/lld/test/ELF/aarch64-gnu-ifunc-plt.s b/lld/test/ELF/aarch64-gnu-ifunc-plt.s --- a/lld/test/ELF/aarch64-gnu-ifunc-plt.s +++ b/lld/test/ELF/aarch64-gnu-ifunc-plt.s @@ -30,6 +30,7 @@ // Check that a PLT header is written and the ifunc entries appear last // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 210000: {{.*}} ret // DISASM: bar: @@ -39,7 +40,9 @@ // DISASM-NEXT: 21000c: {{.*}} bl #100 // DISASM-NEXT: 210010: {{.*}} bl #48 // DISASM-NEXT: 210014: {{.*}} bl #60 +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 210020: {{.*}} stp x16, x30, [sp, #-16]! // DISASM-NEXT: 210024: {{.*}} adrp x16, #131072 diff --git a/lld/test/ELF/aarch64-gnu-ifunc.s b/lld/test/ELF/aarch64-gnu-ifunc.s --- a/lld/test/ELF/aarch64-gnu-ifunc.s +++ b/lld/test/ELF/aarch64-gnu-ifunc.s @@ -100,6 +100,7 @@ // 392 = 0x188 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 210000: c0 03 5f d6 ret // DISASM: bar: @@ -109,7 +110,9 @@ // DISASM-NEXT: 21000c: 09 00 00 94 bl #36 // DISASM-NEXT: 210010: 42 60 05 91 add x2, x2, #344 // DISASM-NEXT: 210014: 42 20 06 91 add x2, x2, #392 +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 210020: 90 00 00 90 adrp x16, #65536 // DISASM-NEXT: 210024: 11 02 40 f9 ldr x17, [x16] diff --git a/lld/test/ELF/aarch64-gnu-ifunc2.s b/lld/test/ELF/aarch64-gnu-ifunc2.s --- a/lld/test/ELF/aarch64-gnu-ifunc2.s +++ b/lld/test/ELF/aarch64-gnu-ifunc2.s @@ -5,6 +5,7 @@ # RUN: llvm-readobj -r %tout | FileCheck %s --check-prefix=RELOC # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: myfunc: # CHECK-NEXT: 210000: @@ -15,6 +16,7 @@ # CHECK-NEXT: 21000c: {{.*}} ret # CHECK: Disassembly of section .plt: +# CHECK-EMPTY: # CHECK-NEXT: .plt: # adrp x16, 0x220000, 0x220000 == address in .got.plt # CHECK-NEXT: 210010: {{.*}} adrp x16, #65536 @@ -23,6 +25,7 @@ # CHECK-NEXT: 21001c: {{.*}} br x17 # CHECK: Disassembly of section .got.plt: +# CHECK-EMPTY: # CHECK-NEXT: .got.plt: # CHECK-NEXT: 220000: diff --git a/lld/test/ELF/aarch64-gnu-ifunc3.s b/lld/test/ELF/aarch64-gnu-ifunc3.s --- a/lld/test/ELF/aarch64-gnu-ifunc3.s +++ b/lld/test/ELF/aarch64-gnu-ifunc3.s @@ -25,6 +25,7 @@ ret # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: myfunc_resolver: # CHECK-NEXT: 210000: c0 03 5f d6 ret # CHECK: _start: @@ -32,14 +33,18 @@ # CHECK-NEXT: 210004: 08 00 00 90 adrp x8, #0 # CHECK-NEXT: 210008: 08 41 00 91 add x8, x8, #16 # CHECK-NEXT: 21000c: c0 03 5f d6 ret +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section .plt: +# CHECK-EMPTY: # CHECK-NEXT: myfunc: # adrp x16, 0x220000, 0x220000 == address in .got.plt # CHECK-NEXT: 210010: 90 00 00 90 adrp x16, #65536 # CHECK-NEXT: 210014: 11 02 40 f9 ldr x17, [x16] # CHECK-NEXT: 210018: 10 02 00 91 add x16, x16, #0 # CHECK-NEXT: 21001c: 20 02 1f d6 br x17 +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section .got.plt: +# CHECK-EMPTY: # CHECK-NEXT: .got.plt: # 0x210010 == address in .plt # CHECK-NEXT: 220000: 10 00 21 00 diff --git a/lld/test/ELF/aarch64-jump26-thunk.s b/lld/test/ELF/aarch64-jump26-thunk.s --- a/lld/test/ELF/aarch64-jump26-thunk.s +++ b/lld/test/ELF/aarch64-jump26-thunk.s @@ -10,6 +10,7 @@ b big // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 210000: 02 00 00 14 b #8 // CHECK: __AArch64AbsLongThunk_big: diff --git a/lld/test/ELF/aarch64-relocs.s b/lld/test/ELF/aarch64-relocs.s --- a/lld/test/ELF/aarch64-relocs.s +++ b/lld/test/ELF/aarch64-relocs.s @@ -12,6 +12,7 @@ msgend: # CHECK: Disassembly of section .R_AARCH64_ADR_PREL_LO21: +# CHECK-EMPTY: # CHECK: _start: # CHECK: 0: 21 00 00 10 adr x1, #4 # CHECK: msg: @@ -29,6 +30,7 @@ # PAGE(P) = 0x210000 # # CHECK: Disassembly of section .R_AARCH64_ADR_PREL_PG_H121: +# CHECK-EMPTY: # CHECK-NEXT: $x.2: # CHECK-NEXT: 210012: 01 00 00 90 adrp x1, #0 @@ -43,6 +45,7 @@ # R << 10 = 0x7c00 # # CHECK: Disassembly of section .R_AARCH64_ADD_ABS_LO12_NC: +# CHECK-EMPTY: # CHECK-NEXT: $x.4: # CHECK-NEXT: 21001b: 00 7c 00 91 add x0, x0, #31 @@ -56,6 +59,7 @@ # R = ((S + A) & 0xFFF) << 7 = 0x00001400 # 0x00001400 | 0xf940177c = 0xf940177c # CHECK: Disassembly of section .R_AARCH64_LDST64_ABS_LO12_NC: +# CHECK-EMPTY: # CHECK-NEXT: $x.6: # CHECK-NEXT: 210024: 7c 17 40 f9 ldr x28, [x27, #40] @@ -65,6 +69,7 @@ nop # CHECK: Disassembly of section .SUB: +# CHECK-EMPTY: # CHECK-NEXT: $x.8: # CHECK-NEXT: 21002c: 1f 20 03 d5 nop # CHECK: sub: @@ -79,6 +84,7 @@ # (R & 0x0ffffffc) >> 2 = 0x03ffffff # 0x94000000 | 0x03ffffff = 0x97ffffff # CHECK: Disassembly of section .R_AARCH64_CALL26: +# CHECK-EMPTY: # CHECK-NEXT: call26: # CHECK-NEXT: 210034: ff ff ff 97 bl #-4 @@ -91,6 +97,7 @@ # (R & 0x0ffffffc) >> 2 = 0x03fffffe # 0x14000000 | 0x03fffffe = 0x17fffffe # CHECK: Disassembly of section .R_AARCH64_JUMP26: +# CHECK-EMPTY: # CHECK-NEXT: jump26: # CHECK-NEXT: 210038: fe ff ff 17 b #-8 @@ -105,6 +112,7 @@ # R = ((S + A) & 0xFFC) << 8 = 0x00004000 # 0x00004000 | 0xbd4000a4 = 0xbd4040a4 # CHECK: Disassembly of section .R_AARCH64_LDST32_ABS_LO12_NC: +# CHECK-EMPTY: # CHECK-NEXT: ldst32: # CHECK-NEXT: 21003c: a4 40 40 bd ldr s4, [x5, #64] @@ -119,6 +127,7 @@ # R = ((S + A) & 0xFFF) << 10 = 0x00012000 # 0x00012000 | 0x398001ab = 0x398121ab # CHECK: Disassembly of section .R_AARCH64_LDST8_ABS_LO12_NC: +# CHECK-EMPTY: # CHECK-NEXT: ldst8: # CHECK-NEXT: 210044: ab 21 81 39 ldrsb x11, [x13, #72] @@ -133,6 +142,7 @@ # R = ((S + A) & 0xFF8) << 6 = 0x00001400 # 0x00001400 | 0x3dc00274 = 0x3dc01674 # CHECK: Disassembly of section .R_AARCH64_LDST128_ABS_LO12_NC: +# CHECK-EMPTY: # CHECK: ldst128: # CHECK: 21004c: 74 16 c0 3d ldr q20, [x19, #80] #foo128: @@ -151,6 +161,7 @@ # R = ((S + A) & 0x0FFC) << 9 = 0xb000 # 0xb000 | 0x7d400271 = 0x7d40b271 # CHECK: Disassembly of section .R_AARCH64_LDST16_ABS_LO12_NC: +# CHECK-EMPTY: # CHECK-NEXT: ldst16: # CHECK-NEXT: 210054: 71 c2 40 7d ldr h17, [x19, #96] # CHECK-NEXT: 210058: 61 c2 40 79 ldrh w1, [x19, #96] @@ -166,6 +177,7 @@ ## 4222124650659840 == (0xF << 48) # CHECK: Disassembly of section .R_AARCH64_MOVW_UABS: +# CHECK-EMPTY: # CHECK-NEXT: movz1: # CHECK-NEXT: 8c 01 80 f2 movk x12, #12 # CHECK-NEXT: ad 01 a0 f2 movk x13, #13, lsl #16 diff --git a/lld/test/ELF/aarch64-thunk-pi.s b/lld/test/ELF/aarch64-thunk-pi.s --- a/lld/test/ELF/aarch64-thunk-pi.s +++ b/lld/test/ELF/aarch64-thunk-pi.s @@ -72,6 +72,7 @@ // CHECK-NEXT: 10000018: 00 02 1f d6 br x16 // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 10000020: f0 7b bf a9 stp x16, x30, [sp, #-16]! // CHECK-NEXT: 10000024: 10 00 00 90 adrp x16, #0 diff --git a/lld/test/ELF/aarch64-thunk-script.s b/lld/test/ELF/aarch64-thunk-script.s --- a/lld/test/ELF/aarch64-thunk-script.s +++ b/lld/test/ELF/aarch64-thunk-script.s @@ -26,6 +26,7 @@ ret // CHECK: Disassembly of section .text_low: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 2000: 02 00 00 94 bl #8 // CHECK-NEXT: 2004: c0 03 5f d6 ret @@ -36,6 +37,7 @@ // CHECK-NEXT: 2010: 00 20 00 08 .word 0x08002000 // CHECK-NEXT: 2014: 00 00 00 00 .word 0x00000000 // CHECK: Disassembly of section .text_high: +// CHECK-EMPTY: // CHECK-NEXT: high_target: // CHECK-NEXT: 8002000: 00 00 00 96 bl #-134217728 // CHECK-NEXT: 8002004: c0 03 5f d6 ret diff --git a/lld/test/ELF/aarch64-tls-gdle.s b/lld/test/ELF/aarch64-tls-gdle.s --- a/lld/test/ELF/aarch64-tls-gdle.s +++ b/lld/test/ELF/aarch64-tls-gdle.s @@ -11,6 +11,7 @@ # TCB size = 64 and foo is first element from TLS register. # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK: _start: # CHECK: 210000: 00 00 a0 d2 movz x0, #0, lsl #16 # CHECK: 210004: 00 08 80 f2 movk x0, #64 diff --git a/lld/test/ELF/aarch64-tls-iele.s b/lld/test/ELF/aarch64-tls-iele.s --- a/lld/test/ELF/aarch64-tls-iele.s +++ b/lld/test/ELF/aarch64-tls-iele.s @@ -11,6 +11,7 @@ # TCB size = 64 and foo is first element from TLS register. # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK: _start: # CHECK-NEXT: 210000: 00 00 a0 d2 movz x0, #0, lsl #16 # CHECK-NEXT: 210004: 80 08 80 f2 movk x0, #68 diff --git a/lld/test/ELF/aarch64-tstbr14-reloc.s b/lld/test/ELF/aarch64-tstbr14-reloc.s --- a/lld/test/ELF/aarch64-tstbr14-reloc.s +++ b/lld/test/ELF/aarch64-tstbr14-reloc.s @@ -12,6 +12,7 @@ # 0x11024 - 36 = 0x20000 # 0x11028 - 24 = 0x20010 # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: _foo: # CHECK-NEXT: 210000: {{.*}} nop # CHECK-NEXT: 210004: {{.*}} nop @@ -51,6 +52,7 @@ #DSOREL-NEXT:] #DSO: Disassembly of section .text: +#DSO-EMPTY: #DSO-NEXT: _foo: #DSO-NEXT: 10000: {{.*}} nop #DSO-NEXT: 10004: {{.*}} nop @@ -69,7 +71,9 @@ #DSO-NEXT: 10020: {{.*}} tbnz w3, #15, #64 #DSO-NEXT: 10024: {{.*}} tbz x6, #45, #44 #DSO-NEXT: 10028: {{.*}} tbz x6, #45, #56 +#DSO-EMPTY: #DSO-NEXT: Disassembly of section .plt: +#DSO-EMPTY: #DSO-NEXT: .plt: #DSO-NEXT: 10030: {{.*}} stp x16, x30, [sp, #-16]! #DSO-NEXT: 10034: {{.*}} adrp x16, #131072 diff --git a/lld/test/ELF/aarch64-undefined-weak.s b/lld/test/ELF/aarch64-undefined-weak.s --- a/lld/test/ELF/aarch64-undefined-weak.s +++ b/lld/test/ELF/aarch64-undefined-weak.s @@ -34,6 +34,7 @@ ldr x8, target // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // 2162688 = 0x210000 // CHECK: 210000: {{.*}} b #4 // CHECK-NEXT: 210004: {{.*}} bl #4 diff --git a/lld/test/ELF/arm-bl-v6-inrange.s b/lld/test/ELF/arm-bl-v6-inrange.s --- a/lld/test/ELF/arm-bl-v6-inrange.s +++ b/lld/test/ELF/arm-bl-v6-inrange.s @@ -28,9 +28,12 @@ thumbfunc: bx lr // CHECK-THUMB: Disassembly of section .callee1: +// CHECK-THUMB-EMPTY: // CHECK-THUMB-NEXT: thumbfunc: // CHECK-THUMB-NEXT: 100004: 70 47 bx lr +// CHECK-THUMB-EMPTY: // CHECK-THUMB-NEXT: Disassembly of section .caller: +// CHECK-THUMB-EMPTY: // CHECK-THUMB-NEXT: _start: // CHECK-THUMB-NEXT: 500000: 00 f4 00 f8 bl #-4194304 // CHECK-THUMB-NEXT: 500004: ff f3 fe ef blx #4194300 @@ -43,5 +46,6 @@ armfunc: bx lr // CHECK-ARM: Disassembly of section .callee2: +// CHECK-ARM-EMPTY: // CHECK-ARM-NEXT: armfunc: // CHECK-ARM-NEXT: 900004: 1e ff 2f e1 bx lr diff --git a/lld/test/ELF/arm-bl-v6.s b/lld/test/ELF/arm-bl-v6.s --- a/lld/test/ELF/arm-bl-v6.s +++ b/lld/test/ELF/arm-bl-v6.s @@ -26,6 +26,7 @@ bx lr // CHECK-ARM1: Disassembly of section .text: +// CHECK-ARM1-EMPTY: // CHECK-ARM1-NEXT: _start: // CHECK-ARM1-NEXT: 11000: 00 00 00 fa blx #0 // CHECK-ARM1-NEXT: 11004: 1e ff 2f e1 bx lr diff --git a/lld/test/ELF/arm-blx.s b/lld/test/ELF/arm-blx.s --- a/lld/test/ELF/arm-blx.s +++ b/lld/test/ELF/arm-blx.s @@ -74,16 +74,19 @@ bx lr // CHECK-THUMB: Disassembly of section .callee1: +// CHECK-THUMB-EMPTY: // CHECK-THUMB-NEXT: callee_low: // CHECK-THUMB-NEXT: b4: 70 47 bx lr // CHECK-THUMB: callee_low2: // CHECK-THUMB-NEXT: b6: 70 47 bx lr // CHECK-ARM: Disassembly of section .callee2: +// CHECK-ARM-EMPTY: // CHECK-ARM-NEXT: callee_arm_low: // CHECK-ARM-NEXT: 100: 1e ff 2f e1 bx lr // CHECK-ARM: Disassembly of section .caller: +// CHECK-ARM-EMPTY: // CHECK-ARM-NEXT: _start: // CHECK-ARM-NEXT: 10000: 2b c0 ff fa blx #-65364 // CHECK-ARM-NEXT: 10004: 2a c0 ff fa blx #-65368 @@ -104,11 +107,13 @@ // CHECK-ARM-NEXT: 10038: 1e ff 2f e1 bx lr // CHECK-THUMB: Disassembly of section .callee3: +// CHECK-THUMB-EMPTY: // CHECK-THUMB: callee_high: // CHECK-THUMB-NEXT: 10100: 70 47 bx lr // CHECK-THUMB: callee_high2: // CHECK-THUMB-NEXT: 10102: 70 47 bx lr // CHECK-ARM: Disassembly of section .callee4: +// CHECK-ARM-EMPTY: // CHECK-NEXT-ARM: callee_arm_high: // CHECK-NEXT-ARM: 10200: 1e ff 2f e1 bx lr diff --git a/lld/test/ELF/arm-branch-rangethunk.s b/lld/test/ELF/arm-branch-rangethunk.s --- a/lld/test/ELF/arm-branch-rangethunk.s +++ b/lld/test/ELF/arm-branch-rangethunk.s @@ -19,6 +19,7 @@ beq too_far3 // SHORT: Disassembly of section .text: +// SHORT-EMPTY: // SHORT-NEXT: _start: // SHORT-NEXT: 20000: 01 00 00 eb bl #4 <__ARMv7ABSLongThunk_too_far1> // SHORT-NEXT: 20004: 01 00 00 ea b #4 <__ARMv7ABSLongThunk_too_far2> @@ -31,6 +32,7 @@ // SHORT-NEXT: 20014: fd ff 7f ea b #33554420 <__ARMv7ABSLongThunk_too_far3+0x1fffffc> // LONG: Disassembly of section .text: +// LONG-EMPTY: // LONG-NEXT: _start: // LONG-NEXT: 20000: 01 00 00 eb bl #4 <__ARMv7ABSLongThunk_too_far1> // LONG-NEXT: 20004: 03 00 00 ea b #12 <__ARMv7ABSLongThunk_too_far2> diff --git a/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s b/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s --- a/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s +++ b/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s @@ -22,6 +22,7 @@ .space 32 * 1024 * 1024 // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 11000: 00 00 00 ea b #0 <__ARMv7ABSLongThunk_undefined_weak_we_expect_a_plt_entry_for> // CHECK-NEXT: 11004: 02 00 00 eb bl #8 <__ARMv7ABSLongThunk_bar2> diff --git a/lld/test/ELF/arm-branch.s b/lld/test/ELF/arm-branch.s --- a/lld/test/ELF/arm-branch.s +++ b/lld/test/ELF/arm-branch.s @@ -38,6 +38,7 @@ bx lr // CHECK: Disassembly of section .caller: +// CHECK-EMPTY: // CHECK-NEXT: _start: // S(callee_low) = 0xb4 P = 0x10000 A = -8 = -0xff54 = -65364 // CHECK-NEXT: 10000: 2b c0 ff eb bl #-65364 diff --git a/lld/test/ELF/arm-copy.s b/lld/test/ELF/arm-copy.s --- a/lld/test/ELF/arm-copy.s +++ b/lld/test/ELF/arm-copy.s @@ -65,6 +65,7 @@ // CHECK-NEXT: Section: .bss // CODE: Disassembly of section .text: +// CODE-EMPTY: // CODE-NEXT: _start: // S(y) = 0x13000, A = 0 // (S + A) & 0x0000ffff = 0x3000 = #12288 diff --git a/lld/test/ELF/arm-data-relocs.s b/lld/test/ELF/arm-data-relocs.s --- a/lld/test/ELF/arm-data-relocs.s +++ b/lld/test/ELF/arm-data-relocs.s @@ -12,9 +12,11 @@ // S = 0x100, A = 0x24 // S + A = 0x124 // CHECK: Disassembly of section .R_ARM_ABS32POS: +// CHECK-EMPTY: // CHECK: 11000: 24 01 00 00 .section .R_ARM_ABS32NEG, "ax",%progbits .word foo - 0x24 // S = 0x100, A = -0x24 // CHECK: Disassembly of section .R_ARM_ABS32NEG: +// CHECK-EMPTY: // CHECK: 11004: dc 00 00 00 diff --git a/lld/test/ELF/arm-exidx-canunwind.s b/lld/test/ELF/arm-exidx-canunwind.s --- a/lld/test/ELF/arm-exidx-canunwind.s +++ b/lld/test/ELF/arm-exidx-canunwind.s @@ -53,6 +53,7 @@ bx lr // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 11000: 01 00 00 eb bl #4 // CHECK-NEXT: 11004: 01 00 00 eb bl #4 diff --git a/lld/test/ELF/arm-exidx-gc.s b/lld/test/ELF/arm-exidx-gc.s --- a/lld/test/ELF/arm-exidx-gc.s +++ b/lld/test/ELF/arm-exidx-gc.s @@ -91,6 +91,7 @@ // routines are kept alive by references from live .ARM.exidx and .ARM.extab // sections // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 11000: 01 00 00 eb bl #4 // CHECK-NEXT: 11004: 01 00 00 eb bl #4 diff --git a/lld/test/ELF/arm-exidx-order.s b/lld/test/ELF/arm-exidx-order.s --- a/lld/test/ELF/arm-exidx-order.s +++ b/lld/test/ELF/arm-exidx-order.s @@ -54,6 +54,7 @@ // Check default no linker script order. // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK: _start: // CHECK-NEXT: 11000: 1e ff 2f e1 bx lr // CHECK: f1: @@ -67,12 +68,15 @@ // CHECK: func5: // CHECK-NEXT: 11014: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .func1: +// CHECK-EMPTY: // CHECK-NEXT: func1: // CHECK-NEXT: 11018: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .func2: +// CHECK-EMPTY: // CHECK-NEXT: func2: // CHECK-NEXT: 1101c: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .func3: +// CHECK-EMPTY: // CHECK-NEXT: func3: // CHECK-NEXT: 11020: 1e ff 2f e1 bx lr @@ -128,6 +132,7 @@ // the .text section but before the orphan sections // CHECK-SCRIPT: Disassembly of section .text: +// CHECK-SCRIPT-EMPTY: // CHECK-SCRIPT-NEXT: func4: // CHECK-SCRIPT-NEXT: 11000: 1e ff 2f e1 bx lr // CHECK-SCRIPT: func5: @@ -140,13 +145,19 @@ // CHECK-SCRIPT-NEXT: 11010: 1e ff 2f e1 bx lr // CHECK-SCRIPT: f3: // CHECK-SCRIPT-NEXT: 11014: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-EMPTY: // CHECK-SCRIPT-NEXT: Disassembly of section .func1: +// CHECK-SCRIPT-EMPTY: // CHECK-SCRIPT-NEXT: func1: // CHECK-SCRIPT-NEXT: 11018: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-EMPTY: // CHECK-SCRIPT-NEXT: Disassembly of section .func2: +// CHECK-SCRIPT-EMPTY: // CHECK-SCRIPT-NEXT: func2: // CHECK-SCRIPT-NEXT: 1101c: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-EMPTY: // CHECK-SCRIPT-NEXT: Disassembly of section .func3: +// CHECK-SCRIPT-EMPTY: // CHECK-SCRIPT-NEXT: func3: // CHECK-SCRIPT-NEXT: 11020: 1e ff 2f e1 bx lr diff --git a/lld/test/ELF/arm-extreme-range-pi-thunk.s b/lld/test/ELF/arm-extreme-range-pi-thunk.s --- a/lld/test/ELF/arm-extreme-range-pi-thunk.s +++ b/lld/test/ELF/arm-extreme-range-pi-thunk.s @@ -32,6 +32,7 @@ // ARMv7a instructions and relocations. // CHECK: Disassembly of section .text_low: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 130: 00 00 00 eb bl #0 <__ARMV7PILongThunk_high> // CHECK-NEXT: 134: 1e ff 2f e1 bx lr @@ -44,6 +45,7 @@ // CHECK-NEXT: 144: 1c ff 2f e1 bx r12 // CHECK: Disassembly of section .text_high: +// CHECK-EMPTY: // CHECK-NEXT: high: // CHECK-NEXT: f0000000: 00 00 00 eb bl #0 <__ARMV7PILongThunk__start> // CHECK-NEXT: f0000004: 1e ff 2f e1 bx lr @@ -57,6 +59,7 @@ // Thumbv7a instructions and relocations // CHECK-THUMB: Disassembly of section .text_low: +// CHECK-THUMB-EMPTY: // CHECK-THUMB-NEXT: _start: // CHECK-THUMB-NEXT: 130: 00 f0 02 f8 bl #4 // CHECK-THUMB-NEXT: 134: 70 47 bx lr @@ -70,6 +73,7 @@ // CHECK-THUMB-NEXT: 142: 60 47 bx r12 // CHECK-THUMB: Disassembly of section .text_high: +// CHECK-THUMB-EMPTY: // CHECK-THUMB-NEXT: high: // CHECK-THUMB-NEXT: f0000000: 00 f0 02 f8 bl #4 // CHECK-THUMB-NEXT: f0000004: 70 47 bx lr diff --git a/lld/test/ELF/arm-force-pi-thunk.s b/lld/test/ELF/arm-force-pi-thunk.s --- a/lld/test/ELF/arm-force-pi-thunk.s +++ b/lld/test/ELF/arm-force-pi-thunk.s @@ -31,6 +31,7 @@ bl high_target2 // CHECK: Disassembly of section .text_low: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 94: 70 47 bx lr // CHECK: low_target: @@ -69,6 +70,7 @@ bl low_target2 // CHECK: Disassembly of section .text_high: +// CHECK-EMPTY: // CHECK-NEXT: high_target: // CHECK-NEXT: 2000000: 00 f0 02 f8 bl #4 // CHECK-NEXT: 2000004: 00 f0 06 f8 bl #12 diff --git a/lld/test/ELF/arm-fpic-got.s b/lld/test/ELF/arm-fpic-got.s --- a/lld/test/ELF/arm-fpic-got.s +++ b/lld/test/ELF/arm-fpic-got.s @@ -53,6 +53,7 @@ // SYMBOLS-NEXT: Section: .data // CODE: Disassembly of section .text: +// CODE-EMPTY: // CODE-NEXT: _start: // CODE-NEXT: 11000: 08 00 9f e5 ldr r0, [pc, #8] // CODE-NEXT: 11004: 00 00 9f e7 ldr r0, [pc, r0] diff --git a/lld/test/ELF/arm-gnu-ifunc-plt.s b/lld/test/ELF/arm-gnu-ifunc-plt.s --- a/lld/test/ELF/arm-gnu-ifunc-plt.s +++ b/lld/test/ELF/arm-gnu-ifunc-plt.s @@ -29,6 +29,7 @@ // GOTPLT-NEXT: 13010 20100100 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 11000: 1e ff 2f e1 bx lr // DISASM: bar: @@ -41,7 +42,9 @@ // DISASM-NEXT: 11014: 04 00 00 00 .word 0x00000004 // DISASM: 11018: 08 00 00 eb bl #32 // DISASM-NEXT: 1101c: 0b 00 00 eb bl #44 +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: $a: // DISASM-NEXT: 11020: 04 e0 2d e5 str lr, [sp, #-4]! // DISASM-NEXT: 11024: 00 e6 8f e2 add lr, pc, #0, #12 diff --git a/lld/test/ELF/arm-gnu-ifunc.s b/lld/test/ELF/arm-gnu-ifunc.s --- a/lld/test/ELF/arm-gnu-ifunc.s +++ b/lld/test/ELF/arm-gnu-ifunc.s @@ -113,6 +113,7 @@ // CHECK-NEXT: } // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 11000: 1e ff 2f e1 bx lr // DISASM: bar: @@ -126,7 +127,9 @@ // 1 * 65536 + 260 = 0x10104 __rel_iplt_end // DISASM-NEXT: 11018: 04 01 00 e3 movw r0, #260 // DISASM-NEXT: 1101c: 01 00 40 e3 movt r0, #1 +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: $a: // DISASM-NEXT: 11020: 00 c6 8f e2 add r12, pc, #0, #12 // DISASM-NEXT: 11024: 00 ca 8c e2 add r12, r12, #0, #20 diff --git a/lld/test/ELF/arm-got-relative.s b/lld/test/ELF/arm-got-relative.s --- a/lld/test/ELF/arm-got-relative.s +++ b/lld/test/ELF/arm-got-relative.s @@ -41,6 +41,7 @@ // CHECK-NEXT: Section: .got // CODE: Disassembly of section .text: +// CODE-EMPTY: // CODE-NEXT: _start: // CODE-NEXT: 1000: 08 30 9f e5 ldr r3, [pc, #8] // CODE-NEXT: 1004: 08 20 9f e5 ldr r2, [pc, #8] diff --git a/lld/test/ELF/arm-gotoff.s b/lld/test/ELF/arm-gotoff.s --- a/lld/test/ELF/arm-gotoff.s +++ b/lld/test/ELF/arm-gotoff.s @@ -53,6 +53,7 @@ // CHECK-NEXT: Section: .bss // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT :_start: // DISASM-NEXT 11000: 1e ff 2f e1 bx lr // Offset 0 from .got = bar diff --git a/lld/test/ELF/arm-icf-exidx.s b/lld/test/ELF/arm-icf-exidx.s --- a/lld/test/ELF/arm-icf-exidx.s +++ b/lld/test/ELF/arm-icf-exidx.s @@ -23,6 +23,7 @@ bx lr // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: g: // CHECK-NEXT: 11000: 1e ff 2f e1 bx lr // CHECK: __aeabi_unwind_cpp_pr0: diff --git a/lld/test/ELF/arm-mov-relocs.s b/lld/test/ELF/arm-mov-relocs.s --- a/lld/test/ELF/arm-mov-relocs.s +++ b/lld/test/ELF/arm-mov-relocs.s @@ -18,6 +18,7 @@ movw r3, :lower16:label3 movw r4, :lower16:label3 + 4 // CHECK: Disassembly of section .R_ARM_MOVW_ABS_NC +// CHECK-EMPTY: // CHECK: movw r0, #0 // CHECK: movw r1, #4 // CHECK: movw r2, #12 @@ -30,6 +31,7 @@ movt r3, :upper16:label3 movt r4, :upper16:label3 + 4 // CHECK: Disassembly of section .R_ARM_MOVT_ABS +// CHECK-EMPTY: // CHECK: movt r0, #2 // CHECK: movt r1, #2 // CHECK: movt r2, #2 diff --git a/lld/test/ELF/arm-plt-reloc.s b/lld/test/ELF/arm-plt-reloc.s --- a/lld/test/ELF/arm-plt-reloc.s +++ b/lld/test/ELF/arm-plt-reloc.s @@ -20,6 +20,7 @@ // Executable, expect no PLT // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: func1: // CHECK-NEXT: 11000: 1e ff 2f e1 bx lr // CHECK: func2: @@ -34,6 +35,7 @@ // Expect PLT entries as symbols can be preempted // The .got.plt and .plt displacement is small so we can use small PLT entries. // DSO: Disassembly of section .text: +// DSO-EMPTY: // DSO-NEXT: func1: // DSO-NEXT: 1000: 1e ff 2f e1 bx lr // DSO: func2: @@ -47,7 +49,9 @@ // DSO-NEXT: 1010: 0e 00 00 eb bl #56 // S(0x10160) - P(0x1014) + A(-8) = 0x44 = 68 // DSO-NEXT: 1014: 11 00 00 0a beq #68 +// DSO-EMPTY: // DSO-NEXT: Disassembly of section .plt: +// DSO-EMPTY: // DSO-NEXT: $a: // DSO-NEXT: 1020: 04 e0 2d e5 str lr, [sp, #-4]! // (0x1024 + 8) + (0 RoR 12) + 4096 + (0xfdc) = 0x3008 = .got.plt[3] @@ -114,6 +118,7 @@ // RUN: llvm-readobj -s -r %t4 | FileCheck --check-prefix=DSORELHIGH %s // CHECKHIGH: Disassembly of section .text: +// CHECKHIGH-EMPTY: // CHECKHIGH-NEXT: func1: // CHECKHIGH-NEXT: 1000: 1e ff 2f e1 bx lr // CHECKHIGH: func2: @@ -124,7 +129,9 @@ // CHECKHIGH-NEXT: 100c: 03 04 00 ea b #4108 <$a> // CHECKHIGH-NEXT: 1010: 06 04 00 eb bl #4120 <$a> // CHECKHIGH-NEXT: 1014: 09 04 00 0a beq #4132 <$a> +// CHECKHIGH-EMPTY: // CHECKHIGH-NEXT: Disassembly of section .plt: +// CHECKHIGH-EMPTY: // CHECKHIGH-NEXT: $a: // CHECKHIGH-NEXT: 2000: 04 e0 2d e5 str lr, [sp, #-4]! // CHECKHIGH-NEXT: 2004: 10 e6 8f e2 add lr, pc, #16, #12 @@ -179,6 +186,7 @@ // RUN: llvm-readobj -s -r %t5 | FileCheck --check-prefix=DSORELLONG %s // CHECKLONG: Disassembly of section .text: +// CHECKLONG-EMPTY: // CHECKLONG-NEXT: func1: // CHECKLONG-NEXT: 1000: 1e ff 2f e1 bx lr // CHECKLONG: func2: @@ -189,7 +197,9 @@ // CHECKLONG-NEXT: 100c: 03 04 00 ea b #4108 <$a> // CHECKLONG-NEXT: 1010: 06 04 00 eb bl #4120 <$a> // CHECKLONG-NEXT: 1014: 09 04 00 0a beq #4132 <$a> +// CHECKLONG-EMPTY: // CHECKLONG-NEXT: Disassembly of section .plt: +// CHECKLONG-EMPTY: // CHECKLONG-NEXT: $a: // CHECKLONG-NEXT: 2000: 04 e0 2d e5 str lr, [sp, #-4]! // CHECKLONG-NEXT: 2004: 04 e0 9f e5 ldr lr, [pc, #4] @@ -245,6 +255,7 @@ // RUN: llvm-readobj -s -r %t6 | FileCheck --check-prefix=DSORELMIX %s // CHECKMIX: Disassembly of section .text: +// CHECKMIX-EMPTY: // CHECKMIX-NEXT: func1: // CHECKMIX-NEXT: 1000: 1e ff 2f e1 bx lr // CHECKMIX: func2: @@ -255,7 +266,9 @@ // CHECKMIX-NEXT: 100c: 03 04 00 ea b #4108 <$a> // CHECKMIX-NEXT: 1010: 06 04 00 eb bl #4120 <$a> // CHECKMIX-NEXT: 1014: 09 04 00 0a beq #4132 <$a> +// CHECKMIX-EMPTY: // CHECKMIX-NEXT: Disassembly of section .plt: +// CHECKMIX-EMPTY: // CHECKMIX-NEXT: $a: // CHECKMIX-NEXT: 2000: 04 e0 2d e5 str lr, [sp, #-4]! // CHECKMIX-NEXT: 2004: 04 e0 9f e5 ldr lr, [pc, #4] diff --git a/lld/test/ELF/arm-sbrel32.s b/lld/test/ELF/arm-sbrel32.s --- a/lld/test/ELF/arm-sbrel32.s +++ b/lld/test/ELF/arm-sbrel32.s @@ -31,6 +31,7 @@ foo4: .space 4 // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 11000: 1e ff 2f e1 bx lr // CHECK: 11004: 00 00 00 00 .word 0x00000000 diff --git a/lld/test/ELF/arm-target1.s b/lld/test/ELF/arm-target1.s --- a/lld/test/ELF/arm-target1.s +++ b/lld/test/ELF/arm-target1.s @@ -26,6 +26,7 @@ // Force generation of $d.0 as section is not all data nop // RELATIVE: Disassembly of section .text: +// RELATIVE-EMPTY: // RELATIVE: $d.0: // RELATIVE: 1000: 04 00 00 00 .word 0x00000004 // RELATIVE: SYMBOL TABLE: diff --git a/lld/test/ELF/arm-thumb-blx.s b/lld/test/ELF/arm-thumb-blx.s --- a/lld/test/ELF/arm-thumb-blx.s +++ b/lld/test/ELF/arm-thumb-blx.s @@ -41,14 +41,17 @@ bx lr // CHECK-ARM: Disassembly of section .R_ARM_CALL24_callee1: +// CHECK-ARM-EMPTY: // CHECK-NEXT-ARM: callee_low: // CHECK-NEXT-ARM: b4: 1e ff 2f e1 bx lr // CHECK-THUMB: Disassembly of section .R_ARM_CALL24_callee2: +// CHECK-THUMB-EMPTY: // CHECK-NEXT-THUMB: callee_thumb_low: // CHECK-NEXT-THUMB: 100: 70 47 bx lr // CHECK-THUMB: Disassembly of section .caller: +// CHECK-THUMB-EMPTY: // CHECK-THUMB: _start: // Align(0x10000,4) - 0xff50 (65360) + 4 = 0xb4 = callee_low // CHECK-NEXT-THUMB: 10000: f0 f7 58 e8 blx #-65360 @@ -77,9 +80,11 @@ // CHECK-ARM: Disassembly of section .R_ARM_CALL24_callee3: +// CHECK-ARM-EMPTY: // CHECK-NEXT-ARM: callee_high: // CHECK-NEXT-ARM: 10100: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .R_ARM_CALL24_callee4: +// CHECK-EMPTY: // CHECK-NEXT-THUMB:callee_thumb_high: // CHECK-NEXT-THUMB: 10200: 70 47 bx lr diff --git a/lld/test/ELF/arm-thumb-branch-rangethunk.s b/lld/test/ELF/arm-thumb-branch-rangethunk.s --- a/lld/test/ELF/arm-thumb-branch-rangethunk.s +++ b/lld/test/ELF/arm-thumb-branch-rangethunk.s @@ -17,6 +17,7 @@ beq.w too_far3 // CHECK: Disassembly of section .text: +// 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> diff --git a/lld/test/ELF/arm-thumb-branch.s b/lld/test/ELF/arm-thumb-branch.s --- a/lld/test/ELF/arm-thumb-branch.s +++ b/lld/test/ELF/arm-thumb-branch.s @@ -40,9 +40,12 @@ bx lr // CHECK: Disassembly of section .callee1: +// CHECK-EMPTY: // CHECK-NEXT: callee_low: // CHECK-NEXT: b4: 70 47 bx lr +// CHECK-EMPTY: // CHECK-NEXT: Disassembly of section .caller: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 10000: f0 f7 58 f8 bl #-65360 // CHECK-NEXT: 10004: f0 f7 56 b8 b.w #-65364 @@ -55,6 +58,8 @@ // CHECK-NEXT: 10020: 3f f3 ff af bgt.w #1048574 // CHECK-NEXT: 10024: 70 47 bx lr // CHECK-NEXT: 10026: +// CHECK-EMPTY: // CHECK-NEXT: Disassembly of section .callee2: +// CHECK-EMPTY: // CHECK-NEXT: callee_high: // CHECK-NEXT: 10028: 70 47 bx lr diff --git a/lld/test/ELF/arm-thumb-condbranch-thunk.s b/lld/test/ELF/arm-thumb-condbranch-thunk.s --- a/lld/test/ELF/arm-thumb-condbranch-thunk.s +++ b/lld/test/ELF/arm-thumb-condbranch-thunk.s @@ -34,6 +34,7 @@ // Section bl tfunc33 // CHECK1: Disassembly of section .text: +// CHECK1-EMPTY: // CHECK1-NEXT: tfunc00: // CHECK1-NEXT: 80000: 70 47 bx lr // CHECK1-NEXT: 80002: 7f f3 ff d7 bl #16252926 diff --git a/lld/test/ELF/arm-thumb-interwork-shared.s b/lld/test/ELF/arm-thumb-interwork-shared.s --- a/lld/test/ELF/arm-thumb-interwork-shared.s +++ b/lld/test/ELF/arm-thumb-interwork-shared.s @@ -15,6 +15,7 @@ // entry. // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: sym1: // CHECK-NEXT: 1000: 00 f0 02 b8 b.w #4 <__ThumbV7PILongThunk_elsewhere> // CHECK-NEXT: 1004: 00 f0 06 b8 b.w #12 <__ThumbV7PILongThunk_weakref> @@ -30,6 +31,7 @@ // CHECK-NEXT: 101e: 60 47 bx r12 // PLT: Disassembly of section .plt: +// PLT-EMPTY: // PLT-NEXT: $a: // PLT-NEXT: 1020: 04 e0 2d e5 str lr, [sp, #-4]! // PLT-NEXT: 1024: 00 e6 8f e2 add lr, pc, #0, #12 diff --git a/lld/test/ELF/arm-thumb-interwork-thunk.s b/lld/test/ELF/arm-thumb-interwork-thunk.s --- a/lld/test/ELF/arm-thumb-interwork-thunk.s +++ b/lld/test/ELF/arm-thumb-interwork-thunk.s @@ -39,6 +39,7 @@ bx lr // CHECK-THUMB: Disassembly of section .R_ARM_JUMP24_callee_1: +// CHECK-THUMB-EMPTY: // CHECK-THUMB: thumb_callee1: // CHECK-THUMB: 1000: 70 47 bx .section .R_ARM_THM_JUMP_callee_low, "ax", %progbits @@ -79,6 +80,7 @@ bne arm_callee3 bx lr // CHECK-ARM-ABS-ARM: Disassembly of section .arm_caller: +// CHECK-ARM-ABS-ARM-EMPTY: // CHECK-ARM-ABS-ARM-NEXT: arm_caller: // CHECK-ARM-ABS-ARM-NEXT: 1300: 3e ff ff fa blx #-776 // CHECK-ARM-ABS-ARM-NEXT: 1304: 3d ff ff fa blx #-780 @@ -107,6 +109,7 @@ // CHECK-ARM-ABS-ARM-NEXT: 1348: 1c ff 2f e1 bx r12 // CHECK-PI-ARM: Disassembly of section .arm_caller: +// CHECK-PI-ARM-EMPTY: // CHECK-PI-ARM-NEXT: arm_caller: // CHECK-PI-ARM-NEXT: 1300: 3e ff ff fa blx #-776 // CHECK-PI-ARM-NEXT: 1304: 3d ff ff fa blx #-780 @@ -140,6 +143,7 @@ // All PLT entries are ARM, no need for interworking thunks // CHECK-PI-ARM-PLT: Disassembly of section .arm_caller: +// CHECK-PI-ARM-PLT-EMPTY: // CHECK-PI-ARM-PLT-NEXT: arm_caller: // 0x17e4 PLT(thumb_callee1) // CHECK-PI-ARM-PLT-NEXT: 1300: 37 01 00 eb bl #1244 @@ -184,6 +188,7 @@ beq.w arm_callee2 bne.w arm_callee3 // CHECK-ABS-THUMB: Disassembly of section .thumb_caller: +// CHECK-ABS-THUMB-EMPTY: // CHECK-ABS-THUMB-NEXT: thumb_caller: // CHECK-ABS-THUMB-NEXT: 1400: ff f7 7e ee blx #-772 // CHECK-ABS-THUMB-NEXT: 1404: ff f7 7c ee blx #-776 @@ -210,6 +215,7 @@ // CHECK-ABS-THUMB-NEXT: 143c: 60 47 bx r12 // CHECK-PI-THUMB: Disassembly of section .thumb_caller: +// CHECK-PI-THUMB-EMPTY: // CHECK-PI-THUMB-NEXT: thumb_caller: // CHECK-PI-THUMB-NEXT: 1400: ff f7 7e ee blx #-772 // CHECK-PI-THUMB-NEXT: 1404: ff f7 7c ee blx #-776 @@ -239,6 +245,7 @@ // CHECK-PI-THUMB-NEXT: 1442: 60 47 bx r12 // CHECK-PI-THUMB-PLT: Disassembly of section .arm_caller: +// CHECK-PI-THUMB-PLT-EMPTY: // CHECK-PI-THUMB-PLT-NEXT: thumb_caller: // 0x1400 + 4 + 0x410 = 0x1814 = PLT(arm_callee1) // CHECK-PI-THUMB-PLT-NEXT: 1400: 00 f0 08 ea blx #1040 @@ -286,6 +293,7 @@ thumb_callee3: bx lr // CHECK-THUMB: Disassembly of section .R_ARM_JUMP24_callee_2: +// CHECK-THUMB-EMPTY: // CHECK-THUMB-NEXT: thumb_callee2: // CHECK-THUMB-NEXT: 1500: 70 47 bx lr // CHECK-THUMB: thumb_callee3: @@ -303,6 +311,7 @@ arm_callee3: bx lr // CHECK-ARM: Disassembly of section .R_ARM_THM_JUMP_callee_2: +// CHECK-ARM-EMPTY: // CHECK-ARM-NEXT: arm_callee2: // CHECK-ARM-NEXT: 1600: 1e ff 2f e1 bx lr // CHECK-ARM: arm_callee3: @@ -321,6 +330,7 @@ // CHECK-PI-ARM-PLT: Disassembly of section .plt: +// CHECK-PI-ARM-PLT-EMPTY: // CHECK-PI-ARM-PLT-NEXT: .plt: // CHECK-PI-ARM-PLT-NEXT: 17b0: 04 e0 2d e5 str lr, [sp, #-4]! // CHECK-PI-ARM-PLT-NEXT: 17b4: 04 e0 9f e5 ldr lr, [pc, #4] diff --git a/lld/test/ELF/arm-thumb-narrow-branch-check.s b/lld/test/ELF/arm-thumb-narrow-branch-check.s --- a/lld/test/ELF/arm-thumb-narrow-branch-check.s +++ b/lld/test/ELF/arm-thumb-narrow-branch-check.s @@ -50,9 +50,12 @@ callee_high_far = 0x180d // CHECK: Disassembly of section .R_ARM_PC11_1: +// CHECK-EMPTY: // CHECK-NEXT: callee_low: // CHECK-NEXT: 1000: 70 47 bx lr +// CHECK-EMPTY: // CHECK-NEXT: Disassembly of section .caller: +// CHECK-EMPTY: // CHECK-NEXT: callers: // 1004 - 0x800 (2048) + 4 = 0x808 = callee_low_far // CHECK-NEXT: 1004: 00 e4 b #-2048 @@ -64,10 +67,14 @@ // CHECK-NEXT: 100a: ff e3 b #2046 // CHECK-NEXT: 100c: 70 47 bx lr // CHECK-NEXT: 100e: 00 bf nop +// CHECK-EMPTY: // CHECK-NEXT: Disassembly of section .R_ARM_PC11_2: +// CHECK-EMPTY: // CHECK-NEXT: callee_high: // CHECK-NEXT: 1010: 70 47 bx lr +// CHECK-EMPTY: // CHECK-NEXT: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 1014: ff f7 f6 ff bl #-20 // CHECK-NEXT: 1018: 70 47 bx lr diff --git a/lld/test/ELF/arm-thumb-no-undefined-thunk.s b/lld/test/ELF/arm-thumb-no-undefined-thunk.s --- a/lld/test/ELF/arm-thumb-no-undefined-thunk.s +++ b/lld/test/ELF/arm-thumb-no-undefined-thunk.s @@ -17,6 +17,7 @@ b.w target // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // 69636 = 0x11004 = next instruction // CHECK: 11000: {{.*}} bl #0 diff --git a/lld/test/ELF/arm-thumb-plt-range-thunk-os.s b/lld/test/ELF/arm-thumb-plt-range-thunk-os.s --- a/lld/test/ELF/arm-thumb-plt-range-thunk-os.s +++ b/lld/test/ELF/arm-thumb-plt-range-thunk-os.s @@ -35,6 +35,7 @@ bl far_nonpreemptible_alias bx lr // CHECK1: Disassembly of section .text: +// CHECK1-EMPTY: // CHECK1-NEXT: sym1: // CHECK1-NEXT: 2000000: 00 f0 00 d8 bl #8388608 // CHECK1-NEXT: 2000004: 00 f0 04 d8 bl #8388616 @@ -84,6 +85,7 @@ // CHECK3: 4000000: 00 f0 16 e8 blx #44 // CHECK4: Disassembly of section .plt: +// CHECK4-EMPTY: // CHECK4-NEXT: $a: // CHECK4-NEXT: 4000010: 04 e0 2d e5 str lr, [sp, #-4]! // CHECK4-NEXT: 4000014: 00 e6 8f e2 add lr, pc, #0, #12 diff --git a/lld/test/ELF/arm-thumb-plt-reloc.s b/lld/test/ELF/arm-thumb-plt-reloc.s --- a/lld/test/ELF/arm-thumb-plt-reloc.s +++ b/lld/test/ELF/arm-thumb-plt-reloc.s @@ -24,6 +24,7 @@ // Executable, expect no PLT // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: func1: // CHECK-NEXT: 11000: 70 47 bx lr // CHECK: func2: @@ -43,6 +44,7 @@ // .text is Thumb and .plt is ARM, llvm-objdump can currently only disassemble // as ARM or Thumb. Work around by disassembling twice. // DSOTHUMB: Disassembly of section .text: +// DSOTHUMB-EMPTY: // DSOTHUMB-NEXT: func1: // DSOTHUMB-NEXT: 1000: 70 47 bx lr // DSOTHUMB: func2: @@ -58,6 +60,7 @@ // 0x1010 + 0x4C + 4 = 0x1060 = PLT func3 // DSOTHUMB-NEXT: 1010: 00 f0 26 e8 blx #76 // DSOARM: Disassembly of section .plt: +// DSOARM-EMPTY: // DSOARM-NEXT: $a: // DSOARM-NEXT: 1020: 04 e0 2d e5 str lr, [sp, #-4]! // (0x1024 + 8) + (0 RoR 12) + 4096 + (0xfdc) = 0x3008 = .got.plt[3] diff --git a/lld/test/ELF/arm-thumb-range-thunk-os.s b/lld/test/ELF/arm-thumb-range-thunk-os.s --- a/lld/test/ELF/arm-thumb-range-thunk-os.s +++ b/lld/test/ELF/arm-thumb-range-thunk-os.s @@ -43,6 +43,7 @@ // the first of the pre-created ThunkSections. bl tfunc16 // CHECK1: Disassembly of section .text: +// CHECK1-EMPTY: // CHECK1-NEXT: _start: // CHECK1-NEXT: 100000: ff f0 fe ff bl #1048572 // CHECK1-NEXT: 100004: ff f3 fc d7 bl #16777208 diff --git a/lld/test/ELF/arm-thumb-thunk-empty-pass.s b/lld/test/ELF/arm-thumb-thunk-empty-pass.s --- a/lld/test/ELF/arm-thumb-thunk-empty-pass.s +++ b/lld/test/ELF/arm-thumb-thunk-empty-pass.s @@ -17,6 +17,7 @@ bl _start // CHECK1: Disassembly of section .text: +// CHECK1-EMPTY: // CHECK1-NEXT: _start: // CHECK1-NEXT: 11000: ff f7 fe ff bl #-4 // CHECK1: __Thumbv7ABSLongThunk__start: diff --git a/lld/test/ELF/arm-thumb-thunk-v6m.s b/lld/test/ELF/arm-thumb-thunk-v6m.s --- a/lld/test/ELF/arm-thumb-thunk-v6m.s +++ b/lld/test/ELF/arm-thumb-thunk-v6m.s @@ -31,6 +31,7 @@ bx lr // CHECK: Disassembly of section .text_low: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 94: 00 f0 00 f8 bl #0 // CHECK: __Thumbv6MABSLongThunk_far: @@ -40,10 +41,12 @@ // CHECK-NEXT: 9e: 01 bd pop {r0, pc} // CHECK: a0: 01 00 00 02 .word 0x02000001 // CHECK: Disassembly of section .text_high: +// CHECK-EMPTY: // CHECK-NEXT: far: // CHECK-NEXT: 2000000: 70 47 bx lr // CHECK-PI: Disassembly of section .text_low: +// CHECK-PI-EMPTY: // CHECK-PI-NEXT: _start: // CHECK-PI-NEXT: 130: 00 f0 00 f8 bl #0 // CHECK-PI: __Thumbv6MPILongThunk_far: @@ -57,5 +60,6 @@ // CHECK-PI: 140: c1 fe ff 01 .word 0x01fffec1 // CHECK-PI: Disassembly of section .text_high: +// CHECK-PI-EMPTY: // CHECK-PI-NEXT: far: // CHECK-PI-NEXT: 2000000: 70 47 bx lr diff --git a/lld/test/ELF/arm-thumb-undefined-weak-narrow.test b/lld/test/ELF/arm-thumb-undefined-weak-narrow.test --- a/lld/test/ELF/arm-thumb-undefined-weak-narrow.test +++ b/lld/test/ELF/arm-thumb-undefined-weak-narrow.test @@ -4,6 +4,7 @@ # RUN: llvm-objdump -triple=thumbv7a-linux-gnueabi -d %t | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT:_start: # CHECK-NEXT: 11000: ff e7 b #-2 diff --git a/lld/test/ELF/arm-thumb-undefined-weak.s b/lld/test/ELF/arm-thumb-undefined-weak.s --- a/lld/test/ELF/arm-thumb-undefined-weak.s +++ b/lld/test/ELF/arm-thumb-undefined-weak.s @@ -28,6 +28,7 @@ movw r0, :lower16:target - . // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // 69636 = 0x11004 // CHECK: 11000: {{.*}} beq.w #0 <_start+0x4> // CHECK-NEXT: 11004: {{.*}} b.w #0 <_start+0x8> diff --git a/lld/test/ELF/arm-thunk-largesection.s b/lld/test/ELF/arm-thunk-largesection.s --- a/lld/test/ELF/arm-thunk-largesection.s +++ b/lld/test/ELF/arm-thunk-largesection.s @@ -16,6 +16,7 @@ bx lr .space 0x1000 // CHECK1: Disassembly of section .text: +// CHECK1-EMPTY: // CHECK1-NEXT:_start: // CHECK1-NEXT: 11000: 70 47 bx lr // CHECK1-EMPTY: diff --git a/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s b/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s --- a/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s +++ b/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s @@ -28,6 +28,7 @@ bl high_target bl high_target2 // CHECK1: Disassembly of section .text_low: +// CHECK1-EMPTY: // CHECK1-NEXT: _start: // CHECK1-NEXT: 94: 70 47 bx lr // CHECK1: low_target: diff --git a/lld/test/ELF/arm-thunk-linkerscript-large.s b/lld/test/ELF/arm-thunk-linkerscript-large.s --- a/lld/test/ELF/arm-thunk-linkerscript-large.s +++ b/lld/test/ELF/arm-thunk-linkerscript-large.s @@ -53,6 +53,7 @@ // Expect a range extension thunk in .text OutputSection bl tfunch31 // CHECK1: Disassembly of section .text: +// CHECK1-EMPTY: // CHECK1-NEXT: _start: // CHECK1-NEXT: 100000: ff f0 fe ff bl #1048572 // CHECK1-NEXT: 100004: 00 f0 00 f8 bl #0 @@ -66,6 +67,7 @@ // We can reuse existing thunk in .text bl tfunch31 // CHECK2: Disassembly of section .textl: +// CHECK2-EMPTY: // CHECK2-NEXT: tfuncl00: // CHECK2-NEXT: 200000: 70 47 bx lr // CHECK2-NEXT: 200002: ff f0 ff df bl #9437182 @@ -122,6 +124,7 @@ // Shouldn't need a thunk bl tfuncl31 // CHECK5: Disassembly of section .texth: +// CHECK5-EMPTY: // CHECK5-NEXT: tfunch00: // CHECK5-NEXT: 2200000: 70 47 bx lr // CHECK5-NEXT: 2200002: 00 f7 05 f8 bl #-1048566 diff --git a/lld/test/ELF/arm-thunk-linkerscript-orphan.s b/lld/test/ELF/arm-thunk-linkerscript-orphan.s --- a/lld/test/ELF/arm-thunk-linkerscript-orphan.s +++ b/lld/test/ELF/arm-thunk-linkerscript-orphan.s @@ -18,6 +18,7 @@ bl high_target bl orphan_target // CHECK: Disassembly of section .text_low: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 100000: 70 47 bx lr // CHECK: low_target: @@ -39,6 +40,7 @@ bl low_target bl orphan_target // CHECK: Disassembly of section .text_high: +// CHECK-EMPTY: // CHECK-NEXT: high_target: // CHECK-NEXT: 2000000: 00 f0 02 f8 bl #4 // CHECK-NEXT: 2000004: 00 f0 06 f8 bl #12 @@ -55,6 +57,7 @@ bl low_target bl high_target // CHECK: Disassembly of section orphan: +// CHECK-EMPTY: // CHECK-NEXT: orphan_target: // CHECK-NEXT: 2000014: ff f7 f8 ff bl #-16 // CHECK-NEXT: 2000018: ff f7 f2 ff bl #-28 diff --git a/lld/test/ELF/arm-thunk-linkerscript.s b/lld/test/ELF/arm-thunk-linkerscript.s --- a/lld/test/ELF/arm-thunk-linkerscript.s +++ b/lld/test/ELF/arm-thunk-linkerscript.s @@ -28,6 +28,7 @@ bl high_target2 // CHECK: Disassembly of section .text_low: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 94: 70 47 bx lr // CHECK: low_target: @@ -62,6 +63,7 @@ bl low_target2 // CHECK: Disassembly of section .text_high: +// CHECK-EMPTY: // CHECK-NEXT: high_target: // CHECK-NEXT: 2000000: 00 f0 02 f8 bl #4 // CHECK-NEXT: 2000004: 00 f0 05 f8 bl #10 diff --git a/lld/test/ELF/arm-thunk-multipass-plt.s b/lld/test/ELF/arm-thunk-multipass-plt.s --- a/lld/test/ELF/arm-thunk-multipass-plt.s +++ b/lld/test/ELF/arm-thunk-multipass-plt.s @@ -70,6 +70,7 @@ // CHECK-PLT: Disassembly of section .plt: +// CHECK-PLT-EMPTY: // CHECK-PLT-NEXT: 0000000000d00020 $a: // CHECK-PLT-NEXT: d00020: 04 e0 2d e5 str lr, [sp, #-4]! // CHECK-PLT-NEXT: d00024: 00 e6 8f e2 add lr, pc, #0, #12 diff --git a/lld/test/ELF/arm-thunk-re-add.s b/lld/test/ELF/arm-thunk-re-add.s --- a/lld/test/ELF/arm-thunk-re-add.s +++ b/lld/test/ELF/arm-thunk-re-add.s @@ -99,6 +99,7 @@ // CHECK2-NEXT: 110001c: ff f6 f8 bf b.w #-1048592 <__ThumbV7PILongThunk_imported2> // CHECK3: Disassembly of section .plt: +// CHECK3-EMPTY: // CHECK3-NEXT: $a: // CHECK3-NEXT: 1100020: 04 e0 2d e5 str lr, [sp, #-4]! // CHECK3-NEXT: 1100024: 00 e6 8f e2 add lr, pc, #0, #12 diff --git a/lld/test/ELF/arm-tls-gd32.s b/lld/test/ELF/arm-tls-gd32.s --- a/lld/test/ELF/arm-tls-gd32.s +++ b/lld/test/ELF/arm-tls-gd32.s @@ -91,8 +91,7 @@ // SEC-NEXT: 0x2058 R_ARM_TLS_DTPOFF32 y -// CHECK: Disassembly -// CHECK-NEXT: func: +// CHECK-LABEL: 0000000000001000 func: // CHECK-NEXT: 1000: 00 f0 20 e3 nop // CHECK-NEXT: 1004: 00 f0 20 e3 nop // CHECK-NEXT: 1008: 00 f0 20 e3 nop diff --git a/lld/test/ELF/arm-tls-ie32.s b/lld/test/ELF/arm-tls-ie32.s --- a/lld/test/ELF/arm-tls-ie32.s +++ b/lld/test/ELF/arm-tls-ie32.s @@ -83,6 +83,7 @@ // SEC: 0x2050 R_ARM_TLS_TPOFF32 y // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: func: // CHECK-NEXT: 1000: 00 f0 20 e3 nop // CHECK-NEXT: 1004: 00 f0 20 e3 nop diff --git a/lld/test/ELF/arm-tls-ldm32.s b/lld/test/ELF/arm-tls-ldm32.s --- a/lld/test/ELF/arm-tls-ldm32.s +++ b/lld/test/ELF/arm-tls-ldm32.s @@ -56,6 +56,7 @@ // SEC-NEXT: 0x204C R_ARM_TLS_DTPMOD32 - 0x0 // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 1000: 00 f0 20 e3 nop @@ -65,6 +66,7 @@ // CHECK-NEXT: 100c: 04 00 00 00 // CHECK-EXE: Disassembly of section .text: +// CHECK-EXE-EMPTY: // CHECK-NEXT-EXE: _start: // CHECK-NEXT-EXE: 11000: 00 f0 20 e3 nop diff --git a/lld/test/ELF/arm-tls-le32.s b/lld/test/ELF/arm-tls-le32.s --- a/lld/test/ELF/arm-tls-le32.s +++ b/lld/test/ELF/arm-tls-le32.s @@ -68,6 +68,7 @@ // SEC-NEXT: } // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // offset of x from Thread pointer = (TcbSize + 0x0 = 0x20) // CHECK-NEXT: 11000: 20 00 00 00 diff --git a/lld/test/ELF/arm-undefined-weak.s b/lld/test/ELF/arm-undefined-weak.s --- a/lld/test/ELF/arm-undefined-weak.s +++ b/lld/test/ELF/arm-undefined-weak.s @@ -28,6 +28,7 @@ .word target - . // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // 69636 = 0x11004 // CHECK: 11000: {{.*}} b #-4 <_start+0x4> // CHECK-NEXT: 11004: {{.*}} bl #-4 <_start+0x8> diff --git a/lld/test/ELF/comdat.s b/lld/test/ELF/comdat.s --- a/lld/test/ELF/comdat.s +++ b/lld/test/ELF/comdat.s @@ -19,6 +19,7 @@ nop // CHECK: Disassembly of section .text2: +// CHECK-EMPTY: // CHECK-NEXT: foo: // CHECK-NEXT: 1000: {{.*}} nop // CHECK-NOT: nop @@ -27,6 +28,7 @@ call foo // CHECK: Disassembly of section bar: +// CHECK-EMPTY: // CHECK-NEXT: bar: // 0x1000 - 0x1001 - 5 = -6 // 0 - 0x1006 - 5 = -4107 diff --git a/lld/test/ELF/copy-rel-pie.s b/lld/test/ELF/copy-rel-pie.s --- a/lld/test/ELF/copy-rel-pie.s +++ b/lld/test/ELF/copy-rel-pie.s @@ -42,6 +42,7 @@ // 0x3020 - 0x100a = 8214 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // DISASM-NEXT: 1000: e8 1b 00 00 00 callq 27 // DISASM-NEXT: 1005: e8 16 20 00 00 callq 8214 diff --git a/lld/test/ELF/defsym.s b/lld/test/ELF/defsym.s --- a/lld/test/ELF/defsym.s +++ b/lld/test/ELF/defsym.s @@ -36,6 +36,7 @@ ## Check we can use foo2 and it that it is an alias for foo1. # USE: Disassembly of section .text: +# USE-EMPTY: # USE-NEXT: _start: # USE-NEXT: movl $0x123, %edx diff --git a/lld/test/ELF/eh-frame-hdr.s b/lld/test/ELF/eh-frame-hdr.s --- a/lld/test/ELF/eh-frame-hdr.s +++ b/lld/test/ELF/eh-frame-hdr.s @@ -38,15 +38,20 @@ // NOHDR: ProgramHeaders [ // NOHDR-NOT: PT_GNU_EH_FRAME -//HDRDISASM: Disassembly of section foo: -//HDRDISASM-NEXT: foo: -//HDRDISASM-NEXT: 201000: 90 nop -//HDRDISASM-NEXT: Disassembly of section bar: -//HDRDISASM-NEXT: bar: -//HDRDISASM-NEXT: 201001: 90 nop -//HDRDISASM-NEXT: Disassembly of section dah: -//HDRDISASM-NEXT: dah: -//HDRDISASM-NEXT: 201002: 90 nop +// HDRDISASM: Disassembly of section foo: +// HDRDISASM-EMPTY: +// HDRDISASM-NEXT: foo: +// HDRDISASM-NEXT: 201000: 90 nop +// HDRDISASM-EMPTY: +// HDRDISASM-NEXT: Disassembly of section bar: +// HDRDISASM-EMPTY: +// HDRDISASM-NEXT: bar: +// HDRDISASM-NEXT: 201001: 90 nop +// HDRDISASM-EMPTY: +// HDRDISASM-NEXT: Disassembly of section dah: +// HDRDISASM-EMPTY: +// HDRDISASM-NEXT: dah: +// HDRDISASM-NEXT: 201002: 90 nop // HDR: Section { // HDR: Index: diff --git a/lld/test/ELF/ehframe-relocation.s b/lld/test/ELF/ehframe-relocation.s --- a/lld/test/ELF/ehframe-relocation.s +++ b/lld/test/ELF/ehframe-relocation.s @@ -18,6 +18,7 @@ // 0x200120 = 2097440 // 0x200120 + 5 = 2097445 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // DISASM-NEXT: 201000: {{.*}} movq 2097440, %rax // DISASM-NEXT: 201008: {{.*}} movq 2097445, %rax diff --git a/lld/test/ELF/gdb-index.s b/lld/test/ELF/gdb-index.s --- a/lld/test/ELF/gdb-index.s +++ b/lld/test/ELF/gdb-index.s @@ -16,6 +16,7 @@ # RUN: llvm-readelf -sections %t | FileCheck %s --check-prefix=SECTION # DISASM: Disassembly of section .text: +# DISASM-EMPTY: # DISASM: entrypoint: # DISASM-CHECK: 201000: 90 nop # DISASM-CHECK: 201001: cc int3 diff --git a/lld/test/ELF/gnu-ifunc-i386.s b/lld/test/ELF/gnu-ifunc-i386.s --- a/lld/test/ELF/gnu-ifunc-i386.s +++ b/lld/test/ELF/gnu-ifunc-i386.s @@ -107,6 +107,7 @@ // CHECK-NEXT:] // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo_resolver: // DISASM-NEXT: 401000: c3 retl // DISASM: bar_resolver: @@ -116,7 +117,9 @@ // DISASM-NEXT: 401007: e8 24 00 00 00 calll 36 // DISASM-NEXT: 40100c: ba d4 00 40 00 movl $4194516, %edx // DISASM-NEXT: 401011: ba e4 00 40 00 movl $4194532, %edx +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 401020: ff 25 00 20 40 00 jmpl *4202496 // DISASM-NEXT: 401026: 68 10 00 00 00 pushl $16 diff --git a/lld/test/ELF/gnu-ifunc-plt-i386.s b/lld/test/ELF/gnu-ifunc-plt-i386.s --- a/lld/test/ELF/gnu-ifunc-plt-i386.s +++ b/lld/test/ELF/gnu-ifunc-plt-i386.s @@ -27,6 +27,7 @@ // Check that a PLT header is written and the ifunc entries appear last // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 401000: c3 retl // DISASM: bar: @@ -36,7 +37,9 @@ // DISASM-NEXT: 401007: e8 54 00 00 00 calll 84 // DISASM-NEXT: 40100c: e8 1f 00 00 00 calll 31 // DISASM-NEXT: 401011: e8 2a 00 00 00 calll 42 +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 401020: ff 35 04 30 40 00 pushl 4206596 // DISASM-NEXT: 401026: ff 25 08 30 40 00 jmpl *4206600 diff --git a/lld/test/ELF/gnu-ifunc-plt.s b/lld/test/ELF/gnu-ifunc-plt.s --- a/lld/test/ELF/gnu-ifunc-plt.s +++ b/lld/test/ELF/gnu-ifunc-plt.s @@ -28,6 +28,7 @@ // Check that a PLT header is written and the ifunc entries appear last // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 201000: c3 retq // DISASM: bar: @@ -37,7 +38,9 @@ // DISASM-NEXT: 201007: e8 54 00 00 00 callq 84 // DISASM-NEXT: 20100c: e8 1f 00 00 00 callq 31 // DISASM-NEXT: 201011: e8 2a 00 00 00 callq 42 +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 201020: ff 35 e2 1f 00 00 pushq 8162(%rip) // DISASM-NEXT: 201026: ff 25 e4 1f 00 00 jmpq *8164(%rip) diff --git a/lld/test/ELF/gnu-ifunc-shared.s b/lld/test/ELF/gnu-ifunc-shared.s --- a/lld/test/ELF/gnu-ifunc-shared.s +++ b/lld/test/ELF/gnu-ifunc-shared.s @@ -7,6 +7,7 @@ // Check that an IRELATIVE relocation is used for a non-preemptible ifunc // handler and a JUMP_SLOT is used for a preemptible ifunc // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: fct: // DISASM-NEXT: 1000: c3 retq // DISASM: fct2: @@ -18,7 +19,9 @@ // DISASM-NEXT: 1011: c3 retq // DISASM: f2: // DISASM-NEXT: 1012: c3 retq +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 1020: ff 35 e2 1f 00 00 pushq 8162(%rip) // DISASM-NEXT: 1026: ff 25 e4 1f 00 00 jmpq *8164(%rip) diff --git a/lld/test/ELF/gnu-ifunc.s b/lld/test/ELF/gnu-ifunc.s --- a/lld/test/ELF/gnu-ifunc.s +++ b/lld/test/ELF/gnu-ifunc.s @@ -90,6 +90,7 @@ // CHECK-NEXT: ] // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: foo: // DISASM-NEXT: 201000: {{.*}} retq // DISASM: bar: @@ -100,7 +101,9 @@ // DISASM-NEXT: 20100c: {{.*}} movl $2097496, %edx // DISASM-NEXT: 201011: {{.*}} movl $2097544, %edx // DISASM-NEXT: 201016: {{.*}} movl $2097545, %edx +// DISASM-EMPTY: // DISASM-NEXT: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 201020: {{.*}} jmpq *4058(%rip) // DISASM-NEXT: 201026: {{.*}} pushq $0 diff --git a/lld/test/ELF/got-i386.s b/lld/test/ELF/got-i386.s --- a/lld/test/ELF/got-i386.s +++ b/lld/test/ELF/got-i386.s @@ -40,6 +40,7 @@ // 0x40200A - 10 = addr(.got) = 0x402000 // 0x40200A + 5 - 15 = addr(.got) = 0x402000 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // DISASM-NEXT: 401000: c7 81 0c 00 00 00 01 00 00 00 movl $1, 12(%ecx) // DISASM-NEXT: 40100a: c7 81 16 00 00 00 02 00 00 00 movl $2, 22(%ecx) diff --git a/lld/test/ELF/gotpc-relax-nopic.s b/lld/test/ELF/gotpc-relax-nopic.s --- a/lld/test/ELF/gotpc-relax-nopic.s +++ b/lld/test/ELF/gotpc-relax-nopic.s @@ -14,6 +14,7 @@ ## 2105344 = 0x202000 (bar) # DISASM: Disassembly of section .text: +# DISASM-EMPTY: # DISASM-NEXT: _start: # DISASM-NEXT: 201000: {{.*}} adcq $2105344, %rax # DISASM-NEXT: 201007: {{.*}} addq $2105344, %rbx @@ -55,6 +56,7 @@ ## Ex: 0x1000 + 4249 + 7 = 0x20A0 ## 0x102a + 4207 + 7 = 0x20A0 # DISASM-PIC: Disassembly of section .text: +# DISASM-PIC-EMPTY: # DISASM-PIC-NEXT: _start: # DISASM-PIC-NEXT: 1000: {{.*}} adcq 4249(%rip), %rax # DISASM-PIC-NEXT: 1007: {{.*}} addq 4242(%rip), %rbx diff --git a/lld/test/ELF/gotpc-relax-und-dso.s b/lld/test/ELF/gotpc-relax-und-dso.s --- a/lld/test/ELF/gotpc-relax-und-dso.s +++ b/lld/test/ELF/gotpc-relax-und-dso.s @@ -17,6 +17,7 @@ # 0x101e + 7 - 36 = 0x1001 # 0x1025 + 7 - 43 = 0x1001 # DISASM: Disassembly of section .text: +# DISASM-EMPTY: # DISASM-NEXT: foo: # DISASM-NEXT: nop # DISASM: hid: diff --git a/lld/test/ELF/gotpc-relax.s b/lld/test/ELF/gotpc-relax.s --- a/lld/test/ELF/gotpc-relax.s +++ b/lld/test/ELF/gotpc-relax.s @@ -13,6 +13,7 @@ # 0x201011 + 7 - 23 = 0x201001 # 0x201018 + 7 - 30 = 0x201001 # DISASM: Disassembly of section .text: +# DISASM-EMPTY: # DISASM-NEXT: foo: # DISASM-NEXT: 201000: 90 nop # DISASM: hid: diff --git a/lld/test/ELF/i386-gotpc.s b/lld/test/ELF/i386-gotpc.s --- a/lld/test/ELF/i386-gotpc.s +++ b/lld/test/ELF/i386-gotpc.s @@ -9,6 +9,7 @@ // CHECK: .got.plt PROGBITS 00003000 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: .text: // DISASM-NEXT: 1000: {{.*}} movl $8192, %eax // 0x3000 (.got.plt) - 0x1000 = 8192 diff --git a/lld/test/ELF/i386-reloc-large-addend.s b/lld/test/ELF/i386-reloc-large-addend.s --- a/lld/test/ELF/i386-reloc-large-addend.s +++ b/lld/test/ELF/i386-reloc-large-addend.s @@ -8,6 +8,7 @@ // RUN: llvm-objdump -d -triple=i386-pc-linux-code16 %t | FileCheck %s // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 7000: e9 fe 1f jmp 8190 // 0x1 + 0x9000 - 0x7003 == 8190 diff --git a/lld/test/ELF/i386-reloc-range.s b/lld/test/ELF/i386-reloc-range.s --- a/lld/test/ELF/i386-reloc-range.s +++ b/lld/test/ELF/i386-reloc-range.s @@ -10,6 +10,7 @@ // RUN: llvm-objdump -d -triple=i386-pc-linux-code16 %t1 | FileCheck %s // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 200: {{.*}} jmp -1 // 0x10202 - 0x203 == 0xffff diff --git a/lld/test/ELF/i386-retpoline-nopic-linkerscript.s b/lld/test/ELF/i386-retpoline-nopic-linkerscript.s --- a/lld/test/ELF/i386-retpoline-nopic-linkerscript.s +++ b/lld/test/ELF/i386-retpoline-nopic-linkerscript.s @@ -13,6 +13,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 10: ff 35 ec 00 00 00 pushl 236 // CHECK-NEXT: 16: 50 pushl %eax diff --git a/lld/test/ELF/i386-retpoline-nopic.s b/lld/test/ELF/i386-retpoline-nopic.s --- a/lld/test/ELF/i386-retpoline-nopic.s +++ b/lld/test/ELF/i386-retpoline-nopic.s @@ -7,6 +7,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 401010: ff 35 04 30 40 00 pushl 4206596 // CHECK-NEXT: 401016: 50 pushl %eax diff --git a/lld/test/ELF/i386-retpoline-pic-linkerscript.s b/lld/test/ELF/i386-retpoline-pic-linkerscript.s --- a/lld/test/ELF/i386-retpoline-pic-linkerscript.s +++ b/lld/test/ELF/i386-retpoline-pic-linkerscript.s @@ -13,6 +13,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 10: ff b3 04 00 00 00 pushl 4(%ebx) // CHECK-NEXT: 16: 50 pushl %eax diff --git a/lld/test/ELF/i386-retpoline-pic.s b/lld/test/ELF/i386-retpoline-pic.s --- a/lld/test/ELF/i386-retpoline-pic.s +++ b/lld/test/ELF/i386-retpoline-pic.s @@ -7,6 +7,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 1010: ff b3 04 00 00 00 pushl 4(%ebx) // CHECK-NEXT: 1016: 50 pushl %eax diff --git a/lld/test/ELF/i386-tls-ie-shared.s b/lld/test/ELF/i386-tls-ie-shared.s --- a/lld/test/ELF/i386-tls-ie-shared.s +++ b/lld/test/ELF/i386-tls-ie-shared.s @@ -41,6 +41,7 @@ // GOTRELSHARED: 0x6FFFFFFA RELCOUNT 8 // DISASMSHARED: Disassembly of section test: +// DISASMSHARED-EMPTY: // DISASMSHARED-NEXT: _start: // (.got)[0] = 0x2060 = 8288 // (.got)[1] = 0x2064 = 8292 diff --git a/lld/test/ELF/linkerscript/excludefile.s b/lld/test/ELF/linkerscript/excludefile.s --- a/lld/test/ELF/linkerscript/excludefile.s +++ b/lld/test/ELF/linkerscript/excludefile.s @@ -10,6 +10,7 @@ # RUN: llvm-objdump -d %t | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK: _start: # CHECK-NEXT: : 48 c7 c0 3c 00 00 00 movq $60, %rax # CHECK-NEXT: : 48 c7 c7 2a 00 00 00 movq $42, %rdi @@ -30,6 +31,7 @@ # RUN: llvm-objdump -d %t4 | FileCheck %s --check-prefix=EXCLUDE # EXCLUDE: Disassembly of section .patatino: +# EXCLUDE-EMPTY: # EXCLUDE: _start: # EXCLUDE-NEXT: : 48 c7 c0 3c 00 00 00 movq $60, %rax # EXCLUDE-NEXT: : 48 c7 c7 2a 00 00 00 movq $42, %rdi @@ -39,6 +41,7 @@ # EXCLUDE-NEXT: : 90 nop # EXCLUDE-NEXT: : 90 nop # EXCLUDE: Disassembly of section .text: +# EXCLUDE-EMPTY: # EXCLUDE: tomato: # EXCLUDE-NEXT: : b8 01 00 00 00 movl $1, %eax diff --git a/lld/test/ELF/linkerscript/non-absolute.s b/lld/test/ELF/linkerscript/non-absolute.s --- a/lld/test/ELF/linkerscript/non-absolute.s +++ b/lld/test/ELF/linkerscript/non-absolute.s @@ -8,6 +8,7 @@ # B = A + 0x1 = -0x10 + 0x1 = -0xf -> 0xFFFFFFFFFFFFFFF1 # B - (0x94+6) = -0xf - (0x94+6) = -169 # DUMP: Disassembly of section .text: +# DUMP-EMPTY: # DUMP-NEXT: foo: # DUMP-NEXT: 94: {{.*}} -169(%rip), %eax diff --git a/lld/test/ELF/local-got-pie.s b/lld/test/ELF/local-got-pie.s --- a/lld/test/ELF/local-got-pie.s +++ b/lld/test/ELF/local-got-pie.s @@ -15,6 +15,7 @@ // 0x20B0 - 1001 - 5 = 4266 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // DISASM-NEXT: 1000: {{.*}} callq 4267 // DISASM: foo: diff --git a/lld/test/ELF/merge.s b/lld/test/ELF/merge.s --- a/lld/test/ELF/merge.s +++ b/lld/test/ELF/merge.s @@ -72,6 +72,7 @@ .globl _start _start: // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: movl .mysec, %eax diff --git a/lld/test/ELF/mips-26-mask.s b/lld/test/ELF/mips-26-mask.s --- a/lld/test/ELF/mips-26-mask.s +++ b/lld/test/ELF/mips-26-mask.s @@ -6,6 +6,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK: __start: # CHECK-NEXT: 20000: 0e 00 80 00 jal 134348800 diff --git a/lld/test/ELF/mips-26-n32-n64.s b/lld/test/ELF/mips-26-n32-n64.s --- a/lld/test/ELF/mips-26-n32-n64.s +++ b/lld/test/ELF/mips-26-n32-n64.s @@ -13,10 +13,13 @@ # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 0c 00 80 0c jal 131120 # CHECK-NEXT: 20004: 00 00 00 00 nop +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section .plt: +# CHECK-EMPTY: # CHECK-NEXT: .plt: # CHECK-NEXT: 20010: 3c 0e 00 03 lui $14, 3 # CHECK-NEXT: 20014: dd d9 00 08 ld $25, 8($14) diff --git a/lld/test/ELF/mips-26.s b/lld/test/ELF/mips-26.s --- a/lld/test/ELF/mips-26.s +++ b/lld/test/ELF/mips-26.s @@ -11,6 +11,7 @@ # RUN: | FileCheck -check-prefix=REL %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: bar: # CHECK-NEXT: 20000: 0c 00 80 06 jal 131096 # CHECK-NEXT: 20004: 00 00 00 00 nop @@ -24,7 +25,9 @@ # # CHECK: loc: # CHECK-NEXT: 20018: 00 00 00 00 nop +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section .plt: +# CHECK-EMPTY: # CHECK-NEXT: .plt: # CHECK-NEXT: 20020: 3c 1c 00 03 lui $gp, 3 # CHECK-NEXT: 20024: 8f 99 00 04 lw $25, 4($gp) diff --git a/lld/test/ELF/mips-64-gprel-so.s b/lld/test/ELF/mips-64-gprel-so.s --- a/lld/test/ELF/mips-64-gprel-so.s +++ b/lld/test/ELF/mips-64-gprel-so.s @@ -6,6 +6,7 @@ # RUN: llvm-objdump -d -t %t.so | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: foo: # CHECK-NEXT: 10000: 3c 1c 00 01 lui $gp, 1 # CHECK-NEXT: 10004: 03 99 e0 2d daddu $gp, $gp, $25 diff --git a/lld/test/ELF/mips-call-hilo.s b/lld/test/ELF/mips-call-hilo.s --- a/lld/test/ELF/mips-call-hilo.s +++ b/lld/test/ELF/mips-call-hilo.s @@ -7,6 +7,7 @@ # RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: foo: # CHECK-NEXT: 10000: 3c 02 00 00 lui $2, 0 # CHECK-NEXT: 10004: 8c 42 80 20 lw $2, -32736($2) diff --git a/lld/test/ELF/mips-call16.s b/lld/test/ELF/mips-call16.s --- a/lld/test/ELF/mips-call16.s +++ b/lld/test/ELF/mips-call16.s @@ -18,6 +18,7 @@ nop # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 10000: 8f 88 80 18 lw $8, -32744 diff --git a/lld/test/ELF/mips-got-hilo.s b/lld/test/ELF/mips-got-hilo.s --- a/lld/test/ELF/mips-got-hilo.s +++ b/lld/test/ELF/mips-got-hilo.s @@ -7,6 +7,7 @@ # RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: foo: # CHECK-NEXT: 10000: 3c 02 00 00 lui $2, 0 # CHECK-NEXT: 10004: 8c 42 80 20 lw $2, -32736($2) diff --git a/lld/test/ELF/mips-got16-relocatable.s b/lld/test/ELF/mips-got16-relocatable.s --- a/lld/test/ELF/mips-got16-relocatable.s +++ b/lld/test/ELF/mips-got16-relocatable.s @@ -9,6 +9,7 @@ # RUN: llvm-objdump -d %t.so | FileCheck -check-prefix=SO %s # OBJ: Disassembly of section .text: +# OBJ-EMPTY: # OBJ-NEXT: .text: # OBJ-NEXT: 0: 8f 99 00 00 lw $25, 0($gp) # OBJ-NEXT: 00000000: R_MIPS_GOT16 .data @@ -20,6 +21,7 @@ # OBJ-NEXT: 00000014: R_MIPS_LO16 .data # SO: Disassembly of section .text: +# SO-EMPTY: # SO-NEXT: .text: # SO-NEXT: 10000: 8f 99 80 18 lw $25, -32744($gp) # SO-NEXT: 10004: 27 24 00 00 addiu $4, $25, 0 diff --git a/lld/test/ELF/mips-got16.s b/lld/test/ELF/mips-got16.s --- a/lld/test/ELF/mips-got16.s +++ b/lld/test/ELF/mips-got16.s @@ -7,6 +7,7 @@ # RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 10000: 8f 88 80 18 lw $8, -32744($gp) # CHECK-NEXT: 10004: 21 08 00 2c addi $8, $8, 44 diff --git a/lld/test/ELF/mips-gp-disp.s b/lld/test/ELF/mips-gp-disp.s --- a/lld/test/ELF/mips-gp-disp.s +++ b/lld/test/ELF/mips-gp-disp.s @@ -19,6 +19,7 @@ # EXT-SO-NEXT: Value: 0x20000 # DIS: Disassembly of section .text: +# DIS-EMPTY: # DIS-NEXT: __start: # DIS-NEXT: 10000: 3c 08 00 01 lui $8, 1 # DIS-NEXT: 10004: 21 08 7f f0 addi $8, $8, 32752 diff --git a/lld/test/ELF/mips-gp-local.s b/lld/test/ELF/mips-gp-local.s --- a/lld/test/ELF/mips-gp-local.s +++ b/lld/test/ELF/mips-gp-local.s @@ -6,6 +6,7 @@ # RUN: llvm-objdump -d -t %t.exe | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 3c 08 00 03 lui $8, 3 # CHECK-NEXT: 20004: 21 08 7f f0 addi $8, $8, 32752 diff --git a/lld/test/ELF/mips-hilo-gp-disp.s b/lld/test/ELF/mips-hilo-gp-disp.s --- a/lld/test/ELF/mips-hilo-gp-disp.s +++ b/lld/test/ELF/mips-hilo-gp-disp.s @@ -20,6 +20,7 @@ addi $t0,$t0,%lo(_gp_disp) # EXE: Disassembly of section .text: +# EXE-EMPTY: # EXE-NEXT: __start: # EXE-NEXT: 20000: 3c 08 00 02 lui $8, 2 # ^-- %hi(0x47ff0-0x20000) @@ -37,6 +38,7 @@ # EXE: 00020000 .text 00000000 __start # SO: Disassembly of section .text: +# SO-EMPTY: # SO-NEXT: __start: # SO-NEXT: 10000: 3c 08 00 02 lui $8, 2 # ^-- %hi(0x28000-0x10000) diff --git a/lld/test/ELF/mips-hilo-hi-only.s b/lld/test/ELF/mips-hilo-hi-only.s --- a/lld/test/ELF/mips-hilo-hi-only.s +++ b/lld/test/ELF/mips-hilo-hi-only.s @@ -16,6 +16,7 @@ # WARN: can't find matching R_MIPS_LO16 relocation for R_MIPS_HI16 # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 3c 08 00 03 lui $8, 3 # ^-- %hi(__start) w/o addend diff --git a/lld/test/ELF/mips-hilo.s b/lld/test/ELF/mips-hilo.s --- a/lld/test/ELF/mips-hilo.s +++ b/lld/test/ELF/mips-hilo.s @@ -30,6 +30,7 @@ .word 0 # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 3c 08 00 02 lui $8, 2 # ^-- %hi(__start+4) diff --git a/lld/test/ELF/mips-micro-jal.s b/lld/test/ELF/mips-micro-jal.s --- a/lld/test/ELF/mips-micro-jal.s +++ b/lld/test/ELF/mips-micro-jal.s @@ -47,6 +47,7 @@ # RUN: | FileCheck --check-prefix=MIXED %s # EB: Disassembly of section .plt: +# EB-EMPTY: # EB-NEXT: .plt: # EB-NEXT: 20010: 79 80 3f fd addiupc $3, 65524 # EB-NEXT: 20014: ff 23 00 00 lw $25, 0($3) @@ -64,6 +65,7 @@ # EB-NEXT: 2003a: 0f 02 move $24, $2 # EL: Disassembly of section .plt: +# EL-EMPTY: # EL-NEXT: .plt: # EL-NEXT: 20010: 80 79 fd 3f addiupc $3, 65524 # EL-NEXT: 20014: 23 ff 00 00 lw $25, 0($3) @@ -81,6 +83,7 @@ # EL-NEXT: 2003a: 02 0f move $24, $2 # EBR6: Disassembly of section .plt: +# EBR6-EMPTY: # EBR6-NEXT: .plt: # EBR6-NEXT: 20010: 78 60 3f fd lapc $3, 65524 # EBR6-NEXT: 20014: ff 23 00 00 lw $25, 0($3) @@ -97,6 +100,7 @@ # EBR6-NEXT: 2003a: 47 23 jrc16 $25 # ELR6: Disassembly of section .plt: +# ELR6-EMPTY: # ELR6-NEXT: .plt: # ELR6-NEXT: 20010: 60 78 fd 3f lapc $3, 65524 # ELR6-NEXT: 20014: 23 ff 00 00 lw $25, 0($3) @@ -113,6 +117,7 @@ # ELR6-NEXT: 2003a: 23 47 jrc16 $25 # MIXED: Disassembly of section .plt: +# MIXED-EMPTY: # MIXED-NEXT: .plt: # MIXED-NEXT: 20020: 79 80 3f f9 addiupc $3, 65508 # MIXED-NEXT: 20024: ff 23 00 00 lw $25, 0($3) diff --git a/lld/test/ELF/mips-n32-rels.s b/lld/test/ELF/mips-n32-rels.s --- a/lld/test/ELF/mips-n32-rels.s +++ b/lld/test/ELF/mips-n32-rels.s @@ -24,6 +24,7 @@ .gpword(loc) # R_MIPS_GPREL32 # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 3c 1c 00 01 lui $gp, 1 # ^-- 0x20000 - 0x37ff0 diff --git a/lld/test/ELF/mips-npic-call-pic-os.s b/lld/test/ELF/mips-npic-call-pic-os.s --- a/lld/test/ELF/mips-npic-call-pic-os.s +++ b/lld/test/ELF/mips-npic-call-pic-os.s @@ -14,6 +14,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __LA25Thunk_foo1a: # CHECK-NEXT: 20000: 3c 19 00 02 lui $25, 2 # CHECK-NEXT: 20004: 08 00 80 08 j 131104 @@ -52,7 +53,9 @@ # CHECK: fnpic: # CHECK-NEXT: 20070: 00 00 00 00 nop +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section differentos: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20074: 0c 00 80 00 jal 131072 <__LA25Thunk_foo1a> # CHECK-NEXT: 20078: 00 00 00 00 nop @@ -74,6 +77,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=REVERSE %s # REVERSE: Disassembly of section .text: +# REVERSE-EMPTY: # REVERSE-NEXT: __LA25Thunk_foo1a: # REVERSE-NEXT: 20000: 3c 19 00 02 lui $25, 2 # REVERSE-NEXT: 20004: 08 00 80 08 j 131104 @@ -114,6 +118,7 @@ # REVERSE-NEXT: 20070: 00 00 00 00 nop # REVERSE: Disassembly of section differentos: +# REVERSE-EMPTY: # REVERSE-NEXT: __start: # REVERSE-NEXT: 20074: 0c 00 80 00 jal 131072 <__LA25Thunk_foo1a> # REVERSE-NEXT: 20078: 00 00 00 00 nop diff --git a/lld/test/ELF/mips-npic-call-pic-script.s b/lld/test/ELF/mips-npic-call-pic-script.s --- a/lld/test/ELF/mips-npic-call-pic-script.s +++ b/lld/test/ELF/mips-npic-call-pic-script.s @@ -14,6 +14,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s # CHECK: Disassembly of section .out: +# CHECK-EMPTY: # CHECK-NEXT: __LA25Thunk_foo1a: # CHECK-NEXT: 20000: 3c 19 00 02 lui $25, 2 # CHECK-NEXT: 20004: 08 00 80 08 j 131104 @@ -84,6 +85,7 @@ # RUN: llvm-objdump -d %t2.exe | FileCheck -check-prefix=ORPH1 %s # ORPH1: Disassembly of section .text: +# ORPH1-EMPTY: # ORPH1-NEXT: __start: # ORPH1-NEXT: 20000: 0c 00 80 15 jal 131156 <__LA25Thunk_foo1a> # ORPH1-NEXT: 20004: 00 00 00 00 nop @@ -144,6 +146,7 @@ # RUN: llvm-objdump -d %t3.exe | FileCheck -check-prefix=ORPH2 %s # ORPH2: Disassembly of section .out: +# ORPH2-EMPTY: # ORPH2-NEXT: __start: # ORPH2-NEXT: 20000: 0c 00 80 18 jal 131168 <__LA25Thunk_foo1a> # ORPH2-NEXT: 20004: 00 00 00 00 nop @@ -169,7 +172,9 @@ # ORPH2: fnpic: # ORPH2-NEXT: 20050: 00 00 00 00 nop +# ORPH2-EMPTY: # ORPH2-NEXT: Disassembly of section .text: +# ORPH2-EMPTY: # ORPH2-NEXT: __LA25Thunk_foo1a: # ORPH2-NEXT: 20060: 3c 19 00 02 lui $25, 2 diff --git a/lld/test/ELF/mips-npic-call-pic.s b/lld/test/ELF/mips-npic-call-pic.s --- a/lld/test/ELF/mips-npic-call-pic.s +++ b/lld/test/ELF/mips-npic-call-pic.s @@ -27,6 +27,7 @@ # RUN: llvm-objdump -d %t-r6.exe | FileCheck --check-prefixes=CHECK,R6 %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 0c 00 80 0c jal 131120 <__LA25Thunk_foo1a> # CHECK-NEXT: 20004: 00 00 00 00 nop @@ -94,6 +95,7 @@ # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefixes=REVERSE,REV-R6 %s # REVERSE: Disassembly of section .text: +# REVERSE-EMPTY: # REVERSE-NEXT: __LA25Thunk_foo1a: # REV-R2: 20000: 3c 19 00 02 lui $25, 2 # REV-R6: 20000: 3c 19 00 02 aui $25, $zero, 2 diff --git a/lld/test/ELF/mips-pc-relocs.s b/lld/test/ELF/mips-pc-relocs.s --- a/lld/test/ELF/mips-pc-relocs.s +++ b/lld/test/ELF/mips-pc-relocs.s @@ -22,6 +22,7 @@ .word _foo+8-. # R_MIPS_PC32 # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: ec c8 00 08 lwpc $6, 32 # ^-- (0x20020-0x20000)>>2 diff --git a/lld/test/ELF/mips-plt-n32.s b/lld/test/ELF/mips-plt-n32.s --- a/lld/test/ELF/mips-plt-n32.s +++ b/lld/test/ELF/mips-plt-n32.s @@ -14,12 +14,15 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=HAZARDPLT,CHECK # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 0c 00 80 0c jal 131120 # ^-- 0x20030 gotplt[foo0] # CHECK-NEXT: 20004: 00 00 00 00 nop # +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section .plt: +# CHECK-EMPTY: # CHECK-NEXT: .plt: # CHECK-NEXT: 20010: 3c 0e 00 03 lui $14, 3 # CHECK-NEXT: 20014: 8d d9 00 04 lw $25, 4($14) diff --git a/lld/test/ELF/mips-plt-r6.s b/lld/test/ELF/mips-plt-r6.s --- a/lld/test/ELF/mips-plt-r6.s +++ b/lld/test/ELF/mips-plt-r6.s @@ -13,12 +13,15 @@ # RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=HAZARDPLT,CHECK # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 0c 00 80 0c jal 131120 # ^-- 0x20030 gotplt[foo0] # CHECK-NEXT: 20004: 00 00 00 00 nop # +# CHECK-EMPTY: # CHECK-NEXT: Disassembly of section .plt: +# CHECK-EMPTY: # CHECK-NEXT: .plt: # CHECK-NEXT: 20010: 3c 1c 00 03 aui $gp, $zero, 3 # CHECK-NEXT: 20014: 8f 99 00 04 lw $25, 4($gp) diff --git a/lld/test/ELF/mips-xgot-order.s b/lld/test/ELF/mips-xgot-order.s --- a/lld/test/ELF/mips-xgot-order.s +++ b/lld/test/ELF/mips-xgot-order.s @@ -7,6 +7,7 @@ # RUN: llvm-objdump -d -s -t %t.exe | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: __start: # CHECK-NEXT: 20000: 3c 02 00 00 lui $2, 0 # CHECK-NEXT: 20004: 8c 42 80 24 lw $2, -32732($2) diff --git a/lld/test/ELF/msp430.s b/lld/test/ELF/msp430.s --- a/lld/test/ELF/msp430.s +++ b/lld/test/ELF/msp430.s @@ -13,6 +13,7 @@ jmp _start ; CHECK: Disassembly of section .text: +; CHECK-EMPTY: ; CHECK-NEXT: _start: ; CHECK-NEXT: 8000: {{.*}} nop ; CHECK: foo: diff --git a/lld/test/ELF/no-inhibit-exec.s b/lld/test/ELF/no-inhibit-exec.s --- a/lld/test/ELF/no-inhibit-exec.s +++ b/lld/test/ELF/no-inhibit-exec.s @@ -6,6 +6,7 @@ # RUN: llvm-readobj -r %t2 | FileCheck %s --check-prefix=RELOC # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: _start # CHECK-NEXT: 201000: {{.*}} callq -2101253 diff --git a/lld/test/ELF/non-abs-reloc.s b/lld/test/ELF/non-abs-reloc.s --- a/lld/test/ELF/non-abs-reloc.s +++ b/lld/test/ELF/non-abs-reloc.s @@ -6,6 +6,7 @@ // RUN: llvm-objdump -D %t | FileCheck --check-prefix=DISASM %s // DISASM: Disassembly of section .nonalloc: +// DISASM-EMPTY: // DISASM-NEXT: .nonalloc: // DISASM-NEXT: 0: {{.*}} callq {{.*}} <_start> // DISASM-NEXT: 5: {{.*}} callq {{.*}} <_start> diff --git a/lld/test/ELF/non-alloc-link-order-gc.s b/lld/test/ELF/non-alloc-link-order-gc.s --- a/lld/test/ELF/non-alloc-link-order-gc.s +++ b/lld/test/ELF/non-alloc-link-order-gc.s @@ -6,6 +6,7 @@ ## Check that we are able to GC non-allocatable metadata sections without crash. # CHECK: Disassembly of section .stack_sizes: +# CHECK-EMPTY: # CHECK-NEXT: .stack_sizes: # CHECK-NEXT: 01 diff --git a/lld/test/ELF/plt-aarch64.s b/lld/test/ELF/plt-aarch64.s --- a/lld/test/ELF/plt-aarch64.s +++ b/lld/test/ELF/plt-aarch64.s @@ -70,6 +70,7 @@ // DISASMDSO-NEXT: 1000c: 1f 20 03 d5 nop // DISASMDSO: Disassembly of section .plt: +// DISASMDSO-EMPTY: // DISASMDSO-NEXT: .plt: // DISASMDSO-NEXT: 10010: f0 7b bf a9 stp x16, x30, [sp, #-16]! // &(.got.plt[2]) = 0x3000 + 2 * 8 = 0x3010 @@ -169,6 +170,7 @@ // DISASMEXE-NEXT: 21000c: 1f 20 03 d5 nop // DISASMEXE: Disassembly of section .plt: +// DISASMEXE-EMPTY: // DISASMEXE-NEXT: .plt: // DISASMEXE-NEXT: 210010: f0 7b bf a9 stp x16, x30, [sp, #-16]! // &(.got.plt[2]) = 0x2200B0 + 2 * 8 = 0x2200C0 diff --git a/lld/test/ELF/plt-i686.s b/lld/test/ELF/plt-i686.s --- a/lld/test/ELF/plt-i686.s +++ b/lld/test/ELF/plt-i686.s @@ -72,6 +72,7 @@ // 4206604 = 0x40300C = .got.plt (0x403000) + got.plt.reserved(12) // 4206608 = 0x403010 = .got.plt (0x403000) + got.plt.reserved(12) + 4 // DISASM: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 401020: ff 35 04 30 40 00 pushl 4206596 // DISASM-NEXT: 401026: ff 25 08 30 40 00 jmpl *4206600 @@ -137,7 +138,9 @@ // DISASMSHARED-NEXT: 1009: e9 22 00 00 00 jmp 34 // DISASMSHARED-NEXT: 100e: e9 2d 00 00 00 jmp 45 // DISASMSHARED-NEXT: 1013: e9 e8 ff ff ff jmp -24 +// DISASMSHARED-EMPTY: // DISASMSHARED-NEXT: Disassembly of section .plt: +// DISASMSHARED-EMPTY: // DISASMSHARED-NEXT: .plt: // DISASMSHARED-NEXT: 1020: ff b3 04 00 00 00 pushl 4(%ebx) // DISASMSHARED-NEXT: 1026: ff a3 08 00 00 00 jmpl *8(%ebx) @@ -155,6 +158,7 @@ // DISASMSHARED-NEXT: 104b: e9 d0 ff ff ff jmp -48 <.plt> // DISASMPIE: Disassembly of section .plt: +// DISASMPIE-EMPTY: // DISASMPIE-NEXT: .plt: // DISASMPIE-NEXT: 1020: ff b3 04 00 00 00 pushl 4(%ebx) // DISASMPIE-NEXT: 1026: ff a3 08 00 00 00 jmpl *8(%ebx) diff --git a/lld/test/ELF/plt.s b/lld/test/ELF/plt.s --- a/lld/test/ELF/plt.s +++ b/lld/test/ELF/plt.s @@ -69,6 +69,7 @@ // 0x3028 - 0x1056 = 8146 // DISASM: Disassembly of section .plt: +// DISASM-EMPTY: // DISASM-NEXT: .plt: // DISASM-NEXT: 1020: ff 35 e2 1f 00 00 pushq 8162(%rip) // DISASM-NEXT: 1026: ff 25 e4 1f 00 00 jmpq *8164(%rip) @@ -104,6 +105,7 @@ // 0x202020 - 0x201046 = 4058 // DISASM2: Disassembly of section .plt: +// DISASM2-EMPTY: // DISASM2-NEXT: .plt: // DISASM2-NEXT: 201020: ff 35 e2 1f 00 00 pushq 8162(%rip) // DISASM2-NEXT: 201026: ff 25 e4 1f 00 00 jmpq *8164(%rip) diff --git a/lld/test/ELF/ppc-relocs.s b/lld/test/ELF/ppc-relocs.s --- a/lld/test/ELF/ppc-relocs.s +++ b/lld/test/ELF/ppc-relocs.s @@ -13,6 +13,7 @@ len = . - msg # CHECK: Disassembly of section .R_PPC_ADDR16_HA: +# CHECK-EMPTY: # CHECK: _start: # CHECK: 11000: lis 4, 1 # CHECK: msg: @@ -27,6 +28,7 @@ leni = . - msgi # CHECK: Disassembly of section .R_PPC_ADDR16_HI: +# CHECK-EMPTY: # CHECK: _starti: # CHECK: 11008: lis 4, 1 # CHECK: msgi: @@ -39,6 +41,7 @@ len = . - mystr # CHECK: Disassembly of section .R_PPC_ADDR16_LO: +# CHECK-EMPTY: # CHECK: .R_PPC_ADDR16_LO: # CHECK: 11010: addi 4, 4, 4100 # CHECK: mystr: @@ -53,6 +56,7 @@ .Lfoox: # CHECK: Disassembly of section .R_PPC_REL24: +# CHECK-EMPTY: # CHECK: .FR_PPC_REL24: # CHECK: 1101c: b .+4 @@ -64,6 +68,7 @@ .Lfooy: # CHECK: Disassembly of section .R_PPC_REL14: +# CHECK-EMPTY: # CHECK: .FR_PPC_REL14: # CHECK: 11020: bt 2, .+4 @@ -96,5 +101,6 @@ .Lfoox4: # CHECK: Disassembly of section .R_PPC_PLTREL24: +# CHECK-EMPTY: # CHECK: .R_PPC_PLTREL24: # CHECK: 1102c: b .+4 diff --git a/lld/test/ELF/ppc64-got-indirect.s b/lld/test/ELF/ppc64-got-indirect.s --- a/lld/test/ELF/ppc64-got-indirect.s +++ b/lld/test/ELF/ppc64-got-indirect.s @@ -88,28 +88,34 @@ # CHECK: 1001001c: {{.*}} lwa 3, 0(3) # CHECK-LE: Disassembly of section .got: +# CHECK-LE-EMPTY: # CHECK-LE-NEXT: .got: # CHECK-LE-NEXT: 10020000: 00 80 02 10 # CHECK-LE-NEXT: 10020004: 00 00 00 00 # Verify that .toc comes right after .got # CHECK-LE: Disassembly of section .toc: +# CHECK-LE-EMPTY: # CHECK-LE: 10020008: 00 00 03 10 # CHECK-LE: Disassembly of section .data: +# CHECK-LE-EMPTY: # CHECK-LE-NEXT: glob: # CHECK-LE-NEXT: 10030000: 37 00 00 00 # CHECK-BE: Disassembly of section .got: +# CHECK-BE-EMPTY: # CHECK-BE-NEXT: .got: # CHECK-BE-NEXT: 10020000: 00 00 00 00 # CHECK-BE-NEXT: 10020004: 10 02 80 00 # Verify that .toc comes right after .got # CHECK-BE: Disassembly of section .toc: +# CHECK-BE-EMPTY: # CHECK-BE: 10020008: 00 00 00 00 # CHECK-BE: 1002000c: 10 03 00 00 # CHECK-BE: Disassembly of section .data: +# CHECK-BE-EMPTY: # CHECK-BE-NEXT: glob: # CHECK-BE-NEXT: 10030000: 00 00 00 37 diff --git a/lld/test/ELF/ppc64-plt-stub.s b/lld/test/ELF/ppc64-plt-stub.s --- a/lld/test/ELF/ppc64-plt-stub.s +++ b/lld/test/ELF/ppc64-plt-stub.s @@ -13,6 +13,7 @@ // RUN: llvm-objdump -d %t | FileCheck %s // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: __plt_foo: // CHECK-NEXT: std 2, 24(1) // CHECK-NEXT: addis 12, 2, 0 diff --git a/lld/test/ELF/ppc64-rel-calls.s b/lld/test/ELF/ppc64-rel-calls.s --- a/lld/test/ELF/ppc64-rel-calls.s +++ b/lld/test/ELF/ppc64-rel-calls.s @@ -9,6 +9,7 @@ # RUN: llvm-objdump -d %t2 | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: .text .global _start diff --git a/lld/test/ELF/ppc64-relocs.s b/lld/test/ELF/ppc64-relocs.s --- a/lld/test/ELF/ppc64-relocs.s +++ b/lld/test/ELF/ppc64-relocs.s @@ -35,6 +35,7 @@ ld 1, .L1@toc@l(2) # CHECK: Disassembly of section .R_PPC64_TOC16_LO_DS: +# CHECK-EMPTY: # CHECK: .FR_PPC64_TOC16_LO_DS: # CHECK: 1001000c: ld 1, -32768(2) @@ -44,6 +45,7 @@ addi 1, 2, .L1@toc@l # CHECK: Disassembly of section .R_PPC64_TOC16_LO: +# CHECK-EMPTY: # CHECK: .FR_PPC64_TOC16_LO: # CHECK: 10010010: addi 1, 2, -32768 @@ -53,6 +55,7 @@ addis 1, 2, .L1@toc@h # CHECK: Disassembly of section .R_PPC64_TOC16_HI: +# CHECK-EMPTY: # CHECK: .FR_PPC64_TOC16_HI: # CHECK: 10010014: addis 1, 2, -1 @@ -62,6 +65,7 @@ addis 1, 2, .L1@toc@ha # CHECK: Disassembly of section .R_PPC64_TOC16_HA: +# CHECK-EMPTY: # CHECK: .FR_PPC64_TOC16_HA: # CHECK: 10010018: nop @@ -73,6 +77,7 @@ .Lfoox: # CHECK: Disassembly of section .R_PPC64_REL24: +# CHECK-EMPTY: # CHECK: .FR_PPC64_REL24: # CHECK: 1001001c: b .+4 @@ -84,6 +89,7 @@ .Lfooy: # CHECK: Disassembly of section .R_PPC64_REL14: +# CHECK-EMPTY: # CHECK: .FR_PPC64_REL14: # CHECK: 10010020: bt 2, .+4 @@ -93,6 +99,7 @@ li 1, .Lfoo@l # CHECK: Disassembly of section .R_PPC64_ADDR16_LO: +# CHECK-EMPTY: # CHECK: .FR_PPC64_ADDR16_LO: # CHECK: 10010024: li 1, 0 @@ -102,6 +109,7 @@ li 1, .Lfoo@h # CHECK: Disassembly of section .R_PPC64_ADDR16_HI: +# CHECK-EMPTY: # CHECK: .FR_PPC64_ADDR16_HI: # CHECK: 10010028: li 1, 4097 @@ -111,6 +119,7 @@ li 1, .Lfoo@ha # CHECK: Disassembly of section .R_PPC64_ADDR16_HA: +# CHECK-EMPTY: # CHECK: .FR_PPC64_ADDR16_HA: # CHECK: 1001002c: li 1, 4097 @@ -120,6 +129,7 @@ li 1, .Lfoo@higher # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHER: +# CHECK-EMPTY: # CHECK: .FR_PPC64_ADDR16_HIGHER: # CHECK: 10010030: li 1, 0 @@ -129,6 +139,7 @@ li 1, .Lfoo@highera # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHERA: +# CHECK-EMPTY: # CHECK: .FR_PPC64_ADDR16_HIGHERA: # CHECK: 10010034: li 1, 0 @@ -138,6 +149,7 @@ li 1, .Lfoo@highest # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHEST: +# CHECK-EMPTY: # CHECK: .FR_PPC64_ADDR16_HIGHEST: # CHECK: 10010038: li 1, 0 @@ -147,6 +159,7 @@ li 1, .Lfoo@highesta # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHESTA: +# CHECK-EMPTY: # CHECK: .FR_PPC64_ADDR16_HIGHESTA: # CHECK: 1001003c: li 1, 0 @@ -168,6 +181,7 @@ # should equal address of LBB0_2. # 0x10000190 + 0xfeb4 = 0x10010044 # CHECK: Disassembly of section .R_PPC64_REL32: +# CHECK-EMPTY: # CHECK: .FR_PPC64_REL32: # CHECK: 10010040: nop # CHECK: 10010044: ld 5, -32736(2) diff --git a/lld/test/ELF/ppc64-toc-restore.s b/lld/test/ELF/ppc64-toc-restore.s --- a/lld/test/ELF/ppc64-toc-restore.s +++ b/lld/test/ELF/ppc64-toc-restore.s @@ -31,6 +31,7 @@ // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK: _start: // CHECK: 1001001c: bl .-28 // CHECK-NOT: 10010020: nop diff --git a/lld/test/ELF/ppc64-weak-undef-call.s b/lld/test/ELF/ppc64-weak-undef-call.s --- a/lld/test/ELF/ppc64-weak-undef-call.s +++ b/lld/test/ELF/ppc64-weak-undef-call.s @@ -9,6 +9,7 @@ # RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s # CHECK: Disassembly of section .text: +# CHECK-EMPTY: .text .global _start diff --git a/lld/test/ELF/pr34660.s b/lld/test/ELF/pr34660.s --- a/lld/test/ELF/pr34660.s +++ b/lld/test/ELF/pr34660.s @@ -13,6 +13,7 @@ # correct symbol. # DISASM: Disassembly of section .text: +# DISASM-EMPTY: # DISASM-NEXT: $x.0: # DISASM-NEXT: 10000: 28 00 10 58 ldr x8, #131076 diff --git a/lld/test/ELF/pre_init_fini_array_missing.s b/lld/test/ELF/pre_init_fini_array_missing.s --- a/lld/test/ELF/pre_init_fini_array_missing.s +++ b/lld/test/ELF/pre_init_fini_array_missing.s @@ -20,6 +20,7 @@ // ... // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 201000: e8 fb ff ff ff callq -5 // CHECK-NEXT: 201005: e8 f6 ff ff ff callq -10 @@ -31,6 +32,7 @@ // In position-independent binaries, they resolve to .text too. // PIE: Disassembly of section .text: +// PIE-EMPTY: // PIE-NEXT: _start: // PIE-NEXT: 1000: e8 fb ff ff ff callq -5 // PIE-NEXT: 1005: e8 f6 ff ff ff callq -10 diff --git a/lld/test/ELF/relocatable-symbols.s b/lld/test/ELF/relocatable-symbols.s --- a/lld/test/ELF/relocatable-symbols.s +++ b/lld/test/ELF/relocatable-symbols.s @@ -18,12 +18,16 @@ # DISASM-NEXT: 2d: {{.*}} callq 0 # DISASM-NEXT: 32: {{.*}} callq 0 # DISASM-NEXT: 37: {{.*}} callq 0 +# DISASM-EMPTY: # DISASM-NEXT: Disassembly of section foo: +# DISASM-EMPTY: # DISASM-NEXT: foo: # DISASM-NEXT: 0: 90 nop # DISASM-NEXT: 1: 90 nop # DISASM-NEXT: 2: 90 nop +# DISASM-EMPTY: # DISASM-NEXT: Disassembly of section bar: +# DISASM-EMPTY: # DISASM-NEXT: bar: # DISASM-NEXT: 0: 90 nop # DISASM-NEXT: 1: 90 nop diff --git a/lld/test/ELF/relocatable.s b/lld/test/ELF/relocatable.s --- a/lld/test/ELF/relocatable.s +++ b/lld/test/ELF/relocatable.s @@ -64,6 +64,7 @@ # SECTION: 7 .strtab 0000002d 0000000000000000 # CHECKTEXT: Disassembly of section .text: +# CHECKTEXT-EMPTY: # CHECKTEXT-NEXT: main: # CHECKTEXT-NEXT: 0: c7 04 25 00 00 00 00 05 00 00 00 movl $5, 0 # CHECKTEXT-NEXT: b: c7 04 25 00 00 00 00 07 00 00 00 movl $7, 0 diff --git a/lld/test/ELF/relocation-b-aarch64.test b/lld/test/ELF/relocation-b-aarch64.test --- a/lld/test/ELF/relocation-b-aarch64.test +++ b/lld/test/ELF/relocation-b-aarch64.test @@ -8,6 +8,7 @@ # immediate. We use this property to overwrite instructions with a branch. # CHECK: Disassembly of section .text: +# CHECK-EMPTY: # CHECK-NEXT: foo: # CHECK-NEXT: 210000: 01 00 00 14 b #4 # CHECK: bar: diff --git a/lld/test/ELF/relocation-copy-i686.s b/lld/test/ELF/relocation-copy-i686.s --- a/lld/test/ELF/relocation-copy-i686.s +++ b/lld/test/ELF/relocation-copy-i686.s @@ -57,6 +57,7 @@ // 4206608 = 0x403000 + 16 // 4206612 = 0x403000 + 16 + 4 // CODE: Disassembly of section .text: +// CODE-EMPTY: // CODE-NEXT: main: // CODE-NEXT: 401000: c7 05 00 30 40 00 05 00 00 00 movl $5, 4206592 // CODE-NEXT: 40100a: c7 05 10 30 40 00 07 00 00 00 movl $7, 4206608 diff --git a/lld/test/ELF/relocation-copy.s b/lld/test/ELF/relocation-copy.s --- a/lld/test/ELF/relocation-copy.s +++ b/lld/test/ELF/relocation-copy.s @@ -58,6 +58,7 @@ // 2109456 = 0x203000 + 16 // 2109460 = 0x203000 + 16 + 4 // CODE: Disassembly of section .text: +// CODE-EMPTY: // CODE-NEXT: _start: // CODE-NEXT: 201000: {{.*}} movl $5, 2109440 // CODE-NEXT: 20100b: {{.*}} movl $7, 2109456 diff --git a/lld/test/ELF/relocation-i686.s b/lld/test/ELF/relocation-i686.s --- a/lld/test/ELF/relocation-i686.s +++ b/lld/test/ELF/relocation-i686.s @@ -26,10 +26,12 @@ nop // CHECK: Disassembly of section .R_386_32: +// CHECK-EMPTY: // CHECK-NEXT: R_386_32: // CHECK-NEXT: 401000: {{.*}} movl $4198401, %edx // CHECK: Disassembly of section .R_386_PC32: +// CHECK-EMPTY: // CHECK-NEXT: R_386_PC32: // CHECK-NEXT: 401005: e8 04 00 00 00 calll 4 @@ -66,6 +68,7 @@ // 0x403000 (.got.plt) - 0x401014 = 8300 // CHECK: Disassembly of section .R_386_GOTPC: +// CHECK-EMPTY: // CHECK-NEXT: R_386_GOTPC: // CHECK-NEXT: 401014: {{.*}} movl $8172, %eax @@ -73,6 +76,7 @@ call bar // addr(.plt) + 16 - (0x401019 + 5) = 50 // CHECK: Disassembly of section .dynamic_reloc: +// CHECK-EMPTY: // CHECK-NEXT: .dynamic_reloc: // CHECK-NEXT: 401019: e8 32 00 00 00 calll 50 @@ -87,6 +91,7 @@ // 4294963320 = 0xfffff078 = got[0](0x402078) - .got.plt(0x403000) // 4294963324 = 0xfffff07c = got[1](0x40207c) - .got(0x403000) // CHECK: Disassembly of section .R_386_GOT32: +// CHECK-EMPTY: // CHECK-NEXT: R_386_GOT32: // CHECK-NEXT: 40101e: a1 78 f0 ff ff movl 4294963320, %eax // CHECK-NEXT: 401023: a1 7c f0 ff ff movl 4294963324, %eax diff --git a/lld/test/ELF/relocation-local.s b/lld/test/ELF/relocation-local.s --- a/lld/test/ELF/relocation-local.s +++ b/lld/test/ELF/relocation-local.s @@ -19,6 +19,7 @@ // FIXME: this would be far more self evident if llvm-objdump printed // constants in hex. // CHECK: Disassembly of section .text2: +// CHECK-EMPTY: // CHECK-NEXT: R_X86_64_32: // CHECK-NEXT: 201009: {{.*}} movl $2101257, %edx @@ -27,6 +28,7 @@ movq lulz - 0x100000, %rdx // CHECK: Disassembly of section .R_X86_64_32S: +// CHECK-EMPTY: // CHECK-NEXT: R_X86_64_32S: // CHECK-NEXT: {{.*}}: {{.*}} movq 1052681, %rdx diff --git a/lld/test/ELF/relocation-size-shared.s b/lld/test/ELF/relocation-size-shared.s --- a/lld/test/ELF/relocation-size-shared.s +++ b/lld/test/ELF/relocation-size-shared.s @@ -18,6 +18,7 @@ // RELOCSHARED-NEXT:] // DISASM: Disassembly of section test +// DISASM-EMPTY: // DISASM: _data: // DISASM-NEXT: 201000: 19 00 // DISASM-NEXT: 201002: 00 00 diff --git a/lld/test/ELF/relocation-size.s b/lld/test/ELF/relocation-size.s --- a/lld/test/ELF/relocation-size.s +++ b/lld/test/ELF/relocation-size.s @@ -11,6 +11,7 @@ // NORELOC-NEXT: ] // DISASM: Disassembly of section test: +// DISASM-EMPTY: // DISASM-NEXT: _data: // DISASM-NEXT: 201000: 19 00 // DISASM-NEXT: 201002: 00 00 @@ -56,6 +57,7 @@ // RELOCSHARED-NEXT: ] // DISASMSHARED: Disassembly of section test: +// DISASMSHARED-EMPTY: // DISASMSHARED-NEXT: _data: // DISASMSHARED-NEXT: ... // DISASMSHARED-NEXT: 1018: 19 00 diff --git a/lld/test/ELF/relocation.s b/lld/test/ELF/relocation.s --- a/lld/test/ELF/relocation.s +++ b/lld/test/ELF/relocation.s @@ -58,6 +58,7 @@ nop // CHECK: Disassembly of section .text: +// CHECK-EMPTY: // CHECK-NEXT: _start: // CHECK-NEXT: 201000: e8 04 00 00 00 callq 4 // CHECK-NEXT: 201005: @@ -74,6 +75,7 @@ // FIXME: this would be far more self evident if llvm-objdump printed // constants in hex. // CHECK: Disassembly of section .text2: +// CHECK-EMPTY: // CHECK-NEXT: R_X86_64_32: // CHECK-NEXT: 20100a: {{.*}} movl $2101258, %edx @@ -83,6 +85,7 @@ movq lulz - 0x100000, %rdx // CHECK: Disassembly of section .R_X86_64_32S: +// CHECK-EMPTY: // CHECK-NEXT: R_X86_64_32S: // CHECK-NEXT: {{.*}}: {{.*}} movq 1052681, %rdx @@ -94,6 +97,7 @@ //16 is a size of PLT[0] // 0x201030 + 16 - (0x201017 + 5) = 20 // CHECK: Disassembly of section .R_X86_64_PC32: +// CHECK-EMPTY: // CHECK-NEXT: R_X86_64_PC32: // CHECK-NEXT: 201017: {{.*}} callq 36 // CHECK-NEXT: 20101c: {{.*}} movl $2101312, %eax @@ -104,6 +108,7 @@ mov bar2, %eax // plt is at 0x201030. The second plt entry is at 0x201050 == 69712 // CHECK: Disassembly of section .R_X86_64_32S_2: +// CHECK-EMPTY: // CHECK-NEXT: R_X86_64_32S_2: // CHECK-NEXT: 201021: {{.*}} movl 2101328, %eax diff --git a/lld/test/ELF/startstop-gccollect.s b/lld/test/ELF/startstop-gccollect.s --- a/lld/test/ELF/startstop-gccollect.s +++ b/lld/test/ELF/startstop-gccollect.s @@ -20,10 +20,14 @@ # DISASM: _start: # DISASM-NEXT: 201000: e8 05 00 00 00 callq 5 <__start_foo> # DISASM-NEXT: 201005: e8 02 00 00 00 callq 2 <__stop_bar> +# DISASM-EMPTY: # DISASM-NEXT: Disassembly of section foo: +# DISASM-EMPTY: # DISASM-NEXT: __start_foo: # DISASM-NEXT: 20100a: 90 nop +# DISASM-EMPTY: # DISASM-NEXT: Disassembly of section bar: +# DISASM-EMPTY: # DISASM-NEXT: bar: # DISASM-NEXT: 20100b: 90 nop diff --git a/lld/test/ELF/startstop.s b/lld/test/ELF/startstop.s --- a/lld/test/ELF/startstop.s +++ b/lld/test/ELF/startstop.s @@ -9,11 +9,13 @@ // DISASM: 1005: {{.*}} callq 8 // DISASM: 100a: {{.*}} callq 3 // DISASM: Disassembly of section foo: +// DISASM-EMPTY: // DISASM: __start_foo: // DISASM: 100f: 90 nop // DISASM: 1010: 90 nop // DISASM: 1011: 90 nop // DISASM: Disassembly of section bar: +// DISASM-EMPTY: // DISASM: __start_bar: // DISASM: 1012: 90 nop // DISASM: 1013: 90 nop diff --git a/lld/test/ELF/tls-dynamic-i686.s b/lld/test/ELF/tls-dynamic-i686.s --- a/lld/test/ELF/tls-dynamic-i686.s +++ b/lld/test/ELF/tls-dynamic-i686.s @@ -76,6 +76,7 @@ // CHECK-NEXT: } // DIS: Disassembly of section .text: +// DIS-EMPTY: // DIS-NEXT: _start: // General dynamic model: // -32 and -24 are first and second GOT entries offsets. diff --git a/lld/test/ELF/tls-dynamic.s b/lld/test/ELF/tls-dynamic.s --- a/lld/test/ELF/tls-dynamic.s +++ b/lld/test/ELF/tls-dynamic.s @@ -66,6 +66,7 @@ // 4279 = (0x2100 + -4) - (0x1042 + 3) // PC relative offset to got entry. // DIS: Disassembly of section .text: +// DIS-EMPTY: // DIS-NEXT: .text: // DIS-NEXT: 1000: {{.+}} leaq 4313(%rip), %rdi // DIS-NEXT: 1007: {{.+}} callq diff --git a/lld/test/ELF/tls-got.s b/lld/test/ELF/tls-got.s --- a/lld/test/ELF/tls-got.s +++ b/lld/test/ELF/tls-got.s @@ -30,18 +30,19 @@ // CHECK-NEXT: } // CHECK-NEXT: ] -//0x201000 + 4281 + 7 = 0x2020C0 -//0x20100A + 4279 + 7 = 0x2020C8 -//0x201014 + 4269 + 7 = 0x2020C8 -//DISASM: Disassembly of section .text: -//DISASM-NEXT: main: -//DISASM-NEXT: 201000: {{.*}} movq 4281(%rip), %rax -//DISASM-NEXT: 201007: {{.*}} movl %fs:(%rax), %eax -//DISASM-NEXT: 20100a: {{.*}} movq 4279(%rip), %rax -//DISASM-NEXT: 201011: {{.*}} movl %fs:(%rax), %eax -//DISASM-NEXT: 201014: {{.*}} movq 4269(%rip), %rax -//DISASM-NEXT: 20101b: {{.*}} movl %fs:(%rax), %eax -//DISASM-NEXT: 20101e: {{.*}} retq +// 0x201000 + 4281 + 7 = 0x2020C0 +// 0x20100A + 4279 + 7 = 0x2020C8 +// 0x201014 + 4269 + 7 = 0x2020C8 +// DISASM: Disassembly of section .text: +// DISASM-EMPTY: +// DISASM-NEXT: main: +// DISASM-NEXT: 201000: {{.*}} movq 4281(%rip), %rax +// DISASM-NEXT: 201007: {{.*}} movl %fs:(%rax), %eax +// DISASM-NEXT: 20100a: {{.*}} movq 4279(%rip), %rax +// DISASM-NEXT: 201011: {{.*}} movl %fs:(%rax), %eax +// DISASM-NEXT: 201014: {{.*}} movq 4269(%rip), %rax +// DISASM-NEXT: 20101b: {{.*}} movl %fs:(%rax), %eax +// DISASM-NEXT: 20101e: {{.*}} retq .section .tdata,"awT",@progbits diff --git a/lld/test/ELF/tls-i686.s b/lld/test/ELF/tls-i686.s --- a/lld/test/ELF/tls-i686.s +++ b/lld/test/ELF/tls-i686.s @@ -31,6 +31,7 @@ leal var1@ntpoff+123(%ecx), %eax // DIS: Disassembly of section test: +// DIS-EMPTY: // DIS-NEXT: _start: // DIS-NEXT: 401000: ba 08 00 00 00 movl $8, %edx // DIS-NEXT: 401005: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx @@ -47,6 +48,7 @@ // RELOC-NEXT: ] // DISSHARED: Disassembly of section test: +// DISSHARED-EMPTY: // DISSHARED-NEXT: _start: // DISSHARED-NEXT: 1000: ba 00 00 00 00 movl $0, %edx // DISSHARED-NEXT: 1005: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx diff --git a/lld/test/ELF/tls-initial-exec-local.s b/lld/test/ELF/tls-initial-exec-local.s --- a/lld/test/ELF/tls-initial-exec-local.s +++ b/lld/test/ELF/tls-initial-exec-local.s @@ -22,6 +22,7 @@ // 0x1007 + 4249 = 0x20A0 // 0x100e + 4250 = 0x20A8 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: .text: // DISASM-NEXT: 1000: {{.*}} addq 4249(%rip), %rax // DISASM-NEXT: 1007: {{.*}} addq 4250(%rip), %rax diff --git a/lld/test/ELF/tls-opt-gdie.s b/lld/test/ELF/tls-opt-gdie.s --- a/lld/test/ELF/tls-opt-gdie.s +++ b/lld/test/ELF/tls-opt-gdie.s @@ -32,6 +32,7 @@ //0x201009 + (4256 + 7) = 0x2020B0 //0x201019 + (4248 + 7) = 0x2020B8 // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // DISASM-NEXT: 201000: {{.*}} movq %fs:0, %rax // DISASM-NEXT: 201009: {{.*}} addq 4256(%rip), %rax diff --git a/lld/test/ELF/tls-opt-gdiele-i686.s b/lld/test/ELF/tls-opt-gdiele-i686.s --- a/lld/test/ELF/tls-opt-gdiele-i686.s +++ b/lld/test/ELF/tls-opt-gdiele-i686.s @@ -14,6 +14,7 @@ // NORELOC-NEXT: ] // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // DISASM-NEXT: 401000: 65 a1 00 00 00 00 movl %gs:0, %eax // DISASM-NEXT: 401006: 03 83 58 f0 ff ff addl -4008(%ebx), %eax diff --git a/lld/test/ELF/tls-opt-i686.s b/lld/test/ELF/tls-opt-i686.s --- a/lld/test/ELF/tls-opt-i686.s +++ b/lld/test/ELF/tls-opt-i686.s @@ -8,6 +8,7 @@ // NORELOC-NEXT: ] // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // LD -> LE: // DISASM-NEXT: 401000: 65 a1 00 00 00 00 movl %gs:0, %eax diff --git a/lld/test/ELF/tls-opt-iele-i686-nopic.s b/lld/test/ELF/tls-opt-iele-i686-nopic.s --- a/lld/test/ELF/tls-opt-iele-i686-nopic.s +++ b/lld/test/ELF/tls-opt-iele-i686-nopic.s @@ -30,6 +30,7 @@ // GOTREL-NEXT: ] // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // 4294967288 = 0xFFFFFFF8 // 4294967292 = 0xFFFFFFFC diff --git a/lld/test/ELF/tls-opt-local.s b/lld/test/ELF/tls-opt-local.s --- a/lld/test/ELF/tls-opt-local.s +++ b/lld/test/ELF/tls-opt-local.s @@ -8,6 +8,7 @@ // NORELOC-NEXT: ] // DISASM: Disassembly of section .text: +// DISASM-EMPTY: // DISASM-NEXT: _start: // DISASM-NEXT: 201000: 48 c7 c0 f8 ff ff ff movq $-8, %rax // DISASM-NEXT: 201007: 49 c7 c7 f8 ff ff ff movq $-8, %r15 diff --git a/lld/test/ELF/tls.s b/lld/test/ELF/tls.s --- a/lld/test/ELF/tls.s +++ b/lld/test/ELF/tls.s @@ -163,6 +163,7 @@ // CHECK-NEXT: } // DIS: Disassembly of section .text: +// DIS-EMPTY: // DIS-NEXT: _start: // DIS-NEXT: 201000: {{.+}} movl %fs:-8, %eax // DIS-NEXT: 201008: {{.+}} movl %fs:-16, %eax diff --git a/lld/test/ELF/x86-64-retpoline-linkerscript.s b/lld/test/ELF/x86-64-retpoline-linkerscript.s --- a/lld/test/ELF/x86-64-retpoline-linkerscript.s +++ b/lld/test/ELF/x86-64-retpoline-linkerscript.s @@ -13,6 +13,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 10: ff 35 32 01 00 00 pushq 306(%rip) // CHECK-NEXT: 16: 4c 8b 1d 33 01 00 00 movq 307(%rip), %r11 diff --git a/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s b/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s --- a/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s +++ b/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s @@ -13,6 +13,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 10: e8 0b 00 00 00 callq 11 <.plt+0x10> // CHECK-NEXT: 15: f3 90 pause diff --git a/lld/test/ELF/x86-64-retpoline-znow.s b/lld/test/ELF/x86-64-retpoline-znow.s --- a/lld/test/ELF/x86-64-retpoline-znow.s +++ b/lld/test/ELF/x86-64-retpoline-znow.s @@ -7,6 +7,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 1010: e8 0b 00 00 00 callq 11 <.plt+0x10> // CHECK-NEXT: 1015: f3 90 pause diff --git a/lld/test/ELF/x86-64-retpoline.s b/lld/test/ELF/x86-64-retpoline.s --- a/lld/test/ELF/x86-64-retpoline.s +++ b/lld/test/ELF/x86-64-retpoline.s @@ -7,6 +7,7 @@ // RUN: llvm-objdump -d -s %t.exe | FileCheck %s // CHECK: Disassembly of section .plt: +// CHECK-EMPTY: // CHECK-NEXT: .plt: // CHECK-NEXT: 1010: ff 35 f2 1f 00 00 pushq 8178(%rip) // CHECK-NEXT: 1016: 4c 8b 1d f3 1f 00 00 movq 8179(%rip), %r11 diff --git a/llvm/test/MC/ARM/elf-movt.s b/llvm/test/MC/ARM/elf-movt.s --- a/llvm/test/MC/ARM/elf-movt.s +++ b/llvm/test/MC/ARM/elf-movt.s @@ -30,6 +30,7 @@ @ ASM-NEXT: movt r0, :upper16:((foo-bar)+1234) @OBJ: Disassembly of section .text: +@OBJ-EMPTY: @OBJ-NEXT: barf: @OBJ-NEXT: 0: f0 0f 0f e3 movw r0, #65520 @OBJ-NEXT: 00000000: R_ARM_MOVW_PREL_NC GOT @@ -43,6 +44,7 @@ @OBJ-NEXT: 14: 00 00 40 e3 movt r0, #0 @THUMB: Disassembly of section .text: +@THUMB-EMPTY: @THUMB-NEXT: barf: @THUMB-NEXT: 0: 4f f6 f0 70 movw r0, #65520 @THUMB-NEXT: 00000000: R_ARM_THM_MOVW_PREL_NC GOT diff --git a/llvm/test/MC/ELF/relax-arith.s b/llvm/test/MC/ELF/relax-arith.s --- a/llvm/test/MC/ELF/relax-arith.s +++ b/llvm/test/MC/ELF/relax-arith.s @@ -5,6 +5,7 @@ bar: // CHECK: Disassembly of section imul: +// CHECK-EMPTY: // CHECK-NEXT: imul: // CHECK-NEXT: 0: 66 69 db 00 00 imulw $0, %bx, %bx // CHECK-NEXT: 5: 66 69 1c 25 00 00 00 00 00 00 imulw $0, 0, %bx @@ -21,6 +22,7 @@ imul $foo, bar, %rbx // CHECK: Disassembly of section and: +// CHECK-EMPTY: // CHECK-NEXT: and: // CHECK-NEXT: 0: 66 81 e3 00 00 andw $0, %bx // CHECK-NEXT: 5: 66 81 24 25 00 00 00 00 00 00 andw $0, 0 @@ -37,6 +39,7 @@ andq $foo, bar // CHECK: Disassembly of section or: +// CHECK-EMPTY: // CHECK-NEXT: or: // CHECK-NEXT: 0: 66 81 cb 00 00 orw $0, %bx // CHECK-NEXT: 5: 66 81 0c 25 00 00 00 00 00 00 orw $0, 0 @@ -53,6 +56,7 @@ orq $foo, bar // CHECK: Disassembly of section xor: +// CHECK-EMPTY: // CHECK-NEXT: xor: // CHECK-NEXT: 0: 66 81 f3 00 00 xorw $0, %bx // CHECK-NEXT: 5: 66 81 34 25 00 00 00 00 00 00 xorw $0, 0 @@ -69,6 +73,7 @@ xorq $foo, bar // CHECK: Disassembly of section add: +// CHECK-EMPTY: // CHECK-NEXT: add: // CHECK-NEXT: 0: 66 81 c3 00 00 addw $0, %bx // CHECK-NEXT: 5: 66 81 04 25 00 00 00 00 00 00 addw $0, 0 @@ -85,6 +90,7 @@ addq $foo, bar // CHECK: Disassembly of section sub: +// CHECK-EMPTY: // CHECK-NEXT: sub: // CHECK-NEXT: 0: 66 81 eb 00 00 subw $0, %bx // CHECK-NEXT: 5: 66 81 2c 25 00 00 00 00 00 00 subw $0, 0 @@ -101,6 +107,7 @@ subq $foo, bar // CHECK: Disassembly of section cmp: +// CHECK-EMPTY: // CHECK-NEXT: cmp: // CHECK-NEXT: 0: 66 81 fb 00 00 cmpw $0, %bx // CHECK-NEXT: 5: 66 81 3c 25 00 00 00 00 00 00 cmpw $0, 0 @@ -117,6 +124,7 @@ cmpq $foo, bar // CHECK: Disassembly of section push: +// CHECK-EMPTY: // CHECK-NEXT: push: // CHECK-NEXT: 0: 66 68 00 00 pushw $0 // CHECK-NEXT: 4: 68 00 00 00 00 pushq $0 @@ -125,6 +133,7 @@ push $foo // CHECK: Disassembly of section adc: +// CHECK-EMPTY: // CHECK-NEXT: adc: // CHECK-NEXT: 0: 66 81 d3 00 00 adcw $0, %bx // CHECK-NEXT: 5: 66 81 14 25 00 00 00 00 00 00 adcw $0, 0 @@ -141,6 +150,7 @@ adcq $foo, bar // CHECK: Disassembly of section sbb: +// CHECK-EMPTY: // CHECK-NEXT: sbb: // CHECK-NEXT: 0: 66 81 db 00 00 sbbw $0, %bx // CHECK-NEXT: 5: 66 81 1c 25 00 00 00 00 00 00 sbbw $0, 0 diff --git a/llvm/test/MC/ELF/relax-arith2.s b/llvm/test/MC/ELF/relax-arith2.s --- a/llvm/test/MC/ELF/relax-arith2.s +++ b/llvm/test/MC/ELF/relax-arith2.s @@ -5,6 +5,7 @@ bar: // CHECK: Disassembly of section imul: +// CHECK-EMPTY: // CHECK-NEXT: imul: // CHECK-NEXT: 0: 66 6b db 80 imulw $-128, %bx, %bx // CHECK-NEXT: 4: 66 6b 1c 25 00 00 00 00 7f imulw $127, 0, %bx @@ -22,6 +23,7 @@ // CHECK: Disassembly of section and: +// CHECK-EMPTY: // CHECK-NEXT: and: // CHECK-NEXT: 0: 66 83 e3 7f andw $127, %bx // CHECK-NEXT: 4: 66 83 24 25 00 00 00 00 00 andw $0, 0 @@ -38,6 +40,7 @@ andq $-128, bar // CHECK: Disassembly of section or: +// CHECK-EMPTY: // CHECK-NEXT: or: // CHECK-NEXT: 0: 66 83 cb 00 orw $0, %bx // CHECK-NEXT: 4: 66 83 0c 25 00 00 00 00 01 orw $1, 0 @@ -54,6 +57,7 @@ orq $127, bar // CHECK: Disassembly of section xor: +// CHECK-EMPTY: // CHECK-NEXT: xor: // CHECK-NEXT: 0: 66 83 f3 01 xorw $1, %bx // CHECK-NEXT: 4: 66 83 34 25 00 00 00 00 ff xorw $-1, 0 @@ -70,6 +74,7 @@ xorq $0, bar // CHECK: Disassembly of section add: +// CHECK-EMPTY: // CHECK-NEXT: add: // CHECK-NEXT: 0: 66 83 c3 ff addw $-1, %bx // CHECK-NEXT: 4: 66 83 04 25 00 00 00 00 2a addw $42, 0 @@ -86,6 +91,7 @@ addq $1, bar // CHECK: Disassembly of section sub: +// CHECK-EMPTY: // CHECK-NEXT: sub: // CHECK-NEXT: 0: 66 83 eb 2a subw $42, %bx // CHECK-NEXT: 4: 66 83 2c 25 00 00 00 00 80 subw $-128, 0 @@ -102,6 +108,7 @@ subq $-1, bar // CHECK: Disassembly of section cmp: +// CHECK-EMPTY: // CHECK-NEXT: cmp: // CHECK-NEXT: 0: 66 83 fb 80 cmpw $-128, %bx // CHECK-NEXT: 4: 66 83 3c 25 00 00 00 00 7f cmpw $127, 0 @@ -118,6 +125,7 @@ cmpq $42, bar // CHECK: Disassembly of section push: +// CHECK-EMPTY: // CHECK-NEXT: push: // CHECK-NEXT: 0: 66 6a 80 pushw $-128 // CHECK-NEXT: 3: 66 6a 7f pushw $127 diff --git a/llvm/test/MC/ELF/relax-arith3.s b/llvm/test/MC/ELF/relax-arith3.s --- a/llvm/test/MC/ELF/relax-arith3.s +++ b/llvm/test/MC/ELF/relax-arith3.s @@ -5,6 +5,7 @@ bar: // CHECK: Disassembly of section imul: +// CHECK-EMPTY: // CHECK-NEXT: imul: // CHECK-NEXT: 0: 66 69 1d 00 00 00 00 00 00 imulw $0, (%rip), %bx // CHECK-NEXT: 9: 69 1d 00 00 00 00 00 00 00 00 imull $0, (%rip), %ebx @@ -16,6 +17,7 @@ // CHECK: Disassembly of section and: +// CHECK-EMPTY: // CHECK-NEXT: and: // CHECK-NEXT: 0: 66 81 25 00 00 00 00 00 00 andw $0, (%rip) // CHECK-NEXT: 9: 81 25 00 00 00 00 00 00 00 00 andl $0, (%rip) @@ -26,6 +28,7 @@ andq $foo, bar(%rip) // CHECK: Disassembly of section or: +// CHECK-EMPTY: // CHECK-NEXT: or: // CHECK-NEXT: 0: 66 81 0d 00 00 00 00 00 00 orw $0, (%rip) // CHECK-NEXT: 9: 81 0d 00 00 00 00 00 00 00 00 orl $0, (%rip) @@ -36,6 +39,7 @@ orq $foo, bar(%rip) // CHECK: Disassembly of section xor: +// CHECK-EMPTY: // CHECK-NEXT: xor: // CHECK-NEXT: 0: 66 81 35 00 00 00 00 00 00 xorw $0, (%rip) // CHECK-NEXT: 9: 81 35 00 00 00 00 00 00 00 00 xorl $0, (%rip) @@ -46,6 +50,7 @@ xorq $foo, bar(%rip) // CHECK: Disassembly of section add: +// CHECK-EMPTY: // CHECK-NEXT: add: // CHECK-NEXT: 0: 66 81 05 00 00 00 00 00 00 addw $0, (%rip) // CHECK-NEXT: 9: 81 05 00 00 00 00 00 00 00 00 addl $0, (%rip) @@ -56,6 +61,7 @@ addq $foo, bar(%rip) // CHECK: Disassembly of section sub: +// CHECK-EMPTY: // CHECK-NEXT: sub: // CHECK-NEXT: 0: 66 81 2d 00 00 00 00 00 00 subw $0, (%rip) // CHECK-NEXT: 9: 81 2d 00 00 00 00 00 00 00 00 subl $0, (%rip) @@ -66,6 +72,7 @@ subq $foo, bar(%rip) // CHECK: Disassembly of section cmp: +// CHECK-EMPTY: // CHECK-NEXT: cmp: // CHECK-NEXT: 0: 66 81 3d 00 00 00 00 00 00 cmpw $0, (%rip) // CHECK-NEXT: 9: 81 3d 00 00 00 00 00 00 00 00 cmpl $0, (%rip) diff --git a/llvm/test/MC/ELF/relax-arith4.s b/llvm/test/MC/ELF/relax-arith4.s --- a/llvm/test/MC/ELF/relax-arith4.s +++ b/llvm/test/MC/ELF/relax-arith4.s @@ -5,6 +5,7 @@ // relax-arith.s and relax-arith2.s. // CHECK: Disassembly of section push8: +// CHECK-EMPTY: // CHECK-NEXT: push8: // CHECK-NEXT: 0: 66 6a 80 pushw $-128 // CHECK-NEXT: 3: 66 6a 7f pushw $127 @@ -17,6 +18,7 @@ push $127 // CHECK: Disassembly of section push32: +// CHECK-EMPTY: // CHECK-NEXT: push32: // CHECK-NEXT: 0: 66 68 00 00 pushw $0 // CHECK-NEXT: 4: 68 00 00 00 00 pushl $0 diff --git a/llvm/test/MC/X86/disassemble-zeroes.s b/llvm/test/MC/X86/disassemble-zeroes.s --- a/llvm/test/MC/X86/disassemble-zeroes.s +++ b/llvm/test/MC/X86/disassemble-zeroes.s @@ -5,8 +5,7 @@ // This test checks that we follow these rules and can force // dissasembly of zero blocks with the -z and --disassemble-zeroes options. -// NODISASM: Disassembly of section .text: -// NODISASM-NEXT: 0000000000000000 main: +// NODISASM: 0000000000000000 main: // NODISASM-NEXT: 0: 00 00 addb %al, (%rax) // NODISASM-NEXT: 2: 00 00 addb %al, (%rax) // NODISASM-NEXT: 4: 00 00 addb %al, (%rax) @@ -23,8 +22,7 @@ // Check that with -z we disassemble blocks of zeroes. // RUN: llvm-objdump -d -z %t | FileCheck %s --check-prefix=DISASM -// DISASM: Disassembly of section .text: -// DISASM-NEXT: 0000000000000000 main: +// DISASM: 0000000000000000 main: // DISASM-NEXT: 0: 00 00 addb %al, (%rax) // DISASM-NEXT: 2: 00 00 addb %al, (%rax) // DISASM-NEXT: 4: 00 00 addb %al, (%rax) diff --git a/llvm/test/Object/X86/no-start-symbol.test b/llvm/test/Object/X86/no-start-symbol.test --- a/llvm/test/Object/X86/no-start-symbol.test +++ b/llvm/test/Object/X86/no-start-symbol.test @@ -3,6 +3,7 @@ Test that we disassemble the start of the section. CHECK: Disassembly of section .text: +CHECK-EMPTY: CHECK-NEXT: .text: CHECK-NEXT: 0: 90 nop CHECK: foo: diff --git a/llvm/test/tools/llvm-objdump/X86/disasm-specific-funcs.test b/llvm/test/tools/llvm-objdump/X86/disasm-specific-funcs.test --- a/llvm/test/tools/llvm-objdump/X86/disasm-specific-funcs.test +++ b/llvm/test/tools/llvm-objdump/X86/disasm-specific-funcs.test @@ -2,6 +2,7 @@ // RUN: llvm-objdump -d %t.out -disassemble-functions=main | FileCheck %s // CHECK: Disassembly of section .anothertext: +// CHECK-EMPTY: // CHECK-NEXT: main: // CHECK-NEXT: 10: 55 pushq %rbp // CHECK-NEXT: 11: 48 89 e5 movq %rsp, %rbp diff --git a/llvm/test/tools/llvm-objdump/X86/disasm-zeroes-relocations.test b/llvm/test/tools/llvm-objdump/X86/disasm-zeroes-relocations.test --- a/llvm/test/tools/llvm-objdump/X86/disasm-zeroes-relocations.test +++ b/llvm/test/tools/llvm-objdump/X86/disasm-zeroes-relocations.test @@ -20,6 +20,7 @@ # SKIP: 0000000000000000 .rodata: # SKIP-NEXT: ... +# SKIP-EMPTY: # SKIP-NEXT: Disassembly of section .rela.rodata: --- !ELF diff --git a/llvm/test/tools/llvm-objdump/X86/out-of-section-sym.test b/llvm/test/tools/llvm-objdump/X86/out-of-section-sym.test --- a/llvm/test/tools/llvm-objdump/X86/out-of-section-sym.test +++ b/llvm/test/tools/llvm-objdump/X86/out-of-section-sym.test @@ -6,6 +6,7 @@ // RUN: FileCheck --input-file %t0 %s CHECK: Disassembly of section .text: +CHECK-EMPTY: CHECK-NEXT: _start: CHECK-NEXT: 10: c3 retl CHECK-NEXT: SYMBOL TABLE: diff --git a/llvm/test/tools/llvm-objdump/X86/start-stop-address.test b/llvm/test/tools/llvm-objdump/X86/start-stop-address.test --- a/llvm/test/tools/llvm-objdump/X86/start-stop-address.test +++ b/llvm/test/tools/llvm-objdump/X86/start-stop-address.test @@ -4,6 +4,7 @@ // RUN: llvm-objdump -d %t.out --start-address=0x40 --stop-address=0x47 | FileCheck %s --check-prefix "CROSSDATA" // CHECK: Disassembly of section .anothertext: +// CHECK-EMPTY: // CHECK-NEXT: main: // CHECK-NEXT: 18: 48 8d 04 25 a8 00 00 00 leaq 168, %rax // CHECK-NEXT: 20: c7 45 fc 00 00 00 00 movl $0, -4(%rbp) @@ -12,10 +13,13 @@ // CHECK-NOT: 2f: // CROSSSECTION: Disassembly of section .text: +// CROSSSECTION-EMPTY: // CROSSSECTION-NEXT: foo: // CROSSSECTION-NEXT: c: c3 retq // CROSSSECTION-NEXT: d: 0f 1f 00 nopl (%rax) +// CROSSSECTION-EMPTY: // CROSSSECTION-NEXT: Disassembly of section .anothertext: +// CROSSSECTION-EMPTY: // CROSSSECTION-NEXT: main: // CROSSSECTION-NEXT: 10: 55 pushq %rbp // CROSSSECTION-NOT: 11: diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1164,10 +1164,10 @@ if (!PrintedSection) { PrintedSection = true; - outs() << "Disassembly of section "; + outs() << "\nDisassembly of section "; if (!SegmentName.empty()) outs() << SegmentName << ","; - outs() << SectionName << ':'; + outs() << SectionName << ":\n"; } if (Obj->isELF() && Obj->getArch() == Triple::amdgcn) {