Index: test/ELF/ppc-relocs.s =================================================================== --- test/ELF/ppc-relocs.s +++ test/ELF/ppc-relocs.s @@ -1,7 +1,8 @@ # REQUIRES: ppc -# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t -# RUN: ld.lld %t -o %t2 -# RUN: llvm-objdump -d %t2 | FileCheck %s +# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t.o +# RUN: ld.lld %t.o -o %t +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s +# RUN: llvm-objdump -s --no-show-raw-insn %t | FileCheck --check-prefix=HEX %s .section .R_PPC_ADDR16_HA,"ax",@progbits .globl _start @@ -13,9 +14,9 @@ # CHECK: Disassembly of section .R_PPC_ADDR16_HA: # CHECK: _start: -# CHECK: 11000: 3c 80 00 01 lis 4, 1 +# CHECK: 11000: lis 4, 1 # CHECK: msg: -# CHECK: 11004: 66 6f 6f 00 oris 15, 19, 28416 +# CHECK: 11004: oris 15, 19, 28416 .section .R_PPC_ADDR16_HI,"ax",@progbits .globl _starti @@ -27,9 +28,9 @@ # CHECK: Disassembly of section .R_PPC_ADDR16_HI: # CHECK: _starti: -# CHECK: 11008: 3c 80 00 01 lis 4, 1 +# CHECK: 11008: lis 4, 1 # CHECK: msgi: -# CHECK: 1100c: 66 6f 6f 00 oris 15, 19, 28416 +# CHECK: 1100c: oris 15, 19, 28416 .section .R_PPC_ADDR16_LO,"ax",@progbits addi 4, 4, msg@l @@ -39,9 +40,9 @@ # CHECK: Disassembly of section .R_PPC_ADDR16_LO: # CHECK: .R_PPC_ADDR16_LO: -# CHECK: 11010: 38 84 10 04 addi 4, 4, 4100 +# CHECK: 11010: addi 4, 4, 4100 # CHECK: mystr: -# CHECK: 11014: 62 6c 61 68 ori 12, 19, 24936 +# CHECK: 11014: ori 12, 19, 24936 .align 2 .section .R_PPC_REL24,"ax",@progbits @@ -53,7 +54,7 @@ # CHECK: Disassembly of section .R_PPC_REL24: # CHECK: .FR_PPC_REL24: -# CHECK: 1101c: 48 00 00 04 b .+4 +# CHECK: 1101c: b .+4 .section .R_PPC_REL14,"ax",@progbits .globl .FR_PPC_REL14 @@ -64,7 +65,7 @@ # CHECK: Disassembly of section .R_PPC_REL14: # CHECK: .FR_PPC_REL14: -# CHECK: 11020: {{.*}} bt 2, .+4 +# CHECK: 11020: bt 2, .+4 .section .R_PPC_REL32,"ax",@progbits .globl .FR_PPC_REL32 @@ -73,9 +74,8 @@ .section .R_PPC_REL32_2,"ax",@progbits .Lfoox3: -# CHECK: Disassembly of section .R_PPC_REL32: -# CHECK: .FR_PPC_REL32: -# CHECK: 11024: 00 00 00 04 +# HEX: .R_PPC_REL32: +# HEX-NEXT: 11024 00000004 .section .R_PPC_ADDR32,"ax",@progbits .globl .FR_PPC_ADDR32 @@ -84,9 +84,8 @@ .section .R_PPC_ADDR32_2,"ax",@progbits .Lfoox2: -# CHECK: Disassembly of section .R_PPC_ADDR32: -# CHECK: .FR_PPC_ADDR32: -# CHECK: 11028: 00 01 10 2c +# HEX: .R_PPC_ADDR32: +# HEX-NEXT: 11028 0001102c .align 2 .section .R_PPC_PLTREL24,"ax",@progbits @@ -98,4 +97,4 @@ # CHECK: Disassembly of section .R_PPC_PLTREL24: # CHECK: .R_PPC_PLTREL24: -# CHECK: 1102c: 48 00 00 04 b .+4 +# CHECK: 1102c: b .+4 Index: test/ELF/ppc64-call-reach.s =================================================================== --- test/ELF/ppc64-call-reach.s +++ test/ELF/ppc64-call-reach.s @@ -3,16 +3,16 @@ # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # RUN: ld.lld --defsym callee=0xE010014 --defsym tail_callee=0xE010024 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NEGOFFSET %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NEGOFFSET %s # RUN: ld.lld --defsym callee=0x12010018 --defsym tail_callee=0x12010028 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck --check-prefix=THUNK %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=THUNK %s # RUN: llvm-readelf --sections %t | FileCheck --check-prefix=BRANCHLT %s # RUN: not ld.lld --defsym callee=0x1001002D --defsym tail_callee=0x1001002F \ # RUN: %t.o -o %t 2>&1 | FileCheck --check-prefix=MISSALIGNED %s @@ -20,16 +20,16 @@ # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # RUN: ld.lld --defsym callee=0xE010014 --defsym tail_callee=0xE010024 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NEGOFFSET %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NEGOFFSET %s # RUN: ld.lld --defsym callee=0x12010018 --defsym tail_callee=0x12010028 \ # RUN: %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck --check-prefix=THUNK %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=THUNK %s # RUN: llvm-readelf --sections %t | FileCheck --check-prefix=BRANCHLT %s # RUN: not ld.lld --defsym callee=0x1001002D --defsym tail_callee=0x1001002F \ # RUN: %t.o -o %t 2>&1 | FileCheck --check-prefix=MISSALIGNED %s @@ -58,37 +58,36 @@ # Check that we are branching to the definitions, and not range-extending # thunks. # CHECK-LABEL: test -# CHECK: 10010014: {{.*}} bl .+33554428 -# CHECK: 10010024: {{.*}} b .+33554428 +# CHECK: 10010014: bl .+33554428 +# CHECK: 10010024: b .+33554428 # NEGOFFSET-LABEL: test -# NEGOFFSET: 10010014: {{.*}} bl .-33554432 -# NEGOFFSET: 10010024: {{.*}} b .+33554432 +# NEGOFFSET: 10010014: bl .-33554432 +# NEGOFFSET: 10010024: b .+33554432 # .branch_lt[0] # THUNK-LABEL: __long_branch_callee: -# THUNK-NEXT: 10010000: {{.*}} addis 12, 2, 1 -# THUNK-NEXT: ld 12, -32768(12) -# THUNK-NEXT: mtctr 12 -# THUNK-NEXT: bctr +# THUNK-NEXT: 10010000: addis 12, 2, 1 +# THUNK-NEXT: ld 12, -32768(12) +# THUNK-NEXT: mtctr 12 +# THUNK-NEXT: bctr # .branch_lt[1] # THUNK-LABEL: __long_branch_tail_callee: -# THUNK-NEXT: 10010010: {{.*}} addis 12, 2, 1 -# THUNK-NEXT: ld 12, -32760(12) -# THUNK-NEXT: mtctr 12 -# THUNK-NEXT: bctr +# THUNK-NEXT: 10010010: addis 12, 2, 1 +# THUNK-NEXT: ld 12, -32760(12) +# THUNK-NEXT: mtctr 12 +# THUNK-NEXT: bctr # Each call now branches to a thunk, and although it is printed as positive # the offset is interpreted as a signed 26 bit value so 67108812 is actually # -52. # THUNK-LABEL: test: -# THUNK: 10010034: {{.*}} bl .-52 -# THUNK: 10010044: {{.*}} b .+67108812 +# THUNK: 10010034: bl .-52 +# THUNK: 10010044: b .+67108812 # The offset from the TOC to the .branch_lt section is (-1 << 16) - 32768. # Name Type Address Off Size # BRANCHLT: .got PROGBITS 0000000010020000 020000 000008 # BRANCHLT: .branch_lt PROGBITS 0000000010030000 030000 000010 # BRANCHLT-NOT: .plt - Index: test/ELF/ppc64-relocs.s =================================================================== --- test/ELF/ppc64-relocs.s +++ test/ELF/ppc64-relocs.s @@ -2,13 +2,13 @@ # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t # RUN: ld.lld %t -o %t2 -# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=DATALE -# RUN: llvm-objdump -D %t2 | FileCheck %s +# RUN: llvm-readelf -x .rodata -x .eh_frame %t2 | FileCheck %s --check-prefix=DATALE +# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t # RUN: ld.lld %t -o %t2 -# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=DATABE -# RUN: llvm-objdump -D %t2 | FileCheck %s +# RUN: llvm-readelf -x .rodata -x .eh_frame %t2 | FileCheck %s --check-prefix=DATABE +# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s .text .global _start @@ -36,7 +36,7 @@ # CHECK: Disassembly of section .R_PPC64_TOC16_LO_DS: # CHECK: .FR_PPC64_TOC16_LO_DS: -# CHECK: 1001000c: {{.*}} ld 1, -32768(2) +# CHECK: 1001000c: ld 1, -32768(2) .section .R_PPC64_TOC16_LO,"ax",@progbits .globl .FR_PPC64_TOC16_LO @@ -45,7 +45,7 @@ # CHECK: Disassembly of section .R_PPC64_TOC16_LO: # CHECK: .FR_PPC64_TOC16_LO: -# CHECK: 10010010: {{.*}} addi 1, 2, -32768 +# CHECK: 10010010: addi 1, 2, -32768 .section .R_PPC64_TOC16_HI,"ax",@progbits .globl .FR_PPC64_TOC16_HI @@ -54,7 +54,7 @@ # CHECK: Disassembly of section .R_PPC64_TOC16_HI: # CHECK: .FR_PPC64_TOC16_HI: -# CHECK: 10010014: {{.*}} addis 1, 2, -1 +# CHECK: 10010014: addis 1, 2, -1 .section .R_PPC64_TOC16_HA,"ax",@progbits .globl .FR_PPC64_TOC16_HA @@ -63,7 +63,7 @@ # CHECK: Disassembly of section .R_PPC64_TOC16_HA: # CHECK: .FR_PPC64_TOC16_HA: -# CHECK: 10010018: {{.*}} nop +# CHECK: 10010018: nop .section .R_PPC64_REL24,"ax",@progbits .globl .FR_PPC64_REL24 @@ -74,7 +74,7 @@ # CHECK: Disassembly of section .R_PPC64_REL24: # CHECK: .FR_PPC64_REL24: -# CHECK: 1001001c: {{.*}} b .+4 +# CHECK: 1001001c: b .+4 .section .R_PPC64_REL14,"ax",@progbits .globl .FR_PPC64_REL14 @@ -85,7 +85,7 @@ # CHECK: Disassembly of section .R_PPC64_REL14: # CHECK: .FR_PPC64_REL14: -# CHECK: 10010020: {{.*}} bt 2, .+4 +# CHECK: 10010020: bt 2, .+4 .section .R_PPC64_ADDR16_LO,"ax",@progbits .globl .FR_PPC64_ADDR16_LO @@ -94,7 +94,7 @@ # CHECK: Disassembly of section .R_PPC64_ADDR16_LO: # CHECK: .FR_PPC64_ADDR16_LO: -# CHECK: 10010024: {{.*}} li 1, 0 +# CHECK: 10010024: li 1, 0 .section .R_PPC64_ADDR16_HI,"ax",@progbits .globl .FR_PPC64_ADDR16_HI @@ -103,7 +103,7 @@ # CHECK: Disassembly of section .R_PPC64_ADDR16_HI: # CHECK: .FR_PPC64_ADDR16_HI: -# CHECK: 10010028: {{.*}} li 1, 4097 +# CHECK: 10010028: li 1, 4097 .section .R_PPC64_ADDR16_HA,"ax",@progbits .globl .FR_PPC64_ADDR16_HA @@ -112,7 +112,7 @@ # CHECK: Disassembly of section .R_PPC64_ADDR16_HA: # CHECK: .FR_PPC64_ADDR16_HA: -# CHECK: 1001002c: {{.*}} li 1, 4097 +# CHECK: 1001002c: li 1, 4097 .section .R_PPC64_ADDR16_HIGHER,"ax",@progbits .globl .FR_PPC64_ADDR16_HIGHER @@ -121,7 +121,7 @@ # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHER: # CHECK: .FR_PPC64_ADDR16_HIGHER: -# CHECK: 10010030: {{.*}} li 1, 0 +# CHECK: 10010030: li 1, 0 .section .R_PPC64_ADDR16_HIGHERA,"ax",@progbits .globl .FR_PPC64_ADDR16_HIGHERA @@ -130,7 +130,7 @@ # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHERA: # CHECK: .FR_PPC64_ADDR16_HIGHERA: -# CHECK: 10010034: {{.*}} li 1, 0 +# CHECK: 10010034: li 1, 0 .section .R_PPC64_ADDR16_HIGHEST,"ax",@progbits .globl .FR_PPC64_ADDR16_HIGHEST @@ -139,7 +139,7 @@ # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHEST: # CHECK: .FR_PPC64_ADDR16_HIGHEST: -# CHECK: 10010038: {{.*}} li 1, 0 +# CHECK: 10010038: li 1, 0 .section .R_PPC64_ADDR16_HIGHESTA,"ax",@progbits .globl .FR_PPC64_ADDR16_HIGHESTA @@ -148,7 +148,7 @@ # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHESTA: # CHECK: .FR_PPC64_ADDR16_HIGHESTA: -# CHECK: 1001003c: {{.*}} li 1, 0 +# CHECK: 1001003c: li 1, 0 .section .R_PPC64_REL32, "ax",@progbits .globl .FR_PPC64_REL32 @@ -158,22 +158,20 @@ .LBB0_2: add 3, 3, 4 -# DATALE: Disassembly of section .rodata: -# DATALE: .rodata: -# DATALE: 100001c8: 80 fe 00 00 +# DATALE: '.rodata': +# DATALE: 0x100001c8 80fe0000 -# DATABE: Disassembly of section .rodata: -# DATABE: .rodata: -# DATABE: 100001c8: 00 00 fe 80 +# DATABE: '.rodata': +# DATABE: 0x100001c8 0000fe80 # Address of rodata + value stored at rodata entry # should equal address of LBB0_2. # 0x10000190 + 0xfeb4 = 0x10010044 # CHECK: Disassembly of section .R_PPC64_REL32: # CHECK: .FR_PPC64_REL32: -# CHECK: 10010040: {{.*}} nop -# CHECK: 10010044: {{.*}} ld 5, -32736(2) -# CHECK: 10010048: {{.*}} add 3, 3, 4 +# CHECK: 10010040: nop +# CHECK: 10010044: ld 5, -32736(2) +# CHECK: 10010048: add 3, 3, 4 .section .R_PPC64_REL64, "ax",@progbits .globl .FR_PPC64_REL64 @@ -187,18 +185,14 @@ __foo: li 3,0 -# Check that address of eh_frame entry + value stored -# should equal the address of foo. Since it is not aligned, -# the entry is not stored exactly at 10000198. It starts at -# address 0x1000019a and has the value 0xfeaa. -# 0x100001aa + 0xfeae = 0x10010058 -# DATALE: Disassembly of section .eh_frame: -# DATALE: .eh_frame: -# DATALE: 100001d0: {{.*}} 00 00 +# Check that the personality (relocated by R_PPC64_REL64) in the .eh_frame +# equals the address of __foo. +# 0x100001e2 + 0x76fe = 0x10010058 +# DATALE: section '.eh_frame': +# DATALE: 0x100001e0 {{....}}76fe -# DATABE: Disassembly of section .eh_frame: -# DATABE: .eh_frame: -# DATABE: 100001e8: fe 76 {{.*}} +# DATABE: section '.eh_frame': +# DATABE: 0x100001e0 {{[0-9a-f]+ [0-9a-f]+}} fe76{{....}} # CHECK: __foo -# CHECK-NEXT: 10010058: {{.*}} li 3, 0 +# CHECK-NEXT: 10010058: li 3, 0 Index: test/ELF/ppc64-tls-gd-le-small.s =================================================================== --- test/ELF/ppc64-tls-gd-le-small.s +++ test/ELF/ppc64-tls-gd-le-small.s @@ -1,15 +1,15 @@ # REQUIRES: ppc # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o -# RUN: llvm-objdump -d -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s +# RUN: llvm-objdump -d --no-show-raw-insn -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s # RUN: ld.lld --defsym __tls_get_addr=0x10001000 %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck --check-prefix=CHECK-DIS %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK-DIS %s # RUN: llvm-readelf -relocations %t | FileCheck --check-prefix=DYN-RELOCS %s # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o -# RUN: llvm-objdump -d -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s +# RUN: llvm-objdump -d --no-show-raw-insn -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s # RUN: ld.lld --defsym __tls_get_addr=0x10001000 %t.o -o %t -# RUN: llvm-objdump -d %t | FileCheck --check-prefix=CHECK-DIS %s +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK-DIS %s # RUN: llvm-readelf -relocations %t | FileCheck --check-prefix=DYN-RELOCS %s # Test checks the relaxation of a 'small' general-dynamic tls access into a Index: test/ELF/ppc64-tls-ie-le.s =================================================================== --- test/ELF/ppc64-tls-ie-le.s +++ test/ELF/ppc64-tls-ie-le.s @@ -5,14 +5,14 @@ // RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.o -o %t // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s -// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s +// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-tls-ie-le.s -o %t2.o // RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.o -o %t // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s -// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s +// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s .text .abiversion 2 Index: test/ELF/ppc64-tls-ld-le.s =================================================================== --- test/ELF/ppc64-tls-ld-le.s +++ test/ELF/ppc64-tls-ld-le.s @@ -3,13 +3,13 @@ // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s // RUN: ld.lld %t.o -o %t -// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s +// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s // RUN: ld.lld %t.o -o %t -// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s +// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s .text Index: test/ELF/ppc64-toc-restore-recursive-call.s =================================================================== --- test/ELF/ppc64-toc-restore-recursive-call.s +++ test/ELF/ppc64-toc-restore-recursive-call.s @@ -2,7 +2,7 @@ # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t1.o # RUN: ld.lld -shared %t1.o -o %t -# RUN: llvm-objdump -d -r %t | FileCheck %s +# RUN: llvm-objdump -d --no-show-raw-insn -r %t | FileCheck %s # For a recursive call that is interposable the linker calls the plt-stub rather # then calling the function directly. Since the call is through a plt stub and @@ -18,8 +18,8 @@ # CHECK-NEXT: 10000: # CHECK-LABEL: recursive_func # CHECK-NEXT: 10014: -# CHECK: 1003c: {{.*}} bl .-60 -# CHECK-NEXT: ld 2, 24(1) +# CHECK: 1003c: bl .-60 +# CHECK-NEXT: 10040: ld 2, 24(1) .abiversion 2 .section ".text" Index: test/ELF/ppc64-toc-restore.s =================================================================== --- test/ELF/ppc64-toc-restore.s +++ test/ELF/ppc64-toc-restore.s @@ -5,14 +5,14 @@ // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-func.s -o %t3.o // RUN: ld.lld -shared %t2.o -o %t2.so // RUN: ld.lld %t.o %t2.so %t3.o -o %t -// RUN: llvm-objdump -d %t | FileCheck %s +// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-func.s -o %t3.o // RUN: ld.lld -shared %t2.o -o %t2.so // RUN: ld.lld %t.o %t2.so %t3.o -o %t -// RUN: llvm-objdump -d %t | FileCheck %s +// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s .text .abiversion 2 @@ -32,12 +32,12 @@ // CHECK: Disassembly of section .text: // CHECK: _start: -// CHECK: 1001001c: {{.*}} bl .-28 -// CHECK-NOT: 10010020: {{.*}} nop -// CHECK: 10010020: {{.*}} ld 2, 24(1) -// CHECK: 10010024: {{.*}} bl .-16 -// CHECK-NOT: 10010028: {{.*}} nop -// CHECK-NOT: 10010028: {{.*}} ld 2, 24(1) +// CHECK: 1001001c: bl .-28 +// CHECK-NOT: 10010020: nop +// CHECK: 10010020: ld 2, 24(1) +// CHECK: 10010024: bl .-16 +// CHECK-NOT: 10010028: nop +// CHECK-NOT: 10010028: ld 2, 24(1) # Calling a function in another object file which will have same # TOC base does not need a nop. If nop present, do not rewrite to @@ -49,18 +49,18 @@ nop // CHECK: _diff_object: -// CHECK-NEXT: 10010028: {{.*}} bl .+24 -// CHECK-NEXT: 1001002c: {{.*}} bl .+20 -// CHECK-NEXT: 10010030: {{.*}} nop +// CHECK-NEXT: 10010028: bl .+24 +// CHECK-NEXT: 1001002c: bl .+20 +// CHECK-NEXT: 10010030: nop # Branching to a local function does not need a nop .global noretbranch noretbranch: b bar_local // CHECK: noretbranch: -// CHECK: 10010034: {{.*}} b .+67108832 -// CHECK-NOT: 10010038: {{.*}} nop -// CHECK-NOT: 1001003c: {{.*}} ld 2, 24(1) +// CHECK: 10010034: b .+67108832 +// CHECK-NOT: 10010038: nop +// CHECK-NOT: 1001003c: ld 2, 24(1) // This should come last to check the end-of-buffer condition. .global last @@ -68,5 +68,5 @@ bl foo nop // CHECK: last: -// CHECK: 10010038: {{.*}} bl .-56 -// CHECK-NEXT: 1001003c: {{.*}} ld 2, 24(1) +// CHECK: 10010038: bl .-56 +// CHECK-NEXT: 1001003c: ld 2, 24(1) Index: test/ELF/ppc64-weak-undef-call.s =================================================================== --- test/ELF/ppc64-weak-undef-call.s +++ test/ELF/ppc64-weak-undef-call.s @@ -2,11 +2,11 @@ # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t # RUN: ld.lld %t -o %t2 -# RUN: llvm-objdump -d %t2 | FileCheck %s +# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t # RUN: ld.lld %t -o %t2 -# RUN: llvm-objdump -d %t2 | FileCheck %s +# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s # CHECK: Disassembly of section .text: @@ -23,6 +23,6 @@ # be unreachable. But, we should link successfully. We should not, however, # generate a .plt entry (this would be wasted space). For now, we do nothing # (leaving the zero relative offset present in the input). -# CHECK: 10010000: {{.*}} bl .+0 -# CHECK: 10010004: {{.*}} nop -# CHECK: 10010008: {{.*}} blr +# CHECK: 10010000: bl .+0 +# CHECK: 10010004: nop +# CHECK: 10010008: blr