diff options
672 files changed, 1164 insertions, 1162 deletions
diff --git a/llvm/docs/SourceLevelDebugging.rst b/llvm/docs/SourceLevelDebugging.rst index 977c97c2cbd..e7f8b13b589 100644 --- a/llvm/docs/SourceLevelDebugging.rst +++ b/llvm/docs/SourceLevelDebugging.rst @@ -1932,7 +1932,7 @@ embedded in ``llvm-readobj``. * Testing MSVC's output:: $ cl -c -Z7 foo.cpp # Use /Z7 to keep types in the object file - $ llvm-readobj -codeview foo.obj + $ llvm-readobj --codeview foo.obj * Getting LLVM IR debug info out of Clang:: @@ -1943,7 +1943,7 @@ embedded in ``llvm-readobj``. * Generate and dump CodeView from LLVM IR metadata:: $ llc foo.ll -filetype=obj -o foo.obj - $ llvm-readobj -codeview foo.obj > foo.txt + $ llvm-readobj --codeview foo.obj > foo.txt Use this pattern in lit test cases and FileCheck the output of llvm-readobj diff --git a/llvm/test/CodeGen/AArch64/wineh-mingw.ll b/llvm/test/CodeGen/AArch64/wineh-mingw.ll index ae26b06cfa3..77a6461594c 100644 --- a/llvm/test/CodeGen/AArch64/wineh-mingw.ll +++ b/llvm/test/CodeGen/AArch64/wineh-mingw.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s -exception-model=wineh -mtriple=aarch64-pc-mingw32 | FileCheck %s -check-prefix=WINEH -; RUN: llc < %s -exception-model=wineh -mtriple=aarch64-pc-mingw32 -filetype=obj | llvm-readobj -s | FileCheck %s -check-prefix=WINEH-SECTIONS +; RUN: llc < %s -exception-model=wineh -mtriple=aarch64-pc-mingw32 -filetype=obj | llvm-readobj -S | FileCheck %s -check-prefix=WINEH-SECTIONS ; Check emission of eh handler and handler data declare i32 @_d_eh_personality(i32, i32, i64, i8*, i8*) diff --git a/llvm/test/CodeGen/AArch64/wineh-try-catch.ll b/llvm/test/CodeGen/AArch64/wineh-try-catch.ll index 7185637a117..c631d77fd3e 100644 --- a/llvm/test/CodeGen/AArch64/wineh-try-catch.ll +++ b/llvm/test/CodeGen/AArch64/wineh-try-catch.ll @@ -1,6 +1,6 @@ ; RUN: llc -o - %s -mtriple=aarch64-windows -verify-machineinstrs | FileCheck %s ; RUN: llc -o %t -filetype=obj %s -mtriple=aarch64-windows -; RUN: llvm-readobj -unwind %t | FileCheck %s -check-prefix=UNWIND +; RUN: llvm-readobj --unwind %t | FileCheck %s -check-prefix=UNWIND ; We test the following ; 1) That the unwind help object is created and that its offset from the stack diff --git a/llvm/test/CodeGen/AArch64/wineh1.mir b/llvm/test/CodeGen/AArch64/wineh1.mir index c89daf1ce22..593b98aa16c 100644 --- a/llvm/test/CodeGen/AArch64/wineh1.mir +++ b/llvm/test/CodeGen/AArch64/wineh1.mir @@ -1,5 +1,5 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog -filetype=obj \ -# RUN: | llvm-readobj -unwind | FileCheck %s +# RUN: | llvm-readobj --unwind | FileCheck %s # This test case checks the basic validity of the .xdata section. It's # documented at: # https://docs.microsoft.com/en-us/cpp/build/arm64-exception-handling diff --git a/llvm/test/CodeGen/AArch64/wineh2.mir b/llvm/test/CodeGen/AArch64/wineh2.mir index e2c31fd56ce..c8d9a0120de 100644 --- a/llvm/test/CodeGen/AArch64/wineh2.mir +++ b/llvm/test/CodeGen/AArch64/wineh2.mir @@ -1,5 +1,5 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog \ -# RUN: -filetype=obj | llvm-readobj -unwind | FileCheck %s +# RUN: -filetype=obj | llvm-readobj --unwind | FileCheck %s # Test that the pre/post increment save of a flating point register is correct. # CHECK: ExceptionData { diff --git a/llvm/test/CodeGen/AArch64/wineh3.mir b/llvm/test/CodeGen/AArch64/wineh3.mir index ffca6c157a3..395f8dac4d7 100644 --- a/llvm/test/CodeGen/AArch64/wineh3.mir +++ b/llvm/test/CodeGen/AArch64/wineh3.mir @@ -1,5 +1,5 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog \ -# RUN: -filetype=obj | llvm-readobj -unwind | FileCheck %s +# RUN: -filetype=obj | llvm-readobj --unwind | FileCheck %s # Test that the register pairing of both general purpose and floating point # registers is correctly saved in the .xdata section, as well as the pre/post # increment of floating point register pairs. diff --git a/llvm/test/CodeGen/AArch64/wineh4.mir b/llvm/test/CodeGen/AArch64/wineh4.mir index 3a324324431..424e220873e 100644 --- a/llvm/test/CodeGen/AArch64/wineh4.mir +++ b/llvm/test/CodeGen/AArch64/wineh4.mir @@ -1,6 +1,6 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog \ # RUN: -disable-branch-fold -filetype=obj \ -# RUN: | llvm-readobj -unwind | FileCheck %s +# RUN: | llvm-readobj --unwind | FileCheck %s # Check that identical multiple epilgoues are correctly shared in .xdata. # CHECK: ExceptionData { diff --git a/llvm/test/CodeGen/AArch64/wineh5.mir b/llvm/test/CodeGen/AArch64/wineh5.mir index c47bad5d290..3736377ceac 100644 --- a/llvm/test/CodeGen/AArch64/wineh5.mir +++ b/llvm/test/CodeGen/AArch64/wineh5.mir @@ -1,5 +1,5 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog \ -# RUN: -filetype=obj | llvm-readobj -unwind | FileCheck %s +# RUN: -filetype=obj | llvm-readobj --unwind | FileCheck %s # Check that that the large stack allocation is correctly represented in .xdata. diff --git a/llvm/test/CodeGen/AArch64/wineh6.mir b/llvm/test/CodeGen/AArch64/wineh6.mir index fd1f9ece3a6..c14c75fa44e 100644 --- a/llvm/test/CodeGen/AArch64/wineh6.mir +++ b/llvm/test/CodeGen/AArch64/wineh6.mir @@ -1,5 +1,5 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog \ -# RUN: -filetype=obj | llvm-readobj -unwind | FileCheck %s +# RUN: -filetype=obj | llvm-readobj --unwind | FileCheck %s # Check save_fplr_x, set_fp, alloc_s # CHECK: ExceptionData { diff --git a/llvm/test/CodeGen/AArch64/wineh7.mir b/llvm/test/CodeGen/AArch64/wineh7.mir index 547c622a704..c82dd7df621 100644 --- a/llvm/test/CodeGen/AArch64/wineh7.mir +++ b/llvm/test/CodeGen/AArch64/wineh7.mir @@ -1,5 +1,5 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog \ -# RUN: -filetype=obj | llvm-readobj -unwind | FileCheck %s +# RUN: -filetype=obj | llvm-readobj --unwind | FileCheck %s # Check AddFP # CHECK: ExceptionData { diff --git a/llvm/test/CodeGen/AArch64/wineh8.mir b/llvm/test/CodeGen/AArch64/wineh8.mir index 606bc140b23..be1c6d2e370 100644 --- a/llvm/test/CodeGen/AArch64/wineh8.mir +++ b/llvm/test/CodeGen/AArch64/wineh8.mir @@ -1,6 +1,6 @@ # RUN: llc -o - %s -mtriple=aarch64-windows -start-after=prologepilog \ # RUN: -disable-branch-fold -filetype=obj \ -# RUN: | llvm-readobj -unwind | FileCheck %s +# RUN: | llvm-readobj --unwind | FileCheck %s # Check that non-identical multiple epilgoues are correctly shared in .xdata. # CHECK: ExceptionData { diff --git a/llvm/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll b/llvm/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll index 2f281cab48c..d51e2d6e938 100644 --- a/llvm/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll +++ b/llvm/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 < %s | FileCheck --check-prefix=CHECK %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=HSAMD %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=HSAMD %s ; CHECK-LABEL: {{^}}min_64_max_64: ; CHECK: SGPRBlocks: 0 diff --git a/llvm/test/CodeGen/AMDGPU/code-object-v3.ll b/llvm/test/CodeGen/AMDGPU/code-object-v3.ll index 32898fd520f..c3a2911f714 100644 --- a/llvm/test/CodeGen/AMDGPU/code-object-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/code-object-v3.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+code-object-v3 < %s | FileCheck --check-prefixes=ALL-ASM,OSABI-AMDHSA-ASM %s -; RUN: llc -filetype=obj -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+code-object-v3 < %s | llvm-readobj -elf-output-style=GNU -notes -relocations -sections -symbols | FileCheck --check-prefixes=ALL-ELF,OSABI-AMDHSA-ELF %s +; RUN: llc -filetype=obj -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+code-object-v3 < %s | llvm-readelf --notes -relocations -sections -symbols | FileCheck --check-prefixes=ALL-ELF,OSABI-AMDHSA-ELF %s ; ALL-ASM-LABEL: {{^}}fadd: diff --git a/llvm/test/CodeGen/AMDGPU/comdat.ll b/llvm/test/CodeGen/AMDGPU/comdat.ll index 59331596715..92f1c2a8e0a 100644 --- a/llvm/test/CodeGen/AMDGPU/comdat.ll +++ b/llvm/test/CodeGen/AMDGPU/comdat.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple amdgcn-amd-amdhsa -filetype=obj <%s \ -; RUN: | llvm-readobj -symbols - | FileCheck %s +; RUN: | llvm-readobj --symbols - | FileCheck %s ; CHECK: Name: func1 ; CHECK: Section: .text.func1 diff --git a/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll b/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll index 0e7d3e66d98..88fdf300e3d 100644 --- a/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll +++ b/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll @@ -1,53 +1,53 @@ -; RUN: llc -filetype=obj -march=r600 -mcpu=r600 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,R600 %s -; RUN: llc -filetype=obj -march=r600 -mcpu=r630 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,R630 %s -; RUN: llc -filetype=obj -march=r600 -mcpu=rs880 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RS880 %s -; RUN: llc -filetype=obj -march=r600 -mcpu=rv670 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV670 %s -; RUN: llc -filetype=obj -march=r600 -mcpu=rv710 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV710 %s -; RUN: llc -filetype=obj -march=r600 -mcpu=rv730 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV730 %s -; RUN: llc -filetype=obj -march=r600 -mcpu=rv770 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV770 %s -; RUN: llc -filetype=obj -march=r600 -mcpu=cedar < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CEDAR %s -; RUN: llc -filetype=obj -march=r600 -mcpu=cypress < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CYPRESS %s -; RUN: llc -filetype=obj -march=r600 -mcpu=juniper < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,JUNIPER %s -; RUN: llc -filetype=obj -march=r600 -mcpu=redwood < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,REDWOOD %s -; RUN: llc -filetype=obj -march=r600 -mcpu=sumo < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,SUMO %s -; RUN: llc -filetype=obj -march=r600 -mcpu=barts < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,BARTS %s -; RUN: llc -filetype=obj -march=r600 -mcpu=caicos < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CAICOS %s -; RUN: llc -filetype=obj -march=r600 -mcpu=cayman < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CAYMAN %s -; RUN: llc -filetype=obj -march=r600 -mcpu=turks < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,TURKS %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx600 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX600 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=tahiti < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX600 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx601 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=hainan < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=oland < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=pitcairn < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=verde < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx700 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX700 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=kaveri < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX700 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx701 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX701 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=hawaii < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX701 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx702 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX702 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx703 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX703 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=kabini < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX703 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=mullins < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX703 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx704 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX704 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=bonaire < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX704 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX801 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=carrizo < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX801 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx802 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX802 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=iceland < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX802 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=tonga < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX802 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx803 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=fiji < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=polaris10 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=polaris11 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx810 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX810 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=stoney < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX810 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx900 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX900 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX902 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx904 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX904 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX906 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx909 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX909 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx1010 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX1010 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=r600 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,R600 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=r630 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,R630 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=rs880 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RS880 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=rv670 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV670 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=rv710 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV710 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=rv730 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV730 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=rv770 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,RV770 %s +; RUN: llc -filetype=obj -march=r600 -mcpu=cedar < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CEDAR %s +; RUN: llc -filetype=obj -march=r600 -mcpu=cypress < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CYPRESS %s +; RUN: llc -filetype=obj -march=r600 -mcpu=juniper < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,JUNIPER %s +; RUN: llc -filetype=obj -march=r600 -mcpu=redwood < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,REDWOOD %s +; RUN: llc -filetype=obj -march=r600 -mcpu=sumo < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,SUMO %s +; RUN: llc -filetype=obj -march=r600 -mcpu=barts < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,BARTS %s +; RUN: llc -filetype=obj -march=r600 -mcpu=caicos < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CAICOS %s +; RUN: llc -filetype=obj -march=r600 -mcpu=cayman < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,CAYMAN %s +; RUN: llc -filetype=obj -march=r600 -mcpu=turks < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-R600,TURKS %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx600 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX600 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=tahiti < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX600 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx601 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=hainan < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=oland < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=pitcairn < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=verde < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX601 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx700 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX700 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=kaveri < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX700 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx701 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX701 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=hawaii < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX701 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx702 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX702 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx703 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX703 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=kabini < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX703 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=mullins < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX703 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx704 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX704 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=bonaire < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX704 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX801 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=carrizo < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX801 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx802 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX802 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=iceland < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX802 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=tonga < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX802 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx803 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=fiji < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=polaris10 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=polaris11 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX803 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx810 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX810 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=stoney < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX810 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx900 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX900 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX902 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx904 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX904 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX906 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx909 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX909 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx1010 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=ALL,ARCH-GCN,GFX1010 %s ; ARCH-R600: Arch: r600 ; ARCH-GCN: Arch: amdgcn diff --git a/llvm/test/CodeGen/AMDGPU/elf-header-flags-sram-ecc.ll b/llvm/test/CodeGen/AMDGPU/elf-header-flags-sram-ecc.ll index 512278732b6..815637bb146 100644 --- a/llvm/test/CodeGen/AMDGPU/elf-header-flags-sram-ecc.ll +++ b/llvm/test/CodeGen/AMDGPU/elf-header-flags-sram-ecc.ll @@ -1,11 +1,11 @@ -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX902 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 -mattr=-sram-ecc < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX902 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 -mattr=+sram-ecc < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=SRAM-ECC-GFX902 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX902 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 -mattr=-sram-ecc < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX902 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx902 -mattr=+sram-ecc < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=SRAM-ECC-GFX902 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX906 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 -mattr=-sram-ecc < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX906 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 -mattr=+sram-ecc < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=SRAM-ECC-GFX906 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 -mattr=+sram-ecc,+xnack < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=SRAM-ECC-XNACK-GFX906 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX906 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 -mattr=-sram-ecc < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NO-SRAM-ECC-GFX906 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 -mattr=+sram-ecc < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=SRAM-ECC-GFX906 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx906 -mattr=+sram-ecc,+xnack < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=SRAM-ECC-XNACK-GFX906 %s ; NO-SRAM-ECC-GFX902: Flags [ ; NO-SRAM-ECC-GFX902-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX902 (0x2D) diff --git a/llvm/test/CodeGen/AMDGPU/elf-header-flags-xnack.ll b/llvm/test/CodeGen/AMDGPU/elf-header-flags-xnack.ll index 89e4b7a15e1..30607351a81 100644 --- a/llvm/test/CodeGen/AMDGPU/elf-header-flags-xnack.ll +++ b/llvm/test/CodeGen/AMDGPU/elf-header-flags-xnack.ll @@ -1,5 +1,5 @@ -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx801 -mattr=-xnack < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NO-XNACK-GFX801 %s -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx802 -mattr=+xnack < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=XNACK-GFX802 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx801 -mattr=-xnack < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NO-XNACK-GFX801 %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx802 -mattr=+xnack < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=XNACK-GFX802 %s ; NO-XNACK-GFX801: Flags [ ; NO-XNACK-GFX801-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX801 (0x28) diff --git a/llvm/test/CodeGen/AMDGPU/elf-header-osabi.ll b/llvm/test/CodeGen/AMDGPU/elf-header-osabi.ll index ef0f7bf1a87..3fe61092b53 100644 --- a/llvm/test/CodeGen/AMDGPU/elf-header-osabi.ll +++ b/llvm/test/CodeGen/AMDGPU/elf-header-osabi.ll @@ -1,15 +1,15 @@ -; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NONE %s -; RUN: llc -filetype=obj -mtriple=amdgcn-amd- -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NONE %s -; RUN: llc -filetype=obj -mtriple=amdgcn-amd-unknown -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=NONE %s -; RUN: llc -filetype=obj -mtriple=amdgcn--amdhsa -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=HSA %s -; RUN: llc -filetype=obj -mtriple=amdgcn-amd-amdhsa -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=HSA %s -; RUN: llc -filetype=obj -mtriple=amdgcn-unknown-amdhsa -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=HSA %s -; RUN: llc -filetype=obj -mtriple=amdgcn--amdpal -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=PAL %s -; RUN: llc -filetype=obj -mtriple=amdgcn-amd-amdpal -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=PAL %s -; RUN: llc -filetype=obj -mtriple=amdgcn-unknown-amdpal -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=PAL %s -; RUN: llc -filetype=obj -mtriple=amdgcn--mesa3d -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=MESA3D %s -; RUN: llc -filetype=obj -mtriple=amdgcn-amd-mesa3d -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=MESA3D %s -; RUN: llc -filetype=obj -mtriple=amdgcn-unknown-mesa3d -mcpu=gfx801 < %s | llvm-readobj -file-headers - | FileCheck --check-prefixes=MESA3D %s +; RUN: llc -filetype=obj -march=amdgcn -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NONE %s +; RUN: llc -filetype=obj -mtriple=amdgcn-amd- -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NONE %s +; RUN: llc -filetype=obj -mtriple=amdgcn-amd-unknown -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=NONE %s +; RUN: llc -filetype=obj -mtriple=amdgcn--amdhsa -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=HSA %s +; RUN: llc -filetype=obj -mtriple=amdgcn-amd-amdhsa -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=HSA %s +; RUN: llc -filetype=obj -mtriple=amdgcn-unknown-amdhsa -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=HSA %s +; RUN: llc -filetype=obj -mtriple=amdgcn--amdpal -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=PAL %s +; RUN: llc -filetype=obj -mtriple=amdgcn-amd-amdpal -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=PAL %s +; RUN: llc -filetype=obj -mtriple=amdgcn-unknown-amdpal -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=PAL %s +; RUN: llc -filetype=obj -mtriple=amdgcn--mesa3d -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=MESA3D %s +; RUN: llc -filetype=obj -mtriple=amdgcn-amd-mesa3d -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=MESA3D %s +; RUN: llc -filetype=obj -mtriple=amdgcn-unknown-mesa3d -mcpu=gfx801 < %s | llvm-readobj --file-headers - | FileCheck --check-prefixes=MESA3D %s ; NONE: OS/ABI: SystemV (0x0) ; HSA: OS/ABI: AMDGPU_HSA (0x40) diff --git a/llvm/test/CodeGen/AMDGPU/elf-notes.ll b/llvm/test/CodeGen/AMDGPU/elf-notes.ll index 79fe2bf030e..a9b77d97133 100644 --- a/llvm/test/CodeGen/AMDGPU/elf-notes.ll +++ b/llvm/test/CodeGen/AMDGPU/elf-notes.ll @@ -1,12 +1,12 @@ ; RUN: llc -mtriple=amdgcn-amd-unknown -mcpu=gfx802 -mattr=-code-object-v3 < %s | FileCheck --check-prefix=GCN --check-prefix=OSABI-UNK --check-prefix=GFX802 %s ; RUN: llc -mtriple=amdgcn-amd-unknown -mcpu=iceland -mattr=-code-object-v3 < %s | FileCheck --check-prefix=GCN --check-prefix=OSABI-UNK --check-prefix=GFX802 %s -; RUN: llc -mtriple=amdgcn-amd-unknown -mcpu=gfx802 -filetype=obj -mattr=-code-object-v3 < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=OSABI-UNK-ELF --check-prefix=GFX802 %s +; RUN: llc -mtriple=amdgcn-amd-unknown -mcpu=gfx802 -filetype=obj -mattr=-code-object-v3 < %s | llvm-readelf --notes | FileCheck --check-prefix=GCN --check-prefix=OSABI-UNK-ELF --check-prefix=GFX802 %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=-code-object-v3 < %s | FileCheck --check-prefix=GCN --check-prefix=OSABI-HSA --check-prefix=GFX802 %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=iceland -mattr=-code-object-v3 < %s | FileCheck --check-prefix=GCN --check-prefix=OSABI-HSA --check-prefix=GFX802 %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -filetype=obj -mattr=-code-object-v3 < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=OSABI-HSA-ELF --check-prefix=GFX802 %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -filetype=obj -mattr=-code-object-v3 < %s | llvm-readelf --notes | FileCheck --check-prefix=GCN --check-prefix=OSABI-HSA-ELF --check-prefix=GFX802 %s ; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx802 -mattr=-code-object-v3 < %s | FileCheck --check-prefix=GCN --check-prefix=OSABI-PAL --check-prefix=GFX802 %s ; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=iceland -mattr=-code-object-v3 < %s | FileCheck --check-prefix=GCN --check-prefix=OSABI-PAL --check-prefix=GFX802 %s -; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx802 -filetype=obj -mattr=-code-object-v3 < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=OSABI-PAL-ELF --check-prefix=GFX802 %s +; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx802 -filetype=obj -mattr=-code-object-v3 < %s | llvm-readelf --notes | FileCheck --check-prefix=GCN --check-prefix=OSABI-PAL-ELF --check-prefix=GFX802 %s ; RUN: llc -march=r600 < %s | FileCheck --check-prefix=R600 %s ; OSABI-UNK-NOT: .hsa_code_object_version diff --git a/llvm/test/CodeGen/AMDGPU/elf.ll b/llvm/test/CodeGen/AMDGPU/elf.ll index de8c010f204..4ddb763ee53 100644 --- a/llvm/test/CodeGen/AMDGPU/elf.ll +++ b/llvm/test/CodeGen/AMDGPU/elf.ll @@ -1,12 +1,12 @@ -; RUN: llc < %s -march=amdgcn -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s +; RUN: llc < %s -march=amdgcn -verify-machineinstrs -filetype=obj | llvm-readobj -S --symbols --file-headers - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -march=amdgcn -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TYPICAL %s -; RUN: llc < %s -march=amdgcn -mcpu=tonga -mattr=-flat-for-global -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s +; RUN: llc < %s -march=amdgcn -mcpu=tonga -mattr=-flat-for-global -verify-machineinstrs -filetype=obj | llvm-readobj -S --symbols --file-headers - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -march=amdgcn -mcpu=tonga -mattr=-flat-for-global -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TONGA %s -; RUN: llc < %s -march=amdgcn -mcpu=carrizo -mattr=-flat-for-global -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s +; RUN: llc < %s -march=amdgcn -mcpu=carrizo -mattr=-flat-for-global -verify-machineinstrs -filetype=obj | llvm-readobj -S --symbols --file-headers - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -march=amdgcn -mcpu=carrizo -mattr=-flat-for-global -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TYPICAL %s ; Test that we don't try to produce a COFF file on windows -; RUN: llc < %s -mtriple=amdgcn-pc-mingw -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s +; RUN: llc < %s -mtriple=amdgcn-pc-mingw -verify-machineinstrs -filetype=obj | llvm-readobj -S --symbols --file-headers - | FileCheck --check-prefix=ELF %s ; ELF: Format: ELF64-amdgpu ; ELF: OS/ABI: SystemV (0x0) diff --git a/llvm/test/CodeGen/AMDGPU/elf.metadata.ll b/llvm/test/CodeGen/AMDGPU/elf.metadata.ll index 9214ca2e68e..ff082c14195 100644 --- a/llvm/test/CodeGen/AMDGPU/elf.metadata.ll +++ b/llvm/test/CodeGen/AMDGPU/elf.metadata.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=amdgcn -mcpu=fiji -filetype=obj | llvm-readobj -symbols -s -sd - | FileCheck %s +; RUN: llc < %s -march=amdgcn -mcpu=fiji -filetype=obj | llvm-readobj --symbols -S --sd - | FileCheck %s ; CHECK: Section { ; CHECK: Name: .AMDGPU.comment.info_1 diff --git a/llvm/test/CodeGen/AMDGPU/elf.r600.ll b/llvm/test/CodeGen/AMDGPU/elf.r600.ll index 1ca1524cbaa..63a87ed0ea4 100644 --- a/llvm/test/CodeGen/AMDGPU/elf.r600.ll +++ b/llvm/test/CodeGen/AMDGPU/elf.r600.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=r600 -mcpu=redwood -filetype=obj | llvm-readobj -s - | FileCheck --check-prefix=ELF %s +; RUN: llc < %s -march=r600 -mcpu=redwood -filetype=obj | llvm-readobj -S - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -march=r600 -mcpu=redwood -o - | FileCheck --check-prefix=CONFIG %s ; ELF: Format: ELF32-amdgpu diff --git a/llvm/test/CodeGen/AMDGPU/hsa-func-align.ll b/llvm/test/CodeGen/AMDGPU/hsa-func-align.ll index ff17a9e530b..005540092c9 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-func-align.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-func-align.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=amdgcn--amdhsa -mcpu=kaveri < %s | FileCheck -check-prefix=HSA %s -; RUN: llc -mtriple=amdgcn--amdhsa -mcpu=kaveri -filetype=obj < %s | llvm-readobj -symbols -s -sd | FileCheck -check-prefix=ELF %s +; RUN: llc -mtriple=amdgcn--amdhsa -mcpu=kaveri -filetype=obj < %s | llvm-readobj --symbols -S --sd | FileCheck -check-prefix=ELF %s ; ELF: Section { ; ELF: Name: .text diff --git a/llvm/test/CodeGen/AMDGPU/hsa-func.ll b/llvm/test/CodeGen/AMDGPU/hsa-func.ll index 76a17215b7f..b04ad1ce963 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-func.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-func.ll @@ -2,8 +2,8 @@ ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=kaveri | FileCheck --check-prefix=HSA-CI %s ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=carrizo | FileCheck --check-prefix=HSA %s ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=carrizo | FileCheck --check-prefix=HSA-VI %s -; RUN: llc < %s -mtriple=amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=kaveri -filetype=obj | llvm-readobj -symbols -s -sd | FileCheck --check-prefix=ELF %s -; RUN: llc < %s -mtriple=amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=kaveri | llvm-mc -filetype=obj -triple amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=kaveri | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF +; RUN: llc < %s -mtriple=amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=kaveri -filetype=obj | llvm-readobj --symbols -S --sd | FileCheck --check-prefix=ELF %s +; RUN: llc < %s -mtriple=amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=kaveri | llvm-mc -filetype=obj -triple amdgcn--amdhsa -mattr=-code-object-v3 -mcpu=kaveri | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF ; The SHT_NOTE section contains the output from the .hsa_code_object_* ; directives. diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg-v3.ll index fdbe60e3d02..5ed07dc6e3c 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg-v3.ll @@ -1,4 +1,4 @@ -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; CHECK: - .args: ; CHECK-NEXT: - .access: read_only diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll index 76545b0377e..053c21b8eb7 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; CHECK: - Name: test_ro_arg ; CHECK-NEXT: SymbolName: 'test_ro_arg@kd' diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel-v3.ll index 66cf620d02b..850c6f1a6f6 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel-v3.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mattr=+code-object-v3 -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mattr=+code-object-v3 -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mattr=+code-object-v3 -mcpu=gfx900 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s ; CHECK: --- diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel.ll index f6e3d94b4dc..9879a741ad4 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueue-kernel.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mattr=-code-object-v3 -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mattr=-code-object-v3 -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mattr=-code-object-v3 -mcpu=gfx900 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s ; CHECK: --- diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll index b3dc4629f03..edcd45a3fbf 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=+code-object-v3 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=+code-object-v3 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+code-object-v3 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll index 417e0119425..34373600b47 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=-code-object-v3 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s ; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args-v3.ll index 7c64e50b7e7..ee4d53abbc6 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args-v3.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s ; CHECK: --- ; CHECK: amdhsa.kernels: diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args.ll index 6dbc1e2523d..8ffab23c9c2 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-hidden-args.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s ; CHECK: --- ; CHECK: Version: [ 1, 0 ] diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images-v3.ll index 02937d51eb3..ec048c2d02d 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images-v3.ll @@ -1,6 +1,6 @@ -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s %opencl.image1d_t = type opaque %opencl.image1d_array_t = type opaque diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll index fd015998429..79e0cfcffd8 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX802 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s %opencl.image1d_t = type opaque %opencl.image1d_array_t = type opaque diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1-v3.ll index fefb22e939e..1c6103275c9 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1-v3.ll @@ -1,4 +1,4 @@ -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; Make sure llc does not crash for invalid opencl version metadata. diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1.ll index f46b07d80b5..6ce365efbc6 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-1.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; Make sure llc does not crash for invalid opencl version metadata. diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2-v3.ll index 0d9f920ade1..5f55ffb55c5 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2-v3.ll @@ -1,4 +1,4 @@ -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; Make sure llc does not crash for invalid opencl version metadata. diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2.ll index f4e584b5ae3..74a5413aa61 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-2.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; Make sure llc does not crash for invalid opencl version metadata. diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3-v3.ll index 5382e66b6be..31c77f0a031 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3-v3.ll @@ -1,4 +1,4 @@ -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; Make sure llc does not crash for invalid opencl version metadata. diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3.ll index 5e951dd3f8f..ca6a3d5d326 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-invalid-ocl-version-3.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck %s ; Make sure llc does not crash for invalid opencl version metadata. diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props-v3.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props-v3.ll index 0d744d292c9..d30fb29f10a 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props-v3.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props-v3.ll @@ -1,6 +1,6 @@ -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -enable-misched=0 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -enable-misched=0 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s -; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -enable-misched=0 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -enable-misched=0 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -enable-misched=0 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s +; RUN: llc -mattr=+code-object-v3 -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -enable-misched=0 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s @var = addrspace(1) global float 0.0 diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll index b5b6aa450bf..1678df8bccb 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -enable-misched=0 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -enable-misched=0 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s -; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -enable-misched=0 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=-code-object-v3 -enable-misched=0 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -enable-misched=0 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX803 --check-prefix=NOTES %s +; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -enable-misched=0 -filetype=obj -o - < %s | llvm-readelf --notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s @var = addrspace(1) global float 0.0 diff --git a/llvm/test/CodeGen/AMDGPU/hsa.ll b/llvm/test/CodeGen/AMDGPU/hsa.ll index e23b2d922a3..52d6c375d47 100644 --- a/llvm/test/CodeGen/AMDGPU/hsa.ll +++ b/llvm/test/CodeGen/AMDGPU/hsa.ll @@ -2,8 +2,8 @@ ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3,-flat-for-global | FileCheck --check-prefix=HSA-CI %s ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=carrizo -mattr=-code-object-v3 | FileCheck --check-prefix=HSA %s ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=carrizo -mattr=-code-object-v3,-flat-for-global | FileCheck --check-prefix=HSA-VI %s -; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=kaveri -filetype=obj -mattr=-code-object-v3 | llvm-readobj -symbols -s -sd | FileCheck --check-prefix=ELF %s -; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 | llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF +; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=kaveri -filetype=obj -mattr=-code-object-v3 | llvm-readobj --symbols -S --sd | FileCheck --check-prefix=ELF %s +; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 | llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF ; The SHT_NOTE section contains the output from the .hsa_code_object_* ; directives. diff --git a/llvm/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll b/llvm/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll index 88372873c6e..b35b5dad11a 100644 --- a/llvm/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll +++ b/llvm/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll @@ -1,6 +1,6 @@ -; RUN: llc -march=amdgcn -mcpu=tahiti -filetype=obj < %s | llvm-readobj -relocations -symbols | FileCheck %s -check-prefix=GCN -; RUN: llc -march=amdgcn -mcpu=tonga -filetype=obj < %s | llvm-readobj -relocations -symbols | FileCheck %s -check-prefix=GCN -; RUN: llc -march=r600 -mcpu=cypress -filetype=obj < %s | llvm-readobj -relocations -symbols | FileCheck %s -check-prefix=EG +; RUN: llc -march=amdgcn -mcpu=tahiti -filetype=obj < %s | llvm-readobj -r --symbols | FileCheck %s -check-prefix=GCN +; RUN: llc -march=amdgcn -mcpu=tonga -filetype=obj < %s | llvm-readobj -r --symbols | FileCheck %s -check-prefix=GCN +; RUN: llc -march=r600 -mcpu=cypress -filetype=obj < %s | llvm-readobj -r --symbols | FileCheck %s -check-prefix=EG ; GCN: R_AMDGPU_REL32 extern_const_addrspace ; EG: R_AMDGPU_ABS32 extern_const_addrspace diff --git a/llvm/test/CodeGen/AMDGPU/r600-constant-array-fixup.ll b/llvm/test/CodeGen/AMDGPU/r600-constant-array-fixup.ll index 9bab3bc74c1..9383bfb2358 100644 --- a/llvm/test/CodeGen/AMDGPU/r600-constant-array-fixup.ll +++ b/llvm/test/CodeGen/AMDGPU/r600-constant-array-fixup.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj -march=r600 -mcpu=cypress -verify-machineinstrs < %s | llvm-readobj -relocations -symbols | FileCheck %s +; RUN: llc -filetype=obj -march=r600 -mcpu=cypress -verify-machineinstrs < %s | llvm-readobj -r --symbols | FileCheck %s @arr = internal unnamed_addr addrspace(4) constant [4 x i32] [i32 4, i32 5, i32 6, i32 7], align 4 diff --git a/llvm/test/CodeGen/AMDGPU/scratch-simple.ll b/llvm/test/CodeGen/AMDGPU/scratch-simple.ll index 0ddd7b907b1..a104adca830 100644 --- a/llvm/test/CodeGen/AMDGPU/scratch-simple.ll +++ b/llvm/test/CodeGen/AMDGPU/scratch-simple.ll @@ -1,7 +1,7 @@ ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=verde -verify-machineinstrs < %s | FileCheck --check-prefix=GCN --check-prefix=SI %s ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx803 -mattr=-flat-for-global -verify-machineinstrs < %s | FileCheck --check-prefix=GCN --check-prefix=SI %s ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx900 -mattr=-flat-for-global -verify-machineinstrs < %s | FileCheck --check-prefix=GCN --check-prefix=GFX9 %s -; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx900 -filetype=obj < %s | llvm-readobj -relocations | FileCheck --check-prefix=RELS %s +; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx900 -filetype=obj < %s | llvm-readobj -r | FileCheck --check-prefix=RELS %s ; RELS: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD0 0x0 ; RELS: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD1 0x0 diff --git a/llvm/test/CodeGen/ARM/2010-12-08-tpsoft.ll b/llvm/test/CodeGen/ARM/2010-12-08-tpsoft.ll index 9dfe4da2767..14883f4f1d5 100644 --- a/llvm/test/CodeGen/ARM/2010-12-08-tpsoft.ll +++ b/llvm/test/CodeGen/ARM/2010-12-08-tpsoft.ll @@ -1,7 +1,7 @@ ; RUN: llc %s -mtriple=armv7-linux-gnueabi -o - | \ ; RUN: FileCheck -check-prefix=ELFASM %s ; RUN: llc %s -mtriple=armv7-linux-gnueabi -filetype=obj -o - | \ -; RUN: llvm-readobj -s -sd | FileCheck -check-prefix=ELFOBJ %s +; RUN: llvm-readobj -S --sd | FileCheck -check-prefix=ELFOBJ %s ;; Make sure that bl __aeabi_read_tp is materialized and fixed up correctly ;; in the obj case. diff --git a/llvm/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll b/llvm/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll index f04e053b2e0..db86a0dcfc8 100644 --- a/llvm/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll +++ b/llvm/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll @@ -1,5 +1,5 @@ ; RUN: llc %s -mtriple=armv7-linux-gnueabi -filetype=obj -o - | \ -; RUN: llvm-readobj -s -t | FileCheck -check-prefix=OBJ %s +; RUN: llvm-readobj -S -t | FileCheck -check-prefix=OBJ %s ; RUN: llc %s -mtriple=armv7-linux-gnueabi -o - | \ ; RUN: FileCheck -check-prefix=ASM %s diff --git a/llvm/test/CodeGen/ARM/MachO-subtypes.ll b/llvm/test/CodeGen/ARM/MachO-subtypes.ll index 8176d664084..bd002622e30 100644 --- a/llvm/test/CodeGen/ARM/MachO-subtypes.ll +++ b/llvm/test/CodeGen/ARM/MachO-subtypes.ll @@ -1,57 +1,57 @@ ; Check that MachO ARM CPU Subtypes are respected ; RUN: llc -mtriple=armv4t-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V4T +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V4T ; RUN: llc -mtriple=armv5-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V5 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V5 ; RUN: llc -mtriple=armv5e-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V5 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V5 ; RUN: llc -mtriple=armv5t-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V5 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V5 ; RUN: llc -mtriple=armv5te-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V5 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V5 ; RUN: llc -mtriple=armv5tej-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V5 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V5 ; RUN: llc -mtriple=armv6-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V6 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V6 ; RUN: llc -mtriple=armv6k-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V6 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V6 ; RUN: llc -mtriple=thumbv6-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V6 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V6 ; RUN: llc -mtriple=thumbv6k-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V6 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V6 ; RUN: llc -mtriple=armv6m-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V6M +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V6M ; RUN: llc -mtriple=thumbv6m-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V6M +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V6M ; RUN: llc -mtriple=armv7-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7 ; RUN: llc -mtriple=thumbv7-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7 +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7 ; RUN: llc -mtriple=thumbv7em-apple-darwin -mcpu=cortex-m4 -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7EM +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7EM ; RUN: llc -mtriple=thumbv7em-apple-darwin -mcpu=cortex-m7 -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7EM +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7EM ; RUN: llc -mtriple=armv7k-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7K +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7K ; RUN: llc -mtriple=thumbv7k-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7K +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7K ; RUN: llc -mtriple=thumbv7m-apple-darwin -mcpu=sc300 -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7M +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7M ; RUN: llc -mtriple=thumbv7m-apple-darwin -mcpu=cortex-m3 -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7M +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7M ; RUN: llc -mtriple=armv7s-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7S +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7S ; RUN: llc -mtriple=thumbv7s-apple-darwin -filetype=obj -o - < %s \ -; RUN: | llvm-readobj -file-headers | FileCheck %s --check-prefix=CHECK-V7S +; RUN: | llvm-readobj --file-headers | FileCheck %s --check-prefix=CHECK-V7S define void @_test() { ret void diff --git a/llvm/test/CodeGen/ARM/build-attributes-encoding.s b/llvm/test/CodeGen/ARM/build-attributes-encoding.s index 5649726c12b..356185079d6 100644 --- a/llvm/test/CodeGen/ARM/build-attributes-encoding.s +++ b/llvm/test/CodeGen/ARM/build-attributes-encoding.s @@ -1,7 +1,7 @@ // This tests that ARM attributes are properly encoded. // RUN: llvm-mc < %s -triple=arm-linux-gnueabi -filetype=obj -o - \ -// RUN: | llvm-readobj -s -sd | FileCheck %s +// RUN: | llvm-readobj -S --sd | FileCheck %s // Tag_CPU_name (=5) .cpu cortex-a8 diff --git a/llvm/test/CodeGen/ARM/build-attributes-optimization-minsize.ll b/llvm/test/CodeGen/ARM/build-attributes-optimization-minsize.ll index 4cfb6012f43..c008222a95f 100644 --- a/llvm/test/CodeGen/ARM/build-attributes-optimization-minsize.ll +++ b/llvm/test/CodeGen/ARM/build-attributes-optimization-minsize.ll @@ -2,9 +2,9 @@ ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 | FileCheck %s ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 | FileCheck %s -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ ; CHECK: .eabi_attribute 30, 4 @ Tag_ABI_optimization_goals ; CHECK-OBJ: TagName: ABI_optimization_goals diff --git a/llvm/test/CodeGen/ARM/build-attributes-optimization-mixed.ll b/llvm/test/CodeGen/ARM/build-attributes-optimization-mixed.ll index 8009fc6e28f..c144e1846cc 100644 --- a/llvm/test/CodeGen/ARM/build-attributes-optimization-mixed.ll +++ b/llvm/test/CodeGen/ARM/build-attributes-optimization-mixed.ll @@ -2,9 +2,9 @@ ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 | FileCheck %s ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 | FileCheck %s -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s ; CHECK-NOT: .eabi_attribute 30 ; CHECK-NOT: Tag_ABI_optimization_goals diff --git a/llvm/test/CodeGen/ARM/build-attributes-optimization-optnone.ll b/llvm/test/CodeGen/ARM/build-attributes-optimization-optnone.ll index cbdb915045c..f779402bee0 100644 --- a/llvm/test/CodeGen/ARM/build-attributes-optimization-optnone.ll +++ b/llvm/test/CodeGen/ARM/build-attributes-optimization-optnone.ll @@ -2,9 +2,9 @@ ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 | FileCheck %s ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 | FileCheck %s -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ ; CHECK: .eabi_attribute 30, 6 @ Tag_ABI_optimization_goals ; CHECK-OBJ: TagName: ABI_optimization_goals diff --git a/llvm/test/CodeGen/ARM/build-attributes-optimization-optsize.ll b/llvm/test/CodeGen/ARM/build-attributes-optimization-optsize.ll index bab210aa8d0..3c7df7cd765 100644 --- a/llvm/test/CodeGen/ARM/build-attributes-optimization-optsize.ll +++ b/llvm/test/CodeGen/ARM/build-attributes-optimization-optsize.ll @@ -2,9 +2,9 @@ ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 | FileCheck %s ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 | FileCheck %s -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ ; CHECK: .eabi_attribute 30, 3 @ Tag_ABI_optimization_goals ; CHECK-OBJ: TagName: ABI_optimization_goals diff --git a/llvm/test/CodeGen/ARM/build-attributes-optimization.ll b/llvm/test/CodeGen/ARM/build-attributes-optimization.ll index 21b7b3c3ab0..6c1abae6b14 100644 --- a/llvm/test/CodeGen/ARM/build-attributes-optimization.ll +++ b/llvm/test/CodeGen/ARM/build-attributes-optimization.ll @@ -2,9 +2,9 @@ ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 | FileCheck %s --check-prefix=SPEED ; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 | FileCheck %s --check-prefix=MAXSPEED -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=NONE-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=SPEED-OBJ -; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=MAXSPEED-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O0 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=NONE-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O1 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=SPEED-OBJ +; RUN: llc < %s -mtriple=arm-none-none-eabi -mcpu=cortex-a7 -O3 -filetype obj -o - | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=MAXSPEED-OBJ ; NONE: .eabi_attribute 30, 5 @ Tag_ABI_optimization_goals ; SPEED: .eabi_attribute 30, 1 @ Tag_ABI_optimization_goals diff --git a/llvm/test/CodeGen/Hexagon/simple_addend.ll b/llvm/test/CodeGen/Hexagon/simple_addend.ll index 939d44b2a24..e0308cdc5cf 100644 --- a/llvm/test/CodeGen/Hexagon/simple_addend.ll +++ b/llvm/test/CodeGen/Hexagon/simple_addend.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=hexagon -filetype=obj -o - < %s | llvm-readobj -relocations | FileCheck %s +; RUN: llc -march=hexagon -filetype=obj -o - < %s | llvm-readobj -r | FileCheck %s declare void @bar(i32); diff --git a/llvm/test/CodeGen/MIR/X86/diexpr-win32.mir b/llvm/test/CodeGen/MIR/X86/diexpr-win32.mir index 7c0461233bb..65652ba8948 100644 --- a/llvm/test/CodeGen/MIR/X86/diexpr-win32.mir +++ b/llvm/test/CodeGen/MIR/X86/diexpr-win32.mir @@ -1,4 +1,4 @@ -# RUN: llc -start-after=prologepilog -filetype=obj -O0 %s -o - | llvm-readobj -codeview | FileCheck %s +# RUN: llc -start-after=prologepilog -filetype=obj -O0 %s -o - | llvm-readobj --codeview | FileCheck %s # Offsets are now CFA, or VFRAME, relative. Both the NRVO sret pointer and the # string* parameter are on the stack, NRVO at offset 4 (after RA), and Str at diff --git a/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll b/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll index bbb6ff56ea9..fe82b7c5b6c 100644 --- a/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll +++ b/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=mips-unknown-linux -filetype=obj %s -o - | \ -; RUN: llvm-readobj -mips-abi-flags | \ +; RUN: llvm-readobj --mips-abi-flags | \ ; RUN: FileCheck --check-prefix=ASE-MICROMIPS %s define void @_Z3foov() #0 { diff --git a/llvm/test/CodeGen/Mips/mips-shf-gprel.s b/llvm/test/CodeGen/Mips/mips-shf-gprel.s index 9caaf00394a..0228a3fa24b 100644 --- a/llvm/test/CodeGen/Mips/mips-shf-gprel.s +++ b/llvm/test/CodeGen/Mips/mips-shf-gprel.s @@ -2,7 +2,7 @@ # and proper section types. # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o - \ -# RUN: | llvm-readobj -s | FileCheck %s +# RUN: | llvm-readobj -S | FileCheck %s .sdata .word 0 diff --git a/llvm/test/CodeGen/Mips/xray-section-group.ll b/llvm/test/CodeGen/Mips/xray-section-group.ll index d295ff39e52..5a123325c04 100644 --- a/llvm/test/CodeGen/Mips/xray-section-group.ll +++ b/llvm/test/CodeGen/Mips/xray-section-group.ll @@ -1,15 +1,15 @@ ; RUN: llc -filetype=asm -o - -mtriple=mips-unknown-linux-gnu -function-sections < %s | FileCheck %s ; RUN: llc -filetype=asm -o - -mtriple=mipsel-unknown-linux-gnu -function-sections < %s | FileCheck %s ; RUN: llc -filetype=obj -o %t -mtriple=mips-unknown-linux-gnu -function-sections < %s -; RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CHECK-OBJ ; RUN: llc -filetype=obj -o %t -mtriple=mipsel-unknown-linux-gnu -function-sections < %s -; RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CHECK-OBJ ; RUN: llc -filetype=asm -o - -mtriple=mips64-unknown-linux-gnu -function-sections < %s | FileCheck %s ; RUN: llc -filetype=asm -o - -mtriple=mips64el-unknown-linux-gnu -function-sections < %s | FileCheck %s ; RUN: llc -filetype=obj -o %t -mtriple=mips64-unknown-linux-gnu -function-sections < %s -; RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CHECK-OBJ ; RUN: llc -filetype=obj -o %t -mtriple=mips64el-unknown-linux-gnu -function-sections < %s -; RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=CHECK-OBJ +; RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CHECK-OBJ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always" { ; CHECK: .section .text.foo,"ax",@progbits diff --git a/llvm/test/CodeGen/Thumb2/tpsoft.ll b/llvm/test/CodeGen/Thumb2/tpsoft.ll index de358d98d49..7e268c718ea 100644 --- a/llvm/test/CodeGen/Thumb2/tpsoft.ll +++ b/llvm/test/CodeGen/Thumb2/tpsoft.ll @@ -3,9 +3,9 @@ ; RUN: llc %s -mtriple=thumbebv7-linux-gnueabi -o - | \ ; RUN: FileCheck -check-prefix=ELFASM %s ; RUN: llc %s -mtriple=thumbv7-linux-gnueabi -filetype=obj -o - | \ -; RUN: llvm-readobj -s -sd | FileCheck -check-prefix=ELFOBJ -check-prefix=ELFOBJ-LE %s +; RUN: llvm-readobj -S --sd | FileCheck -check-prefix=ELFOBJ -check-prefix=ELFOBJ-LE %s ; RUN: llc %s -mtriple=thumbebv7-linux-gnueabi -filetype=obj -o - | \ -; RUN: llvm-readobj -s -sd | FileCheck -check-prefix=ELFOBJ -check-prefix=ELFOBJ-BE %s +; RUN: llvm-readobj -S --sd | FileCheck -check-prefix=ELFOBJ -check-prefix=ELFOBJ-BE %s ;; Make sure that bl __aeabi_read_tp is materialized and fixed up correctly ;; in the obj case. diff --git a/llvm/test/CodeGen/X86/file-directive.ll b/llvm/test/CodeGen/X86/file-directive.ll index 4b25a0909ea..4650432f50d 100644 --- a/llvm/test/CodeGen/X86/file-directive.ll +++ b/llvm/test/CodeGen/X86/file-directive.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-linux-gnu -filetype=asm < %s | FileCheck %s --check-prefix=DIRECTIVE -; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj < %s | llvm-readobj -symbols | FileCheck %s --check-prefix=STT-FILE +; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj < %s | llvm-readobj --symbols | FileCheck %s --check-prefix=STT-FILE ; DIRECTIVE: .file "foobar" ; STT-FILE: Name: foobar diff --git a/llvm/test/CodeGen/X86/push-cfi-obj.ll b/llvm/test/CodeGen/X86/push-cfi-obj.ll index 1371acb1db3..aca5803cbd6 100644 --- a/llvm/test/CodeGen/X86/push-cfi-obj.ll +++ b/llvm/test/CodeGen/X86/push-cfi-obj.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -mtriple=i686-pc-linux -filetype=obj | llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=LINUX -; RUN: llc < %s -mtriple=i686-darwin-macosx10.7 -filetype=obj | llvm-readobj -sections | FileCheck -check-prefix=DARWIN %s +; RUN: llc < %s -mtriple=i686-pc-linux -filetype=obj | llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=LINUX +; RUN: llc < %s -mtriple=i686-darwin-macosx10.7 -filetype=obj | llvm-readobj --sections | FileCheck -check-prefix=DARWIN %s ; On darwin, check that we manage to generate the compact unwind section ; DARWIN: Name: __compact_unwind diff --git a/llvm/test/CodeGen/X86/tls-windows-itanium.ll b/llvm/test/CodeGen/X86/tls-windows-itanium.ll index 20ac0990196..7de4e1b5dd2 100644 --- a/llvm/test/CodeGen/X86/tls-windows-itanium.ll +++ b/llvm/test/CodeGen/X86/tls-windows-itanium.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple i686-windows-itanium -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-ASM -; RUN: llc -mtriple i686-windows-itanium -filetype obj -o - %s | llvm-readobj -relocations - | FileCheck %s -check-prefix CHECK-OBJ +; RUN: llc -mtriple i686-windows-itanium -filetype obj -o - %s | llvm-readobj -r - | FileCheck %s -check-prefix CHECK-OBJ @get_count_incremented.count = internal thread_local unnamed_addr global i32 0, align 4 diff --git a/llvm/test/CodeGen/X86/win64_eh_leaf.ll b/llvm/test/CodeGen/X86/win64_eh_leaf.ll index 35d55a90737..8d7a301f546 100644 --- a/llvm/test/CodeGen/X86/win64_eh_leaf.ll +++ b/llvm/test/CodeGen/X86/win64_eh_leaf.ll @@ -1,6 +1,6 @@ ; RUN: llc < %s -O1 -mtriple=x86_64-pc-win32 | FileCheck %s -check-prefix=ASM ; RUN: llc < %s -O1 -mtriple=x86_64-pc-win32 -filetype=obj -o %t -; RUN: llvm-readobj -unwind %t | FileCheck %s -check-prefix=READOBJ +; RUN: llvm-readobj --unwind %t | FileCheck %s -check-prefix=READOBJ declare void @g(i32) diff --git a/llvm/test/DebugInfo/COFF/anonymous-struct.ll b/llvm/test/DebugInfo/COFF/anonymous-struct.ll index b5a2cb10673..7bd857e0924 100644 --- a/llvm/test/DebugInfo/COFF/anonymous-struct.ll +++ b/llvm/test/DebugInfo/COFF/anonymous-struct.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; struct S { diff --git a/llvm/test/DebugInfo/COFF/asm.ll b/llvm/test/DebugInfo/COFF/asm.ll index ed71b246f3c..8790dddd50d 100644 --- a/llvm/test/DebugInfo/COFF/asm.ll +++ b/llvm/test/DebugInfo/COFF/asm.ll @@ -1,7 +1,7 @@ ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -O0 < %s | FileCheck --check-prefix=X86 %s -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview | FileCheck --check-prefix=OBJ32 %s +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview | FileCheck --check-prefix=OBJ32 %s ; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -O0 < %s | FileCheck --check-prefix=X64 %s -; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview | FileCheck --check-prefix=OBJ64 %s +; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview | FileCheck --check-prefix=OBJ64 %s ; This LL file was generated by running clang on the following code: ; D:\asm.c: diff --git a/llvm/test/DebugInfo/COFF/big-type.ll b/llvm/test/DebugInfo/COFF/big-type.ll index d0096622ca8..67059eeab0c 100644 --- a/llvm/test/DebugInfo/COFF/big-type.ll +++ b/llvm/test/DebugInfo/COFF/big-type.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj < %s | llvm-readobj - -codeview | FileCheck %s +; RUN: llc -filetype=obj < %s | llvm-readobj - --codeview | FileCheck %s ; We need three continuation records for this. diff --git a/llvm/test/DebugInfo/COFF/bitfields.ll b/llvm/test/DebugInfo/COFF/bitfields.ll index cb3b14ee9eb..ff14760ff36 100644 --- a/llvm/test/DebugInfo/COFF/bitfields.ll +++ b/llvm/test/DebugInfo/COFF/bitfields.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/class-options-common.ll b/llvm/test/DebugInfo/COFF/class-options-common.ll index 8a35123aac0..e832328f5c3 100644 --- a/llvm/test/DebugInfo/COFF/class-options-common.ll +++ b/llvm/test/DebugInfo/COFF/class-options-common.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; ; Command to generate function-options.ll ; $ clang++ class-options-common.cpp -S -emit-llvm -g -gcodeview -o class-options-common.ll diff --git a/llvm/test/DebugInfo/COFF/const-unnamed-member.ll b/llvm/test/DebugInfo/COFF/const-unnamed-member.ll index c6c41a3c5d6..1dfe885a766 100644 --- a/llvm/test/DebugInfo/COFF/const-unnamed-member.ll +++ b/llvm/test/DebugInfo/COFF/const-unnamed-member.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj < %s | llvm-readobj -codeview - | FileCheck %s +; RUN: llc -filetype=obj < %s | llvm-readobj --codeview - | FileCheck %s ; Objective-C++ source demonstrating the issue: ; void (^b)(void) = []() {}; diff --git a/llvm/test/DebugInfo/COFF/cpp-mangling.ll b/llvm/test/DebugInfo/COFF/cpp-mangling.ll index d91286ea770..1bbb5bd174e 100644 --- a/llvm/test/DebugInfo/COFF/cpp-mangling.ll +++ b/llvm/test/DebugInfo/COFF/cpp-mangling.ll @@ -1,5 +1,5 @@ ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 -filetype=obj < %s \ -; RUN: | llvm-readobj -codeview | FileCheck %s +; RUN: | llvm-readobj --codeview | FileCheck %s ; C++ source to regenerate: ; namespace foo { diff --git a/llvm/test/DebugInfo/COFF/defer-complete-type.ll b/llvm/test/DebugInfo/COFF/defer-complete-type.ll index 7a5d552be4f..3ece1fd8cc6 100644 --- a/llvm/test/DebugInfo/COFF/defer-complete-type.ll +++ b/llvm/test/DebugInfo/COFF/defer-complete-type.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; Both A and B should get forward declarations and complete definitions for this ; example. diff --git a/llvm/test/DebugInfo/COFF/dlang.ll b/llvm/test/DebugInfo/COFF/dlang.ll index 85d08840bb8..9c8ce17b4a3 100644 --- a/llvm/test/DebugInfo/COFF/dlang.ll +++ b/llvm/test/DebugInfo/COFF/dlang.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; ASM: .short 4412 # Record kind: S_COMPILE3 ; ASM-NEXT: .long 68 # Flags and language diff --git a/llvm/test/DebugInfo/COFF/enum-co.ll b/llvm/test/DebugInfo/COFF/enum-co.ll index 328cf76b855..2059918ba84 100644 --- a/llvm/test/DebugInfo/COFF/enum-co.ll +++ b/llvm/test/DebugInfo/COFF/enum-co.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; Command to generate enum-co.ll ; $ clang++ enum-co.cpp -S -emit-llvm -g -gcodeview -o enum-co.ll diff --git a/llvm/test/DebugInfo/COFF/enum.ll b/llvm/test/DebugInfo/COFF/enum.ll index 04c0526b969..15bbce0d468 100644 --- a/llvm/test/DebugInfo/COFF/enum.ll +++ b/llvm/test/DebugInfo/COFF/enum.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; Generated from the following C++ source: ; enum E : int { BLAH }; diff --git a/llvm/test/DebugInfo/COFF/fp-stack.ll b/llvm/test/DebugInfo/COFF/fp-stack.ll index f0d80b3e9b2..e9b031d6602 100644 --- a/llvm/test/DebugInfo/COFF/fp-stack.ll +++ b/llvm/test/DebugInfo/COFF/fp-stack.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=i686-windows-msvc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -mtriple=i686-windows-msvc < %s -filetype=obj | llvm-readobj -codeview - | FileCheck %s --check-prefix=OBJ +; RUN: llc -mtriple=i686-windows-msvc < %s -filetype=obj | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-pc-windows-msvc18.0.0" diff --git a/llvm/test/DebugInfo/COFF/fpo-csrs.ll b/llvm/test/DebugInfo/COFF/fpo-csrs.ll index 9cf16e5d783..50b2e3be6cc 100644 --- a/llvm/test/DebugInfo/COFF/fpo-csrs.ll +++ b/llvm/test/DebugInfo/COFF/fpo-csrs.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; C source: ; int getval(void); diff --git a/llvm/test/DebugInfo/COFF/fpo-realign-vframe.ll b/llvm/test/DebugInfo/COFF/fpo-realign-vframe.ll index e5f8d5d34dc..f0be24d21c8 100644 --- a/llvm/test/DebugInfo/COFF/fpo-realign-vframe.ll +++ b/llvm/test/DebugInfo/COFF/fpo-realign-vframe.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; PR38857 diff --git a/llvm/test/DebugInfo/COFF/fpo-shrink-wrap.ll b/llvm/test/DebugInfo/COFF/fpo-shrink-wrap.ll index 5a01f38d261..f0a83159fec 100644 --- a/llvm/test/DebugInfo/COFF/fpo-shrink-wrap.ll +++ b/llvm/test/DebugInfo/COFF/fpo-shrink-wrap.ll @@ -1,5 +1,5 @@ ; RUN: llc -enable-shrink-wrap=true < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -enable-shrink-wrap=true -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -enable-shrink-wrap=true -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; C source: ; int doSomething(int*); diff --git a/llvm/test/DebugInfo/COFF/function-options.ll b/llvm/test/DebugInfo/COFF/function-options.ll index 999a6fe89e7..50058dec943 100644 --- a/llvm/test/DebugInfo/COFF/function-options.ll +++ b/llvm/test/DebugInfo/COFF/function-options.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; ; Command to generate function-options.ll ; $ clang++ function-options.cpp -S -emit-llvm -g -gcodeview -o function-options.ll diff --git a/llvm/test/DebugInfo/COFF/global_visibility.ll b/llvm/test/DebugInfo/COFF/global_visibility.ll index e948f8617c3..e4baf13ec0e 100644 --- a/llvm/test/DebugInfo/COFF/global_visibility.ll +++ b/llvm/test/DebugInfo/COFF/global_visibility.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; ; This test verifies global variables are emitted within the correct scope. ; diff --git a/llvm/test/DebugInfo/COFF/globals.ll b/llvm/test/DebugInfo/COFF/globals.ll index f26e11c94e9..22f3f3238f8 100644 --- a/llvm/test/DebugInfo/COFF/globals.ll +++ b/llvm/test/DebugInfo/COFF/globals.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s --check-prefix=OBJ ; RUN: llc < %s -filetype=obj | obj2yaml | FileCheck %s --check-prefix=YAML ; C++ source to regenerate: diff --git a/llvm/test/DebugInfo/COFF/inheritance.ll b/llvm/test/DebugInfo/COFF/inheritance.ll index 5c7916b7bb8..2e10a10cc4c 100644 --- a/llvm/test/DebugInfo/COFF/inheritance.ll +++ b/llvm/test/DebugInfo/COFF/inheritance.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj -o - | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj -o - | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/inlining-files.ll b/llvm/test/DebugInfo/COFF/inlining-files.ll index 483e9b576e8..e167ce43c3a 100644 --- a/llvm/test/DebugInfo/COFF/inlining-files.ll +++ b/llvm/test/DebugInfo/COFF/inlining-files.ll @@ -1,4 +1,4 @@ -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; This LL file was generated by running 'clang -O1 -g -gcodeview' on the ; volatile int x; diff --git a/llvm/test/DebugInfo/COFF/inlining-header.ll b/llvm/test/DebugInfo/COFF/inlining-header.ll index 4fdbfde760e..811414a36a3 100644 --- a/llvm/test/DebugInfo/COFF/inlining-header.ll +++ b/llvm/test/DebugInfo/COFF/inlining-header.ll @@ -1,5 +1,5 @@ ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; This C++ source should run and you should be able to step through the volatile ; modifications to x in windbg. diff --git a/llvm/test/DebugInfo/COFF/inlining-levels.ll b/llvm/test/DebugInfo/COFF/inlining-levels.ll index b9ddf61b176..5a8a2851532 100644 --- a/llvm/test/DebugInfo/COFF/inlining-levels.ll +++ b/llvm/test/DebugInfo/COFF/inlining-levels.ll @@ -1,4 +1,4 @@ -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; This LL file was generated by running 'clang -O1 -g -gcodeview' on the ; following code: diff --git a/llvm/test/DebugInfo/COFF/inlining-padding.ll b/llvm/test/DebugInfo/COFF/inlining-padding.ll index 1ef0c047657..1b2d1138be3 100644 --- a/llvm/test/DebugInfo/COFF/inlining-padding.ll +++ b/llvm/test/DebugInfo/COFF/inlining-padding.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj -o - | llvm-readobj -codeview -codeview-subsection-bytes | FileCheck %s +; RUN: llc < %s -filetype=obj -o - | llvm-readobj --codeview --codeview-subsection-bytes | FileCheck %s ; Check how we pad out the LF_FUNC_ID records. The 00F3F2F1 bytes in LeafData are ; what's interesting here. diff --git a/llvm/test/DebugInfo/COFF/inlining-same-name.ll b/llvm/test/DebugInfo/COFF/inlining-same-name.ll index 4f2bcad1459..4bca6f7d262 100644 --- a/llvm/test/DebugInfo/COFF/inlining-same-name.ll +++ b/llvm/test/DebugInfo/COFF/inlining-same-name.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj -o - | llvm-readobj - -codeview | FileCheck %s +; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj -o - | llvm-readobj - --codeview | FileCheck %s ; We should only get one func id record, and both inlinees should point to it, ; even though there are two DISubprograms. diff --git a/llvm/test/DebugInfo/COFF/inlining.ll b/llvm/test/DebugInfo/COFF/inlining.ll index bb07cacb1cf..64e1253dce3 100644 --- a/llvm/test/DebugInfo/COFF/inlining.ll +++ b/llvm/test/DebugInfo/COFF/inlining.ll @@ -1,5 +1,5 @@ ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; This LL file was generated by running 'clang -O1 -g -gcodeview' on the ; following code: diff --git a/llvm/test/DebugInfo/COFF/int8-char-type.ll b/llvm/test/DebugInfo/COFF/int8-char-type.ll index ab28a5eb057..3dd5aae5421 100644 --- a/llvm/test/DebugInfo/COFF/int8-char-type.ll +++ b/llvm/test/DebugInfo/COFF/int8-char-type.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; Use character types for all 8-bit integers. The VS debugger doesn't cope well ; with the T_[U]INT1 types. Non-C language frontends are likely use the normal diff --git a/llvm/test/DebugInfo/COFF/lambda.ll b/llvm/test/DebugInfo/COFF/lambda.ll index 904bd801f8d..83e8e02e2e6 100644 --- a/llvm/test/DebugInfo/COFF/lambda.ll +++ b/llvm/test/DebugInfo/COFF/lambda.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; ; Verify lambda routines are emitted properly in CodeView. ; diff --git a/llvm/test/DebugInfo/COFF/lexicalblock.ll b/llvm/test/DebugInfo/COFF/lexicalblock.ll index 970aae27d69..c7102d0045c 100644 --- a/llvm/test/DebugInfo/COFF/lexicalblock.ll +++ b/llvm/test/DebugInfo/COFF/lexicalblock.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; ; -- lexicablock.cxx begin ---------------------------------------------------- ; int main(int argc, char *argv[]) { diff --git a/llvm/test/DebugInfo/COFF/lines-difile.ll b/llvm/test/DebugInfo/COFF/lines-difile.ll index 99d613604b8..ab2dec4c6b4 100644 --- a/llvm/test/DebugInfo/COFF/lines-difile.ll +++ b/llvm/test/DebugInfo/COFF/lines-difile.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; Test what happens when we have two DIFile entries with differing slashes. ; Make sure we only emit one file checksum entry. diff --git a/llvm/test/DebugInfo/COFF/local-constant.ll b/llvm/test/DebugInfo/COFF/local-constant.ll index b654b3631ce..57759c90479 100644 --- a/llvm/test/DebugInfo/COFF/local-constant.ll +++ b/llvm/test/DebugInfo/COFF/local-constant.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj | llvm-readobj -codeview - | FileCheck %s --check-prefix=OBJ +; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ ; This LL file was generated by running 'clang -g -gcodeview' on the ; following code: diff --git a/llvm/test/DebugInfo/COFF/local-variable-gap.ll b/llvm/test/DebugInfo/COFF/local-variable-gap.ll index 04a3ea94402..b7c69a65c89 100644 --- a/llvm/test/DebugInfo/COFF/local-variable-gap.ll +++ b/llvm/test/DebugInfo/COFF/local-variable-gap.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-windows-msvc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj | llvm-readobj -codeview - | FileCheck %s --check-prefix=OBJ +; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ ; This test attempts to exercise gaps in local variables. The local variable 'p' ; will end up in some CSR (esi), which will be used in both the BB scheduled diff --git a/llvm/test/DebugInfo/COFF/local-variables.ll b/llvm/test/DebugInfo/COFF/local-variables.ll index 085ced17262..5b00383e539 100644 --- a/llvm/test/DebugInfo/COFF/local-variables.ll +++ b/llvm/test/DebugInfo/COFF/local-variables.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=x86_64-windows-msvc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj | llvm-readobj -codeview - | FileCheck %s --check-prefix=OBJ +; RUN: llc -mtriple=x86_64-windows-msvc < %s -filetype=obj | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ ; This LL file was generated by running 'clang -g -gcodeview' on the ; following code: diff --git a/llvm/test/DebugInfo/COFF/long-name.ll b/llvm/test/DebugInfo/COFF/long-name.ll index 08b96903380..db3d8ccd85e 100644 --- a/llvm/test/DebugInfo/COFF/long-name.ll +++ b/llvm/test/DebugInfo/COFF/long-name.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s ; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: Kind: S_GPROC32_ID (0x1147) diff --git a/llvm/test/DebugInfo/COFF/long-type-name.ll b/llvm/test/DebugInfo/COFF/long-type-name.ll index 2d883ec602d..93ac80ae711 100644 --- a/llvm/test/DebugInfo/COFF/long-type-name.ll +++ b/llvm/test/DebugInfo/COFF/long-type-name.ll @@ -1,4 +1,4 @@ -; RUN: llc %s -o - -filetype=obj | llvm-readobj -codeview | FileCheck %s +; RUN: llc %s -o - -filetype=obj | llvm-readobj --codeview | FileCheck %s ; CHECK: Struct (0x1000) { ; CHECK: TypeLeafKind: LF_STRUCTURE (0x1505) diff --git a/llvm/test/DebugInfo/COFF/multifile.ll b/llvm/test/DebugInfo/COFF/multifile.ll index cb281ea7a4d..cc17a48ffdf 100644 --- a/llvm/test/DebugInfo/COFF/multifile.ll +++ b/llvm/test/DebugInfo/COFF/multifile.ll @@ -1,7 +1,7 @@ ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -O0 < %s | FileCheck --check-prefix=X86 %s -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ32 %s +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ32 %s ; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -O0 < %s | FileCheck --check-prefix=X64 %s -; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ64 %s +; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ64 %s ; This LL file was generated by running clang on the following code: ; D:\input.c: diff --git a/llvm/test/DebugInfo/COFF/multifunction.ll b/llvm/test/DebugInfo/COFF/multifunction.ll index 1c19b34ab93..577071cd955 100644 --- a/llvm/test/DebugInfo/COFF/multifunction.ll +++ b/llvm/test/DebugInfo/COFF/multifunction.ll @@ -1,7 +1,7 @@ ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -O0 < %s | FileCheck --check-prefix=X86 %s -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ32 %s +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ32 %s ; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -O0 < %s | FileCheck --check-prefix=X64 %s -; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ64 %s +; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ64 %s ; This LL file was generated by running clang on the following code: ; D:\source.c: diff --git a/llvm/test/DebugInfo/COFF/nested-types.ll b/llvm/test/DebugInfo/COFF/nested-types.ll index cd3ee3fa555..9579dafee2c 100644 --- a/llvm/test/DebugInfo/COFF/nested-types.ll +++ b/llvm/test/DebugInfo/COFF/nested-types.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; struct HasNested { diff --git a/llvm/test/DebugInfo/COFF/pieces.ll b/llvm/test/DebugInfo/COFF/pieces.ll index eebef3895d4..8fbdce3cbeb 100644 --- a/llvm/test/DebugInfo/COFF/pieces.ll +++ b/llvm/test/DebugInfo/COFF/pieces.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; Compile with -O1 as C diff --git a/llvm/test/DebugInfo/COFF/purge-typedef-udts.ll b/llvm/test/DebugInfo/COFF/purge-typedef-udts.ll index d05a8f3cfc3..b1edc470c60 100644 --- a/llvm/test/DebugInfo/COFF/purge-typedef-udts.ll +++ b/llvm/test/DebugInfo/COFF/purge-typedef-udts.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s source_filename = "test/DebugInfo/COFF/purge-typedef-udts.ll" target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-pc-windows-msvc19.11.25506" diff --git a/llvm/test/DebugInfo/COFF/register-variables.ll b/llvm/test/DebugInfo/COFF/register-variables.ll index 626137199a9..d0a0d27fda0 100644 --- a/llvm/test/DebugInfo/COFF/register-variables.ll +++ b/llvm/test/DebugInfo/COFF/register-variables.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc < %s -filetype=obj | llvm-readobj -codeview - | FileCheck %s --check-prefix=OBJ +; RUN: llc < %s -filetype=obj | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ ; Generated from: ; volatile int x; diff --git a/llvm/test/DebugInfo/COFF/retained-types.ll b/llvm/test/DebugInfo/COFF/retained-types.ll index f08a97d8636..9e26b82cfe1 100644 --- a/llvm/test/DebugInfo/COFF/retained-types.ll +++ b/llvm/test/DebugInfo/COFF/retained-types.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; This test checks that types which are used in expressions, but for which ; there are no variables, known as retained types, get emitted. diff --git a/llvm/test/DebugInfo/COFF/scopes.ll b/llvm/test/DebugInfo/COFF/scopes.ll index cea662d8764..a644ea9c5b3 100644 --- a/llvm/test/DebugInfo/COFF/scopes.ll +++ b/llvm/test/DebugInfo/COFF/scopes.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; Check that we keep namespace scopes around the same way MSVC does. ; We do function scopes slightly differently, but everything should be alright. diff --git a/llvm/test/DebugInfo/COFF/simple.ll b/llvm/test/DebugInfo/COFF/simple.ll index 58d0f42a67a..5df446fa704 100644 --- a/llvm/test/DebugInfo/COFF/simple.ll +++ b/llvm/test/DebugInfo/COFF/simple.ll @@ -1,15 +1,15 @@ ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -O0 < %s | FileCheck --check-prefix=X86 %s ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32-itanium -O0 < %s | FileCheck --check-prefix=X86 %s ; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32-gnu -O0 < %s | FileCheck --check-prefix=X86 %s -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ32 %s -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32-itanium -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ32 %s -; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32-gnu -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ32 %s +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ32 %s +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32-itanium -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ32 %s +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32-gnu -o - -O0 < %s | llvm-mc -triple=i686-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ32 %s ; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -O0 < %s | FileCheck --check-prefix=X64 %s ; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32-itanium -O0 < %s | FileCheck --check-prefix=X64 %s ; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32-gnu -O0 < %s | FileCheck --check-prefix=X64 %s -; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ64 %s -; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32-itanium -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ64 %s -; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32-gnu -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -s -sr -codeview -section-symbols | FileCheck --check-prefix=OBJ64 %s +; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32 -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ64 %s +; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32-itanium -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ64 %s +; RUN: llc -mcpu=core2 -mtriple=x86_64-pc-win32-gnu -o - -O0 < %s | llvm-mc -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj -S --sr --codeview --section-symbols | FileCheck --check-prefix=OBJ64 %s ; This LL file was generated by running clang on the following code: ; D:\test.c: diff --git a/llvm/test/DebugInfo/COFF/static-methods.ll b/llvm/test/DebugInfo/COFF/static-methods.ll index 19c422ccaf3..eb192567629 100644 --- a/llvm/test/DebugInfo/COFF/static-methods.ll +++ b/llvm/test/DebugInfo/COFF/static-methods.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; Check for the appropriate MethodKind below. diff --git a/llvm/test/DebugInfo/COFF/swift.ll b/llvm/test/DebugInfo/COFF/swift.ll index fa56bb3ac9f..4d1ffee2c15 100644 --- a/llvm/test/DebugInfo/COFF/swift.ll +++ b/llvm/test/DebugInfo/COFF/swift.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; ASM: .short 4412 # Record kind: S_COMPILE3 ; ASM-NEXT: .long 83 # Flags and language diff --git a/llvm/test/DebugInfo/COFF/thunk.ll b/llvm/test/DebugInfo/COFF/thunk.ll index c8f5c5ad436..ad18872b8d8 100644 --- a/llvm/test/DebugInfo/COFF/thunk.ll +++ b/llvm/test/DebugInfo/COFF/thunk.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; RUN: llc < %s | FileCheck %s --check-prefix=ASM ; RUN: opt -S -debugger-tune=lldb %s | FileCheck -check-prefix=OPT %s ; diff --git a/llvm/test/DebugInfo/COFF/type-quals.ll b/llvm/test/DebugInfo/COFF/type-quals.ll index fdf92bd40d7..605dc187adc 100644 --- a/llvm/test/DebugInfo/COFF/type-quals.ll +++ b/llvm/test/DebugInfo/COFF/type-quals.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat m.cpp diff --git a/llvm/test/DebugInfo/COFF/typedef.ll b/llvm/test/DebugInfo/COFF/typedef.ll index c72ed3e6604..3e41e835c1c 100644 --- a/llvm/test/DebugInfo/COFF/typedef.ll +++ b/llvm/test/DebugInfo/COFF/typedef.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; CHECK: CodeViewDebugInfo [ ; CHECK: Subsection [ diff --git a/llvm/test/DebugInfo/COFF/types-array-advanced.ll b/llvm/test/DebugInfo/COFF/types-array-advanced.ll index e1a8c1841bb..ea10142bd6e 100644 --- a/llvm/test/DebugInfo/COFF/types-array-advanced.ll +++ b/llvm/test/DebugInfo/COFF/types-array-advanced.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-array-unsized.ll b/llvm/test/DebugInfo/COFF/types-array-unsized.ll index 694e0a77b2c..c9e800c356d 100644 --- a/llvm/test/DebugInfo/COFF/types-array-unsized.ll +++ b/llvm/test/DebugInfo/COFF/types-array-unsized.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s +; RUN: llc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s ; We should emit two array types: one used to describe the static data member, ; and the other used by the S_GDATA32 for the definition. diff --git a/llvm/test/DebugInfo/COFF/types-array.ll b/llvm/test/DebugInfo/COFF/types-array.ll index 16298dafbd4..852d39546d8 100644 --- a/llvm/test/DebugInfo/COFF/types-array.ll +++ b/llvm/test/DebugInfo/COFF/types-array.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-basic.ll b/llvm/test/DebugInfo/COFF/types-basic.ll index 7b1bb852502..773b2a1cc1e 100644 --- a/llvm/test/DebugInfo/COFF/types-basic.ll +++ b/llvm/test/DebugInfo/COFF/types-basic.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-calling-conv.ll b/llvm/test/DebugInfo/COFF/types-calling-conv.ll index 3e0d9f1e364..f0a4fe1ea8b 100644 --- a/llvm/test/DebugInfo/COFF/types-calling-conv.ll +++ b/llvm/test/DebugInfo/COFF/types-calling-conv.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj -o - | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj -o - | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-cvarargs.ll b/llvm/test/DebugInfo/COFF/types-cvarargs.ll index 5e366f0e981..88b59e4fe00 100644 --- a/llvm/test/DebugInfo/COFF/types-cvarargs.ll +++ b/llvm/test/DebugInfo/COFF/types-cvarargs.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-data-members.ll b/llvm/test/DebugInfo/COFF/types-data-members.ll index e82a9370f66..d8cff6b7a08 100644 --- a/llvm/test/DebugInfo/COFF/types-data-members.ll +++ b/llvm/test/DebugInfo/COFF/types-data-members.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-empty-member-fn.ll b/llvm/test/DebugInfo/COFF/types-empty-member-fn.ll index 87cba9d6209..003b9c89b13 100644 --- a/llvm/test/DebugInfo/COFF/types-empty-member-fn.ll +++ b/llvm/test/DebugInfo/COFF/types-empty-member-fn.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; ModuleID = 'foo.3a1fbbbh-cgu.0' source_filename = "foo.3a1fbbbh-cgu.0" diff --git a/llvm/test/DebugInfo/COFF/types-method-ref-qualifiers.ll b/llvm/test/DebugInfo/COFF/types-method-ref-qualifiers.ll index 03d7e346164..cf4781798f0 100644 --- a/llvm/test/DebugInfo/COFF/types-method-ref-qualifiers.ll +++ b/llvm/test/DebugInfo/COFF/types-method-ref-qualifiers.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; struct A { diff --git a/llvm/test/DebugInfo/COFF/types-nested-class.ll b/llvm/test/DebugInfo/COFF/types-nested-class.ll index feb944f2282..0893db7240a 100644 --- a/llvm/test/DebugInfo/COFF/types-nested-class.ll +++ b/llvm/test/DebugInfo/COFF/types-nested-class.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat hello.cpp diff --git a/llvm/test/DebugInfo/COFF/types-non-virtual-methods.ll b/llvm/test/DebugInfo/COFF/types-non-virtual-methods.ll index a06ffb0d995..dfe1589ab3f 100644 --- a/llvm/test/DebugInfo/COFF/types-non-virtual-methods.ll +++ b/llvm/test/DebugInfo/COFF/types-non-virtual-methods.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-ptr-to-member.ll b/llvm/test/DebugInfo/COFF/types-ptr-to-member.ll index 3961be68a4d..33b536ae656 100644 --- a/llvm/test/DebugInfo/COFF/types-ptr-to-member.ll +++ b/llvm/test/DebugInfo/COFF/types-ptr-to-member.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/types-recursive-struct.ll b/llvm/test/DebugInfo/COFF/types-recursive-struct.ll index 3920826523b..34ca2b11fa1 100644 --- a/llvm/test/DebugInfo/COFF/types-recursive-struct.ll +++ b/llvm/test/DebugInfo/COFF/types-recursive-struct.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; This test ensures that circular type references through pointer types don't ; cause infinite recursion. It also tests that we always refer to the forward diff --git a/llvm/test/DebugInfo/COFF/types-std-nullptr-t.ll b/llvm/test/DebugInfo/COFF/types-std-nullptr-t.ll index 4d64a67860d..090e57dba3d 100644 --- a/llvm/test/DebugInfo/COFF/types-std-nullptr-t.ll +++ b/llvm/test/DebugInfo/COFF/types-std-nullptr-t.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; $ cat foo.cpp diff --git a/llvm/test/DebugInfo/COFF/udts.ll b/llvm/test/DebugInfo/COFF/udts.ll index d17f5cd4921..340d9deaf2b 100644 --- a/llvm/test/DebugInfo/COFF/udts.ll +++ b/llvm/test/DebugInfo/COFF/udts.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s -filetype=obj > %t.obj -; RUN: llvm-readobj -codeview %t.obj | FileCheck --check-prefix=READOBJ %s +; RUN: llvm-readobj --codeview %t.obj | FileCheck --check-prefix=READOBJ %s ; RUN: llvm-pdbutil dump -symbols %t.obj | FileCheck --check-prefix=PDBUTIL %s ; C++ to regenerate: diff --git a/llvm/test/DebugInfo/COFF/unnamed.ll b/llvm/test/DebugInfo/COFF/unnamed.ll index f1723d7f1cd..c845785a27b 100644 --- a/llvm/test/DebugInfo/COFF/unnamed.ll +++ b/llvm/test/DebugInfo/COFF/unnamed.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; ; Verify CodeView emission does not emit forward references for unnamed ; structs/unions. If a forward reference is emitted for an unnamed composite diff --git a/llvm/test/DebugInfo/COFF/vframe-csr.ll b/llvm/test/DebugInfo/COFF/vframe-csr.ll index 1c1c0cec50e..273a5a372e3 100644 --- a/llvm/test/DebugInfo/COFF/vframe-csr.ll +++ b/llvm/test/DebugInfo/COFF/vframe-csr.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +; RUN: llc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ ; PR38857 diff --git a/llvm/test/DebugInfo/COFF/vframe-fpo.ll b/llvm/test/DebugInfo/COFF/vframe-fpo.ll index 27273cd5c00..e0f82893ba2 100644 --- a/llvm/test/DebugInfo/COFF/vframe-fpo.ll +++ b/llvm/test/DebugInfo/COFF/vframe-fpo.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s | FileCheck %s --check-prefix=ASM -; RUN: llc < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=CODEVIEW +; RUN: llc < %s -filetype=obj | llvm-readobj --codeview | FileCheck %s --check-prefix=CODEVIEW ; This test checks that for 32-bit x86 we use VFRAME and ; S_DEFRANGE_FRAMEPOINTER_REL with the right offsets. The test has two function diff --git a/llvm/test/DebugInfo/COFF/vftables.ll b/llvm/test/DebugInfo/COFF/vftables.ll index 8d3d248783f..250ee28639a 100644 --- a/llvm/test/DebugInfo/COFF/vftables.ll +++ b/llvm/test/DebugInfo/COFF/vftables.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source to regenerate: ; struct A { diff --git a/llvm/test/DebugInfo/COFF/virtual-method-kinds.ll b/llvm/test/DebugInfo/COFF/virtual-method-kinds.ll index 7580c6145f9..ea478d886a2 100644 --- a/llvm/test/DebugInfo/COFF/virtual-method-kinds.ll +++ b/llvm/test/DebugInfo/COFF/virtual-method-kinds.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; Check for the appropriate MethodKind below. diff --git a/llvm/test/DebugInfo/COFF/virtual-methods.ll b/llvm/test/DebugInfo/COFF/virtual-methods.ll index 2691ff6de21..f2e68c579d4 100644 --- a/llvm/test/DebugInfo/COFF/virtual-methods.ll +++ b/llvm/test/DebugInfo/COFF/virtual-methods.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s ; C++ source used to generate IR: ; $ cat t.cpp diff --git a/llvm/test/DebugInfo/COFF/vtable-optzn-array.ll b/llvm/test/DebugInfo/COFF/vtable-optzn-array.ll index fa34c04411c..2b5e25b2ca1 100644 --- a/llvm/test/DebugInfo/COFF/vtable-optzn-array.ll +++ b/llvm/test/DebugInfo/COFF/vtable-optzn-array.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -filetype=obj -o - | llvm-readobj - -codeview | FileCheck %s +; RUN: llc < %s -filetype=obj -o - | llvm-readobj - --codeview | FileCheck %s ; We used to crash on this input because UnicodeString is a forward declaration ; with no size. Our array type logic wanted to assert the size of the elements diff --git a/llvm/test/DebugInfo/Inputs/dwarfdump-test-zlib.cc b/llvm/test/DebugInfo/Inputs/dwarfdump-test-zlib.cc index 6c506381aa5..714673f2e23 100644 --- a/llvm/test/DebugInfo/Inputs/dwarfdump-test-zlib.cc +++ b/llvm/test/DebugInfo/Inputs/dwarfdump-test-zlib.cc @@ -24,5 +24,5 @@ int main() { // $ clang++ -g dwarfdump-test-zlib.cc -Wl,--compress-debug-sections=zlib -o dwarfdump-test-zlib.elf-x86-64 // $ clang++ -g dwarfdump-test-zlib.cc -Wa,--compress-debug-sections=zlib -c -o dwarfdump-test-zlib.o.elf-x86-64 // $ clang++ -g dwarfdump-test-zlib.cc -Wl,--compress-debug-sections=zlib-gnu -o dwarfdump-test-zlibgnu.elf-x86-64 -// llvm-readobj -sections can be used to see that outputs really contain the compressed sections, also output in both +// llvm-readobj --sections can be used to see that outputs really contain the compressed sections, also output in both // cases is slightly smaller, that is because of compression. diff --git a/llvm/test/DebugInfo/PDB/using-namespace.test b/llvm/test/DebugInfo/PDB/using-namespace.test index 77c37826c8f..92578e7eb1d 100644 --- a/llvm/test/DebugInfo/PDB/using-namespace.test +++ b/llvm/test/DebugInfo/PDB/using-namespace.test @@ -1,5 +1,5 @@ # RUN: yaml2obj < %s > %t.obj -# RUN: llvm-readobj -codeview %t.obj | FileCheck %s +# RUN: llvm-readobj --codeview %t.obj | FileCheck %s # CHECK: Kind: S_UNAMESPACE (0x1124) # CHECK-NEXT: Namespace: __vc_attributes diff --git a/llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll b/llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll index eef44e7b11c..e7cf7968003 100644 --- a/llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll +++ b/llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll @@ -2,24 +2,24 @@ ; debug_names should be emitted regardless of the target and debugger tuning ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=DEBUG_NAMES %s ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=DEBUG_NAMES %s ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=DEBUG_NAMES %s ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=DEBUG_NAMES %s ; But not if also type units are enabled. ; TODO: This is the case because we currently don't generate DWARF v5-compatible ; type units. Change this once DWARF v5 type units are implemented. ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -generate-type-units -debugger-tune=lldb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=NONE %s ; Debug types are ignored for non-ELF targets which means it shouldn't affect ; accelerator table generation. ; RUN: llc -mtriple=x86_64-apple-darwin12 -generate-type-units -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=DEBUG_NAMES %s ; NONE-NOT: apple_names ; NONE-NOT: debug_names diff --git a/llvm/test/DebugInfo/X86/accel-tables.ll b/llvm/test/DebugInfo/X86/accel-tables.ll index 1aef33c33e7..3f709a27d66 100644 --- a/llvm/test/DebugInfo/X86/accel-tables.ll +++ b/llvm/test/DebugInfo/X86/accel-tables.ll @@ -2,25 +2,25 @@ ; Darwin has the apple tables unless we specifically tune for gdb ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=APPLE %s ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=PUB %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=PUB %s ; Linux does has debug_names tables only if we explicitly tune for lldb ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=PUB %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=PUB %s ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=DEBUG_NAMES %s ; No accelerator tables if type units are enabled, as DWARF v4 type units are ; not compatible with accelerator tables. ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -generate-type-units -debugger-tune=lldb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=NONE %s ; Debug types are ignored for non-ELF targets which means it shouldn't affect ; accelerator table generation. ; RUN: llc -mtriple=x86_64-apple-darwin12 -generate-type-units -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=APPLE %s ; APPLE-NOT: debug_names ; APPLE-NOT: debug{{.*}}pub diff --git a/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll b/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll index a4d03dbc921..ce5e583f911 100644 --- a/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll +++ b/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll @@ -1,6 +1,6 @@ ; RUN: llc -O0 < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DEBUG ; RUN: llc < %s | FileCheck %s -; RUN: llc -filetype=obj -O0 < %s | llvm-readobj -codeview - | FileCheck %s --check-prefix=OBJ +; RUN: llc -filetype=obj -O0 < %s | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ ; IR generated by the following source: ; struct NonTrivial { diff --git a/llvm/test/DebugInfo/X86/generate-odr-hash.ll b/llvm/test/DebugInfo/X86/generate-odr-hash.ll index 8a46f6db6d8..4666cef5af1 100644 --- a/llvm/test/DebugInfo/X86/generate-odr-hash.ll +++ b/llvm/test/DebugInfo/X86/generate-odr-hash.ll @@ -2,11 +2,11 @@ ; RUN: llc < %s -o %t -filetype=obj -O0 -generate-type-units -mtriple=x86_64-unknown-linux-gnu ; RUN: llvm-dwarfdump -v %t | FileCheck --check-prefix=CHECK --check-prefix=SINGLE %s -; RUN: llvm-readobj -s -t %t | FileCheck --check-prefix=OBJ_SINGLE %s +; RUN: llvm-readobj -S -t %t | FileCheck --check-prefix=OBJ_SINGLE %s ; RUN: llc < %s -split-dwarf-file=foo.dwo -o %t -filetype=obj -O0 -generate-type-units -mtriple=x86_64-unknown-linux-gnu ; RUN: llvm-dwarfdump -v %t | FileCheck --check-prefix=CHECK --check-prefix=FISSION %s -; RUN: llvm-readobj -s -t %t | FileCheck --check-prefix=OBJ_FISSION %s +; RUN: llvm-readobj -S -t %t | FileCheck --check-prefix=OBJ_FISSION %s ; Generated from bar.cpp: diff --git a/llvm/test/DebugInfo/X86/gnu-names.ll b/llvm/test/DebugInfo/X86/gnu-names.ll index 502d15d75ca..2b99f638177 100644 --- a/llvm/test/DebugInfo/X86/gnu-names.ll +++ b/llvm/test/DebugInfo/X86/gnu-names.ll @@ -2,26 +2,26 @@ ; Darwin has the apple tables unless we specifically tune for gdb ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s > %t -; RUN: llvm-readobj -sections %t | FileCheck --check-prefix=APPLE %s +; RUN: llvm-readobj --sections %t | FileCheck --check-prefix=APPLE %s ; RUN: llvm-dwarfdump -apple-names %t | FileCheck --check-prefix=APPLE-NAMES %s ; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=GNU %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=GNU %s ; Linux does has debug_names tables only if we explicitly tune for lldb ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=GNU %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=GNU %s ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=GNU %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=GNU %s ; No accelerator tables if type units are enabled, as DWARF v4 type units are ; not compatible with accelerator tables. ; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -generate-type-units -debugger-tune=lldb < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=NONE %s ; Debug types are ignored for non-ELF targets which means it shouldn't affect ; accelerator table generation. ; RUN: llc -mtriple=x86_64-apple-darwin12 -generate-type-units -filetype=obj < %s \ -; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s +; RUN: | llvm-readobj --sections - | FileCheck --check-prefix=APPLE %s ; APPLE-NOT: debug_names ; APPLE-NOT: debug{{.*}}pub diff --git a/llvm/test/DebugInfo/precomp.test b/llvm/test/DebugInfo/precomp.test index 64986a84436..eff184ef9d9 100644 --- a/llvm/test/DebugInfo/precomp.test +++ b/llvm/test/DebugInfo/precomp.test @@ -5,8 +5,8 @@ RUN: obj2yaml %S/Inputs/precomp-a.obj > %t1/precomp-a.yaml RUN: obj2yaml %S/Inputs/precomp.obj > %t1/precomp.yaml
RUN: yaml2obj %t1/precomp-a.yaml > %t1/a.obj
RUN: yaml2obj %t1/precomp.yaml > %t1/precomp.obj
-RUN: llvm-readobj -codeview %t1/a.obj | FileCheck %s -check-prefix PRECOMP
-RUN: llvm-readobj -codeview %t1/precomp.obj | FileCheck %s -check-prefix ENDPRECOMP
+RUN: llvm-readobj --codeview %t1/a.obj | FileCheck %s -check-prefix PRECOMP
+RUN: llvm-readobj --codeview %t1/precomp.obj | FileCheck %s -check-prefix ENDPRECOMP
RUN: llvm-pdbutil dump -types %t1/a.obj | FileCheck %s -check-prefix PDB-PRECOMP
RUN: llvm-pdbutil dump -types %t1/precomp.obj | FileCheck %s -check-prefix PDB-ENDPRECOMP
diff --git a/llvm/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s b/llvm/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s index fae1d0fb3a0..6f4553ff885 100644 --- a/llvm/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s +++ b/llvm/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s @@ -1,5 +1,5 @@ // Test that R_390_PC32 and R_390_PC64 relocations can be generated. -// RUN: llvm-mc -triple s390x-linux-gnu -filetype=obj %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -triple s390x-linux-gnu -filetype=obj %s -o - | llvm-readobj -S --sr --sd | FileCheck %s // Test that RuntimeDyld can fix up such relocations. // RUN: rm -rf %t && mkdir -p %t diff --git a/llvm/test/MC/AArch64/CheckDataSymbol.s b/llvm/test/MC/AArch64/CheckDataSymbol.s index ea3ed7b2873..f3492380ac1 100644 --- a/llvm/test/MC/AArch64/CheckDataSymbol.s +++ b/llvm/test/MC/AArch64/CheckDataSymbol.s @@ -1,6 +1,6 @@ # RUN: llvm-mc -filetype=obj -assemble \ # RUN: -triple=aarch64- %s -o - \ -# RUN: | llvm-readobj -s -t - | FileCheck %s +# RUN: | llvm-readobj -S -t - | FileCheck %s # CHECK: Name: $d.1 ({{[1-9][0-9]+}}) # CHECK-NEXT: Value: 0x4 # CHECK-NEXT: Size: 0 diff --git a/llvm/test/MC/AArch64/arm64-be-datalayout.s b/llvm/test/MC/AArch64/arm64-be-datalayout.s index a5b48f1c594..67dd6fb1e57 100644 --- a/llvm/test/MC/AArch64/arm64-be-datalayout.s +++ b/llvm/test/MC/AArch64/arm64-be-datalayout.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple aarch64_be %s | llvm-readobj -section-data -sections | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple aarch64_be %s | llvm-readobj --section-data -S | FileCheck %s // CHECK: 0000: 00123456 789ABCDE foo: .xword 0x123456789abcde diff --git a/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s b/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s index 1619a50f6b0..7cbab059453 100644 --- a/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s +++ b/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple=arm64-apple-ios -filetype=obj < %s | \ -// RUN: llvm-readobj --expand-relocs -sections -section-relocations -section-data | \ +// RUN: llvm-readobj --expand-relocs -S --section-relocations --section-data | \ // RUN: FileCheck %s // // rdar://13070556 diff --git a/llvm/test/MC/AArch64/coff-align.s b/llvm/test/MC/AArch64/coff-align.s index b649804eb8f..b76bd73a629 100644 --- a/llvm/test/MC/AArch64/coff-align.s +++ b/llvm/test/MC/AArch64/coff-align.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple aarch64-windows-gnu %s | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple aarch64-windows-gnu %s | llvm-readobj -S --sd | FileCheck %s .text .align 5 f0: diff --git a/llvm/test/MC/AArch64/coff-debug.ll b/llvm/test/MC/AArch64/coff-debug.ll index 53f8b428e74..f336ea26da8 100644 --- a/llvm/test/MC/AArch64/coff-debug.ll +++ b/llvm/test/MC/AArch64/coff-debug.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=aarch64-windows -filetype=obj -o - %s | \ -; RUN: llvm-readobj -codeview - | FileCheck %s +; RUN: llvm-readobj --codeview - | FileCheck %s ; ModuleID = 'a.c' source_filename = "a.c" diff --git a/llvm/test/MC/AArch64/cold.s b/llvm/test/MC/AArch64/cold.s index 44cb52fd794..812d7725454 100644 --- a/llvm/test/MC/AArch64/cold.s +++ b/llvm/test/MC/AArch64/cold.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple aarch64-apple-ios -o - -filetype=obj %s | \ -// RUN: llvm-readobj -symbols | FileCheck %s -check-prefix=READOBJ +// RUN: llvm-readobj --symbols | FileCheck %s -check-prefix=READOBJ // READOBJ-LABEL: Name: cold_func // READOBJ-NEXT: Type: Section diff --git a/llvm/test/MC/AArch64/inst-directive.s b/llvm/test/MC/AArch64/inst-directive.s index 1a44fd18620..e4ccf788b0e 100644 --- a/llvm/test/MC/AArch64/inst-directive.s +++ b/llvm/test/MC/AArch64/inst-directive.s @@ -1,13 +1,13 @@ // RUN: llvm-mc %s -triple=aarch64-none-linux-gnu -filetype=asm -o - \ // RUN: | FileCheck %s --check-prefix=CHECK-ASM // RUN: llvm-mc %s -triple=aarch64-none-linux-gnu -filetype=obj -o %t -// RUN: llvm-readobj -s -sd %t | FileCheck %s --check-prefix=CHECK-OBJ +// RUN: llvm-readobj -S --sd %t | FileCheck %s --check-prefix=CHECK-OBJ // RUN: llvm-objdump -t %t | FileCheck %s --check-prefix=CHECK-SYMS // RUN: llvm-mc %s -triple=aarch64_be-none-linux-gnu -filetype=asm -o - \ // RUN: | FileCheck %s --check-prefix=CHECK-ASM // RUN: llvm-mc %s -triple=aarch64_be-none-linux-gnu -filetype=obj -o %t -// RUN: llvm-readobj -s -sd %t | FileCheck %s --check-prefix=CHECK-OBJ +// RUN: llvm-readobj -S --sd %t | FileCheck %s --check-prefix=CHECK-OBJ // RUN: llvm-objdump -t %t | FileCheck %s --check-prefix=CHECK-SYMS .section .inst.aarch64_inst diff --git a/llvm/test/MC/AArch64/seh.s b/llvm/test/MC/AArch64/seh.s index ca862cb4e54..d4acc4fddb9 100644 --- a/llvm/test/MC/AArch64/seh.s +++ b/llvm/test/MC/AArch64/seh.s @@ -1,6 +1,6 @@ // This test checks that the SEH directives emit the correct unwind data. -// RUN: llvm-mc -triple aarch64-pc-win32 -filetype=obj %s | llvm-readobj -s -r | FileCheck %s +// RUN: llvm-mc -triple aarch64-pc-win32 -filetype=obj %s | llvm-readobj -S -r | FileCheck %s // CHECK: Sections [ // CHECK: Section { diff --git a/llvm/test/MC/AMDGPU/hsa-exp.s b/llvm/test/MC/AMDGPU/hsa-exp.s index 8900a0638c9..cb7c0be8b02 100644 --- a/llvm/test/MC/AMDGPU/hsa-exp.s +++ b/llvm/test/MC/AMDGPU/hsa-exp.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF // ELF: Section { // ELF: Name: .text diff --git a/llvm/test/MC/AMDGPU/hsa-text.s b/llvm/test/MC/AMDGPU/hsa-text.s index f4463fc5936..d4f67d03347 100644 --- a/llvm/test/MC/AMDGPU/hsa-text.s +++ b/llvm/test/MC/AMDGPU/hsa-text.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF // For compatibility reasons we treat convert .text sections to .hsatext diff --git a/llvm/test/MC/AMDGPU/hsa-v3.s b/llvm/test/MC/AMDGPU/hsa-v3.s index 41d62c2b828..1eb8f5edd9d 100644 --- a/llvm/test/MC/AMDGPU/hsa-v3.s +++ b/llvm/test/MC/AMDGPU/hsa-v3.s @@ -1,6 +1,6 @@ // RUN: llvm-mc -mattr=+code-object-v3 -triple amdgcn-amd-amdhsa -mcpu=gfx904 -mattr=+xnack < %s | FileCheck --check-prefix=ASM %s // RUN: llvm-mc -mattr=+code-object-v3 -triple amdgcn-amd-amdhsa -mcpu=gfx904 -mattr=+xnack -filetype=obj < %s > %t -// RUN: llvm-readobj -elf-output-style=GNU -sections -symbols -relocations %t | FileCheck --check-prefix=READOBJ %s +// RUN: llvm-readelf -sections -symbols -relocations %t | FileCheck --check-prefix=READOBJ %s // RUN: llvm-objdump -s -j .rodata %t | FileCheck --check-prefix=OBJDUMP %s // big endian not supported diff --git a/llvm/test/MC/AMDGPU/hsa.s b/llvm/test/MC/AMDGPU/hsa.s index 0521c10e1a8..9eda20da063 100644 --- a/llvm/test/MC/AMDGPU/hsa.s +++ b/llvm/test/MC/AMDGPU/hsa.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF // ELF: Section { // ELF: Name: .text diff --git a/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s b/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s index 950f32cd19a..b84727cf1da 100644 --- a/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s +++ b/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s @@ -1,9 +1,9 @@ // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM --check-prefix=ASM_700 // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM --check-prefix=ASM_803 // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=stoney -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM --check-prefix=ASM_810 -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_700 -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_803 -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=stoney -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_810 +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_700 +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_803 +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=stoney -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_810 // ELF: SHT_NOTE // ELF: 0000: 04000000 08000000 01000000 414D4400 diff --git a/llvm/test/MC/AMDGPU/pal-msgpack.s b/llvm/test/MC/AMDGPU/pal-msgpack.s index 52a967c8005..a5599f3a494 100644 --- a/llvm/test/MC/AMDGPU/pal-msgpack.s +++ b/llvm/test/MC/AMDGPU/pal-msgpack.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | FileCheck %s --check-prefix=ASM -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF .amdgpu_pal_metadata --- diff --git a/llvm/test/MC/AMDGPU/pal.s b/llvm/test/MC/AMDGPU/pal.s index 45ace4e549a..913738727af 100644 --- a/llvm/test/MC/AMDGPU/pal.s +++ b/llvm/test/MC/AMDGPU/pal.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | FileCheck %s --check-prefix=ASM -// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF +// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF .amd_amdgpu_pal_metadata 0x12345678, 0xfedcba98, 0x2468ace0, 0xfdb97531 // ASM: .amd_amdgpu_pal_metadata 0x12345678,0xfedcba98,0x2468ace0,0xfdb97531 diff --git a/llvm/test/MC/AMDGPU/reloc.s b/llvm/test/MC/AMDGPU/reloc.s index 0a349da49a3..593536f623c 100644 --- a/llvm/test/MC/AMDGPU/reloc.s +++ b/llvm/test/MC/AMDGPU/reloc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple amdgcn-- -mcpu=kaveri -show-encoding %s | llvm-readobj -relocations | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple amdgcn-- -mcpu=kaveri -show-encoding %s | llvm-readobj -r | FileCheck %s // CHECK: Relocations [ // CHECK: .rel.text { diff --git a/llvm/test/MC/ARM/2010-11-30-reloc-movt.s b/llvm/test/MC/ARM/2010-11-30-reloc-movt.s index 9f0553af182..a83465edc02 100644 --- a/llvm/test/MC/ARM/2010-11-30-reloc-movt.s +++ b/llvm/test/MC/ARM/2010-11-30-reloc-movt.s @@ -1,5 +1,5 @@ // RUN: llvm-mc %s -triple=armv7-linux-gnueabi -filetype=obj -o - | \ -// RUN: llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-readobj -S --sr --sd | FileCheck %s .syntax unified .eabi_attribute 6, 10 diff --git a/llvm/test/MC/ARM/CheckDataSymbol.s b/llvm/test/MC/ARM/CheckDataSymbol.s index 67930cc77b5..9fb2d018339 100644 --- a/llvm/test/MC/ARM/CheckDataSymbol.s +++ b/llvm/test/MC/ARM/CheckDataSymbol.s @@ -1,6 +1,6 @@ # RUN: llvm-mc -filetype=obj -assemble \ # RUN: -triple=arm-arm-none-eabi -mcpu=cortex-a9 %s -o - \ -# RUN: | llvm-readobj -s -t - | FileCheck %s +# RUN: | llvm-readobj -S -t - | FileCheck %s # CHECK: Name: $d.1 ({{[1-9][0-9]+}}) # CHECK-NEXT: Value: 0x4 # CHECK-NEXT: Size: 0 diff --git a/llvm/test/MC/ARM/Windows/multiple-text-sections.s b/llvm/test/MC/ARM/Windows/multiple-text-sections.s index 241eee4bcad..6359f9cf254 100644 --- a/llvm/test/MC/ARM/Windows/multiple-text-sections.s +++ b/llvm/test/MC/ARM/Windows/multiple-text-sections.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \ -@ RUN: | llvm-readobj -s - | FileCheck %s +@ RUN: | llvm-readobj -S - | FileCheck %s .syntax unified .text diff --git a/llvm/test/MC/ARM/Windows/text-attributes.s b/llvm/test/MC/ARM/Windows/text-attributes.s index 62aa028789f..ea5ee8e95e0 100644 --- a/llvm/test/MC/ARM/Windows/text-attributes.s +++ b/llvm/test/MC/ARM/Windows/text-attributes.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \ -@ RUN: | llvm-readobj -s - | FileCheck %s +@ RUN: | llvm-readobj -S - | FileCheck %s .syntax unified .thumb diff --git a/llvm/test/MC/ARM/Windows/thumb-attributes.s b/llvm/test/MC/ARM/Windows/thumb-attributes.s index 6396862f00a..5b589a3a669 100644 --- a/llvm/test/MC/ARM/Windows/thumb-attributes.s +++ b/llvm/test/MC/ARM/Windows/thumb-attributes.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \ -@ RUN: | llvm-readobj -s - | FileCheck %s +@ RUN: | llvm-readobj -S - | FileCheck %s .syntax unified .thumb diff --git a/llvm/test/MC/ARM/coff-file.s b/llvm/test/MC/ARM/coff-file.s index d3f26f4c8f7..9caf0d4bcac 100644 --- a/llvm/test/MC/ARM/coff-file.s +++ b/llvm/test/MC/ARM/coff-file.s @@ -2,7 +2,7 @@ // RUN: | FileCheck %s // RUN: llvm-mc -triple thumbv7-windows -filetype obj %s -o - \ -// RUN: | llvm-readobj -symbols | FileCheck %s -check-prefix CHECK-SCN +// RUN: | llvm-readobj --symbols | FileCheck %s -check-prefix CHECK-SCN .file "null-padded.asm" // CHECK: (nx 1) {{0x[0-9]+}} .file diff --git a/llvm/test/MC/ARM/directive-arch-armv2.s b/llvm/test/MC/ARM/directive-arch-armv2.s index f6dc20c0a36..ceec7cfeda9 100644 --- a/llvm/test/MC/ARM/directive-arch-armv2.s +++ b/llvm/test/MC/ARM/directive-arch-armv2.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv2 diff --git a/llvm/test/MC/ARM/directive-arch-armv2a.s b/llvm/test/MC/ARM/directive-arch-armv2a.s index bb0a693dc84..c07718e2edb 100644 --- a/llvm/test/MC/ARM/directive-arch-armv2a.s +++ b/llvm/test/MC/ARM/directive-arch-armv2a.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv2a diff --git a/llvm/test/MC/ARM/directive-arch-armv3.s b/llvm/test/MC/ARM/directive-arch-armv3.s index aeec638eac8..ad773c9cfaf 100644 --- a/llvm/test/MC/ARM/directive-arch-armv3.s +++ b/llvm/test/MC/ARM/directive-arch-armv3.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv3 diff --git a/llvm/test/MC/ARM/directive-arch-armv3m.s b/llvm/test/MC/ARM/directive-arch-armv3m.s index fda8db52e7b..be587827749 100644 --- a/llvm/test/MC/ARM/directive-arch-armv3m.s +++ b/llvm/test/MC/ARM/directive-arch-armv3m.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv3m diff --git a/llvm/test/MC/ARM/directive-arch-armv4.s b/llvm/test/MC/ARM/directive-arch-armv4.s index fb838428403..78e97e7aee4 100644 --- a/llvm/test/MC/ARM/directive-arch-armv4.s +++ b/llvm/test/MC/ARM/directive-arch-armv4.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv4 diff --git a/llvm/test/MC/ARM/directive-arch-armv4t.s b/llvm/test/MC/ARM/directive-arch-armv4t.s index 33a5ae38575..11f06ef2025 100644 --- a/llvm/test/MC/ARM/directive-arch-armv4t.s +++ b/llvm/test/MC/ARM/directive-arch-armv4t.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv4t diff --git a/llvm/test/MC/ARM/directive-arch-armv5.s b/llvm/test/MC/ARM/directive-arch-armv5.s index 73a8c95db79..a3cbaa93b95 100644 --- a/llvm/test/MC/ARM/directive-arch-armv5.s +++ b/llvm/test/MC/ARM/directive-arch-armv5.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv5 diff --git a/llvm/test/MC/ARM/directive-arch-armv5t.s b/llvm/test/MC/ARM/directive-arch-armv5t.s index 66a75c4c89e..fc1370f98cd 100644 --- a/llvm/test/MC/ARM/directive-arch-armv5t.s +++ b/llvm/test/MC/ARM/directive-arch-armv5t.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv5t diff --git a/llvm/test/MC/ARM/directive-arch-armv5te.s b/llvm/test/MC/ARM/directive-arch-armv5te.s index f3932d84a56..42229206087 100644 --- a/llvm/test/MC/ARM/directive-arch-armv5te.s +++ b/llvm/test/MC/ARM/directive-arch-armv5te.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv5te diff --git a/llvm/test/MC/ARM/directive-arch-armv6-m.s b/llvm/test/MC/ARM/directive-arch-armv6-m.s index d89a627740b..bc33f330eae 100644 --- a/llvm/test/MC/ARM/directive-arch-armv6-m.s +++ b/llvm/test/MC/ARM/directive-arch-armv6-m.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv6-m diff --git a/llvm/test/MC/ARM/directive-arch-armv6.s b/llvm/test/MC/ARM/directive-arch-armv6.s index fb489207355..04a963edaaa 100644 --- a/llvm/test/MC/ARM/directive-arch-armv6.s +++ b/llvm/test/MC/ARM/directive-arch-armv6.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv6 diff --git a/llvm/test/MC/ARM/directive-arch-armv6k.s b/llvm/test/MC/ARM/directive-arch-armv6k.s index ee433fa283e..1af24942e13 100644 --- a/llvm/test/MC/ARM/directive-arch-armv6k.s +++ b/llvm/test/MC/ARM/directive-arch-armv6k.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv6k diff --git a/llvm/test/MC/ARM/directive-arch-armv6t2.s b/llvm/test/MC/ARM/directive-arch-armv6t2.s index 85f4491b0c6..dd9905cf1b8 100644 --- a/llvm/test/MC/ARM/directive-arch-armv6t2.s +++ b/llvm/test/MC/ARM/directive-arch-armv6t2.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv6t2 diff --git a/llvm/test/MC/ARM/directive-arch-armv6z.s b/llvm/test/MC/ARM/directive-arch-armv6z.s index efb8f8bfe9d..509040f4578 100644 --- a/llvm/test/MC/ARM/directive-arch-armv6z.s +++ b/llvm/test/MC/ARM/directive-arch-armv6z.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv6z diff --git a/llvm/test/MC/ARM/directive-arch-armv7-a.s b/llvm/test/MC/ARM/directive-arch-armv7-a.s index 792429a4e04..6c1f8fcafd6 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7-a.s +++ b/llvm/test/MC/ARM/directive-arch-armv7-a.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7-a diff --git a/llvm/test/MC/ARM/directive-arch-armv7-m.s b/llvm/test/MC/ARM/directive-arch-armv7-m.s index 058f23ba2be..ac41bab5ca0 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7-m.s +++ b/llvm/test/MC/ARM/directive-arch-armv7-m.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7-m diff --git a/llvm/test/MC/ARM/directive-arch-armv7-r.s b/llvm/test/MC/ARM/directive-arch-armv7-r.s index 99481f70c5f..a7b57542610 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7-r.s +++ b/llvm/test/MC/ARM/directive-arch-armv7-r.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7-r diff --git a/llvm/test/MC/ARM/directive-arch-armv7.s b/llvm/test/MC/ARM/directive-arch-armv7.s index 0cd499666ea..104c7fec548 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7.s +++ b/llvm/test/MC/ARM/directive-arch-armv7.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7 diff --git a/llvm/test/MC/ARM/directive-arch-armv7a.s b/llvm/test/MC/ARM/directive-arch-armv7a.s index 3bb202fb278..9189dedcbb5 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7a.s +++ b/llvm/test/MC/ARM/directive-arch-armv7a.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7a diff --git a/llvm/test/MC/ARM/directive-arch-armv7e-m.s b/llvm/test/MC/ARM/directive-arch-armv7e-m.s index f7c5d67b8fe..bebf2dcda65 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7e-m.s +++ b/llvm/test/MC/ARM/directive-arch-armv7e-m.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7e-m diff --git a/llvm/test/MC/ARM/directive-arch-armv7em.s b/llvm/test/MC/ARM/directive-arch-armv7em.s index f37398106de..ac6d1cc59df 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7em.s +++ b/llvm/test/MC/ARM/directive-arch-armv7em.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7em diff --git a/llvm/test/MC/ARM/directive-arch-armv7m.s b/llvm/test/MC/ARM/directive-arch-armv7m.s index 0e9f546387b..aafb3ee31e8 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7m.s +++ b/llvm/test/MC/ARM/directive-arch-armv7m.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7m diff --git a/llvm/test/MC/ARM/directive-arch-armv7r.s b/llvm/test/MC/ARM/directive-arch-armv7r.s index 9009d134128..d99b5da5074 100644 --- a/llvm/test/MC/ARM/directive-arch-armv7r.s +++ b/llvm/test/MC/ARM/directive-arch-armv7r.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv7r diff --git a/llvm/test/MC/ARM/directive-arch-armv8-a.s b/llvm/test/MC/ARM/directive-arch-armv8-a.s index 636378155e7..1b5152a4fd4 100644 --- a/llvm/test/MC/ARM/directive-arch-armv8-a.s +++ b/llvm/test/MC/ARM/directive-arch-armv8-a.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv8-a diff --git a/llvm/test/MC/ARM/directive-arch-armv8.2-a.s b/llvm/test/MC/ARM/directive-arch-armv8.2-a.s index c9f4469fb0a..1118b126171 100644 --- a/llvm/test/MC/ARM/directive-arch-armv8.2-a.s +++ b/llvm/test/MC/ARM/directive-arch-armv8.2-a.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv8.2-a diff --git a/llvm/test/MC/ARM/directive-arch-armv8a.s b/llvm/test/MC/ARM/directive-arch-armv8a.s index 4a1915c5343..0226231afc9 100644 --- a/llvm/test/MC/ARM/directive-arch-armv8a.s +++ b/llvm/test/MC/ARM/directive-arch-armv8a.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch armv8a diff --git a/llvm/test/MC/ARM/directive-arch-iwmmxt.s b/llvm/test/MC/ARM/directive-arch-iwmmxt.s index c54846dbcc2..2a15bbe537c 100644 --- a/llvm/test/MC/ARM/directive-arch-iwmmxt.s +++ b/llvm/test/MC/ARM/directive-arch-iwmmxt.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch iwmmxt diff --git a/llvm/test/MC/ARM/directive-arch-iwmmxt2.s b/llvm/test/MC/ARM/directive-arch-iwmmxt2.s index a4e59b5ba27..dec5abad8b7 100644 --- a/llvm/test/MC/ARM/directive-arch-iwmmxt2.s +++ b/llvm/test/MC/ARM/directive-arch-iwmmxt2.s @@ -6,7 +6,7 @@ @ RUN: llvm-mc -triple arm-eabi -filetype asm %s \ @ RUN: | FileCheck %s -check-prefix CHECK-ASM @ RUN: llvm-mc -triple arm-eabi -filetype obj %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .arch iwmmxt2 diff --git a/llvm/test/MC/ARM/directive-cpu.s b/llvm/test/MC/ARM/directive-cpu.s index d81a03e5e29..8c95d7b3d86 100644 --- a/llvm/test/MC/ARM/directive-cpu.s +++ b/llvm/test/MC/ARM/directive-cpu.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s +@ RUN: | llvm-readobj -S --sd | FileCheck %s @ CHECK: Name: .ARM.attribute @ CHECK: SectionData ( diff --git a/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s b/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s index e2c50997275..b659cd2c285 100644 --- a/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s +++ b/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR .syntax unified .thumb diff --git a/llvm/test/MC/ARM/directive-eabi_attribute.s b/llvm/test/MC/ARM/directive-eabi_attribute.s index e848f774b34..c25b0ae152a 100644 --- a/llvm/test/MC/ARM/directive-eabi_attribute.s +++ b/llvm/test/MC/ARM/directive-eabi_attribute.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s --check-prefix=CHECK-OBJ .syntax unified .thumb diff --git a/llvm/test/MC/ARM/directive-even.s b/llvm/test/MC/ARM/directive-even.s index b92c9f95f5d..e8152e5d20d 100644 --- a/llvm/test/MC/ARM/directive-even.s +++ b/llvm/test/MC/ARM/directive-even.s @@ -1,4 +1,4 @@ -@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -s -sd \ +@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -S --sd \ @ RUN: | FileCheck %s .syntax unified diff --git a/llvm/test/MC/ARM/directive-fpu-multiple.s b/llvm/test/MC/ARM/directive-fpu-multiple.s index 50389a11532..eaa5af97f7a 100644 --- a/llvm/test/MC/ARM/directive-fpu-multiple.s +++ b/llvm/test/MC/ARM/directive-fpu-multiple.s @@ -3,7 +3,7 @@ @ The later .fpu directive should overwrite the earlier one. @ We also check here that all the .fpu directives that we expect to work do work -@ RUN: llvm-mc -triple arm-eabi -filetype obj %s | llvm-readobj -arm-attributes \ +@ RUN: llvm-mc -triple arm-eabi -filetype obj %s | llvm-readobj --arm-attributes \ @ RUN: | FileCheck %s -check-prefix CHECK-ATTR .fpu none diff --git a/llvm/test/MC/ARM/directive-fpu.s b/llvm/test/MC/ARM/directive-fpu.s index 24e159c74fc..f7fea24edcb 100644 --- a/llvm/test/MC/ARM/directive-fpu.s +++ b/llvm/test/MC/ARM/directive-fpu.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s +@ RUN: | llvm-readobj -S --sd | FileCheck %s @ CHECK: Name: .ARM.attribute @ CHECK: SectionData ( diff --git a/llvm/test/MC/ARM/directive-object_arch-2.s b/llvm/test/MC/ARM/directive-object_arch-2.s index f0596f12385..9f661182ffc 100644 --- a/llvm/test/MC/ARM/directive-object_arch-2.s +++ b/llvm/test/MC/ARM/directive-object_arch-2.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s .syntax unified diff --git a/llvm/test/MC/ARM/directive-object_arch.s b/llvm/test/MC/ARM/directive-object_arch.s index c211a3bb57e..3b099408555 100644 --- a/llvm/test/MC/ARM/directive-object_arch.s +++ b/llvm/test/MC/ARM/directive-object_arch.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes | FileCheck %s +@ RUN: | llvm-readobj --arm-attributes | FileCheck %s .syntax unified diff --git a/llvm/test/MC/ARM/eh-compact-pr0.s b/llvm/test/MC/ARM/eh-compact-pr0.s index 66fd4a4efed..c018c94bf4d 100644 --- a/llvm/test/MC/ARM/eh-compact-pr0.s +++ b/llvm/test/MC/ARM/eh-compact-pr0.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr > %t +@ RUN: | llvm-readobj -S --sd --sr > %t @ RUN: FileCheck %s < %t @ RUN: FileCheck --check-prefix=RELOC %s < %t diff --git a/llvm/test/MC/ARM/eh-compact-pr1.s b/llvm/test/MC/ARM/eh-compact-pr1.s index 9f40593cf43..d404a4f351b 100644 --- a/llvm/test/MC/ARM/eh-compact-pr1.s +++ b/llvm/test/MC/ARM/eh-compact-pr1.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s +@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s @ Check the compact pr1 model diff --git a/llvm/test/MC/ARM/eh-directive-cantunwind.s b/llvm/test/MC/ARM/eh-directive-cantunwind.s index 499c2c44dfc..60cbd852f6d 100644 --- a/llvm/test/MC/ARM/eh-directive-cantunwind.s +++ b/llvm/test/MC/ARM/eh-directive-cantunwind.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s +@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s @ Check the .cantunwind directive diff --git a/llvm/test/MC/ARM/eh-directive-handlerdata.s b/llvm/test/MC/ARM/eh-directive-handlerdata.s index c4352e5dee5..ce87b4b2d14 100644 --- a/llvm/test/MC/ARM/eh-directive-handlerdata.s +++ b/llvm/test/MC/ARM/eh-directive-handlerdata.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr > %t +@ RUN: | llvm-readobj -S --sd --sr > %t @ RUN: FileCheck %s < %t @ RUN: FileCheck --check-prefix=RELOC %s < %t diff --git a/llvm/test/MC/ARM/eh-directive-integrated-test.s b/llvm/test/MC/ARM/eh-directive-integrated-test.s index df2b290fec9..d69d43a2625 100644 --- a/llvm/test/MC/ARM/eh-directive-integrated-test.s +++ b/llvm/test/MC/ARM/eh-directive-integrated-test.s @@ -20,7 +20,7 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s +@ RUN: | llvm-readobj -S --sd | FileCheck %s @------------------------------------------------------------------------------- diff --git a/llvm/test/MC/ARM/eh-directive-movsp.s b/llvm/test/MC/ARM/eh-directive-movsp.s index 620f5b769d4..bbb9e2cfeb2 100644 --- a/llvm/test/MC/ARM/eh-directive-movsp.s +++ b/llvm/test/MC/ARM/eh-directive-movsp.s @@ -1,4 +1,4 @@ -@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -s -sd \ +@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -S --sd \ @ RUN: | FileCheck %s .syntax unified diff --git a/llvm/test/MC/ARM/eh-directive-multiple-offsets.s b/llvm/test/MC/ARM/eh-directive-multiple-offsets.s index 6e81f41665a..25c40f94207 100644 --- a/llvm/test/MC/ARM/eh-directive-multiple-offsets.s +++ b/llvm/test/MC/ARM/eh-directive-multiple-offsets.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s +@ RUN: | llvm-readobj -S --sd | FileCheck %s @ Check for different combination of .setfp, .pad, .save and .vsave. diff --git a/llvm/test/MC/ARM/eh-directive-pad.s b/llvm/test/MC/ARM/eh-directive-pad.s index f8263e6621f..ef6c34e8d18 100644 --- a/llvm/test/MC/ARM/eh-directive-pad.s +++ b/llvm/test/MC/ARM/eh-directive-pad.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s +@ RUN: | llvm-readobj -S --sd | FileCheck %s @ Check for different stack pointer offsets. diff --git a/llvm/test/MC/ARM/eh-directive-personality.s b/llvm/test/MC/ARM/eh-directive-personality.s index 84e62bdfd68..826c10d696a 100644 --- a/llvm/test/MC/ARM/eh-directive-personality.s +++ b/llvm/test/MC/ARM/eh-directive-personality.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr > %t +@ RUN: | llvm-readobj -S --sd --sr > %t @ RUN: FileCheck %s < %t @ RUN: FileCheck --check-prefix=RELOC %s < %t diff --git a/llvm/test/MC/ARM/eh-directive-personalityindex.s b/llvm/test/MC/ARM/eh-directive-personalityindex.s index 5d537bb04d3..36c0ac3882f 100644 --- a/llvm/test/MC/ARM/eh-directive-personalityindex.s +++ b/llvm/test/MC/ARM/eh-directive-personalityindex.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv7-linux-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -s -sd -sr > %t +@ RUN: | llvm-readobj -S --sd --sr > %t @ RUN: FileCheck %s < %t @ RUN: FileCheck --check-prefix=RELOC %s < %t diff --git a/llvm/test/MC/ARM/eh-directive-save.s b/llvm/test/MC/ARM/eh-directive-save.s index 652a7bb56c5..539d73d57a2 100644 --- a/llvm/test/MC/ARM/eh-directive-save.s +++ b/llvm/test/MC/ARM/eh-directive-save.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s +@ RUN: | llvm-readobj -S --sd | FileCheck %s @ Check the .save directive diff --git a/llvm/test/MC/ARM/eh-directive-section-comdat.s b/llvm/test/MC/ARM/eh-directive-section-comdat.s index 8b7f32eaece..2ab5d8ccc9e 100644 --- a/llvm/test/MC/ARM/eh-directive-section-comdat.s +++ b/llvm/test/MC/ARM/eh-directive-section-comdat.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr -t | FileCheck %s +@ RUN: | llvm-readobj -S --sd --sr -t | FileCheck %s @ Check the .group section for the function in comdat section. diff --git a/llvm/test/MC/ARM/eh-directive-section-multiple-func.s b/llvm/test/MC/ARM/eh-directive-section-multiple-func.s index 53c498ab87b..a75f9fe7bad 100644 --- a/llvm/test/MC/ARM/eh-directive-section-multiple-func.s +++ b/llvm/test/MC/ARM/eh-directive-section-multiple-func.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr -t > %t +@ RUN: | llvm-readobj -S --sd --sr -t > %t @ RUN: FileCheck %s < %t @ RUN: FileCheck --check-prefix=RELOC %s < %t diff --git a/llvm/test/MC/ARM/eh-directive-section.s b/llvm/test/MC/ARM/eh-directive-section.s index bd41fbe5eee..29d35662c9a 100644 --- a/llvm/test/MC/ARM/eh-directive-section.s +++ b/llvm/test/MC/ARM/eh-directive-section.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr -t > %t +@ RUN: | llvm-readobj -S --sd --sr -t > %t @ RUN: FileCheck %s < %t @ RUN: FileCheck --check-prefix=RELOC %s < %t diff --git a/llvm/test/MC/ARM/eh-directive-setfp.s b/llvm/test/MC/ARM/eh-directive-setfp.s index ce7fe10b43c..0d9d9e60076 100644 --- a/llvm/test/MC/ARM/eh-directive-setfp.s +++ b/llvm/test/MC/ARM/eh-directive-setfp.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s +@ RUN: | llvm-readobj -S --sd | FileCheck %s @ Check for .setfp directive. diff --git a/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s b/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s index 7ab401c5043..4111984d2f6 100644 --- a/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s +++ b/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr -r -t | FileCheck %s +@ RUN: | llvm-readobj -S --sd --sr -r -t | FileCheck %s @ Check whether the section is switched back or not. diff --git a/llvm/test/MC/ARM/eh-directive-text-section.s b/llvm/test/MC/ARM/eh-directive-text-section.s index 10ccdd54e50..b6658166365 100644 --- a/llvm/test/MC/ARM/eh-directive-text-section.s +++ b/llvm/test/MC/ARM/eh-directive-text-section.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s +@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s @ Check the .fnstart directive and the .fnend directive. diff --git a/llvm/test/MC/ARM/eh-directive-vsave.s b/llvm/test/MC/ARM/eh-directive-vsave.s index c9b78d7e276..1b792650866 100644 --- a/llvm/test/MC/ARM/eh-directive-vsave.s +++ b/llvm/test/MC/ARM/eh-directive-vsave.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s +@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s @ Check the .vsave directive diff --git a/llvm/test/MC/ARM/eh-link.s b/llvm/test/MC/ARM/eh-link.s index 19fe14db5f3..bae17d3e3c8 100644 --- a/llvm/test/MC/ARM/eh-link.s +++ b/llvm/test/MC/ARM/eh-link.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s | FileCheck %s +@ RUN: | llvm-readobj -S | FileCheck %s @ Test that the ARM_EXIDX sections point (Link) to the corresponding text @ sections. diff --git a/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s b/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s index 18c13d90332..3136ad98e85 100644 --- a/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s +++ b/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s @@ -1,5 +1,5 @@ // RUN: llvm-mc %s -triple=thumbv7-linux-gnueabi \ -// RUN: -filetype=obj -o - | llvm-readobj -s -sd -r -t | \ +// RUN: -filetype=obj -o - | llvm-readobj -S --sd -r -t | \ // RUN: FileCheck %s // We want to test relocatable thumb function call. diff --git a/llvm/test/MC/ARM/inst-directive.s b/llvm/test/MC/ARM/inst-directive.s index d3f2a36408c..290bd7d029e 100644 --- a/llvm/test/MC/ARM/inst-directive.s +++ b/llvm/test/MC/ARM/inst-directive.s @@ -1,8 +1,8 @@ @ RUN: llvm-mc %s -triple=armv7-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LE +@ RUN: | llvm-readobj -S --sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LE @ RUN: llvm-mc %s -triple=armebv7-linux-gnueabi -filetype=obj -o - \ -@ RUN: | llvm-readobj -s -sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE +@ RUN: | llvm-readobj -S --sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE .syntax unified diff --git a/llvm/test/MC/ARM/mappingsymbols.s b/llvm/test/MC/ARM/mappingsymbols.s index fff8e104781..3727e3ef7f2 100644 --- a/llvm/test/MC/ARM/mappingsymbols.s +++ b/llvm/test/MC/ARM/mappingsymbols.s @@ -1,40 +1,40 @@ # Check section containing code and data with permission executable for the section. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/1.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s # Check section containing code and data with no permissions for the section. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/2.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s # Check section containing code and data with read/write permissions for the section. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/3.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s # Check section containing data with no permissions for the section. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/4.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS # Check section containing only data with read/write permissions for the section. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/5.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS # Check section containing the ident string with no permissions for the section. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/ident.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS # Check section containing the attributes with no permissions for the section. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/attr.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS # Check section containing code and data with no permissions for the section. # data comes before code. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/6.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MIX +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MIX # Check section containing code and data with no permissions for the section. # data comes before code. @ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/7.s -@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s +@ RUN: llvm-readelf -symbols %t.o | FileCheck %s #CHECK: $a #CHECK: $d diff --git a/llvm/test/MC/AsmParser/section.s b/llvm/test/MC/AsmParser/section.s index 2ef545b822c..e46acee0f0a 100644 --- a/llvm/test/MC/AsmParser/section.s +++ b/llvm/test/MC/AsmParser/section.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple i386-pc-linux-gnu -filetype=obj -o %t %s -# RUN: llvm-readobj -s -sd < %t | FileCheck %s +# RUN: llvm-readobj -S --sd < %t | FileCheck %s .section test1 .byte 1 .section test2 diff --git a/llvm/test/MC/AsmParser/section_names.s b/llvm/test/MC/AsmParser/section_names.s index 38a5310099d..8d16c4fb307 100644 --- a/llvm/test/MC/AsmParser/section_names.s +++ b/llvm/test/MC/AsmParser/section_names.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple i386-pc-linux-gnu -filetype=obj -o %t %s -# RUN: llvm-readobj -s < %t | FileCheck %s +# RUN: llvm-readobj -S < %t | FileCheck %s .section .nobits .byte 1 .section .nobits2 diff --git a/llvm/test/MC/COFF/addrsig.s b/llvm/test/MC/COFF/addrsig.s index 815102ed88f..938c18f61bf 100644 --- a/llvm/test/MC/COFF/addrsig.s +++ b/llvm/test/MC/COFF/addrsig.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -s -t -sd -addrsig | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -S -t --sd --addrsig | FileCheck %s // CHECK: Name: .llvm_addrsig // CHECK-NEXT: VirtualSize: 0x0 diff --git a/llvm/test/MC/COFF/align-nops.s b/llvm/test/MC/COFF/align-nops.s index 6d23721ed77..e9610397492 100644 --- a/llvm/test/MC/COFF/align-nops.s +++ b/llvm/test/MC/COFF/align-nops.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 -mcpu=pentiumpro %s | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 -mcpu=pentiumpro %s | llvm-readobj -S --sd | FileCheck %s // Test that we get optimal nops in text .text diff --git a/llvm/test/MC/COFF/basic-coff-64.s b/llvm/test/MC/COFF/basic-coff-64.s index 5fe710fdba4..2457e139295 100644 --- a/llvm/test/MC/COFF/basic-coff-64.s +++ b/llvm/test/MC/COFF/basic-coff-64.s @@ -1,7 +1,7 @@ // This test checks that the COFF object emitter works for the most basic // programs. -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s .def _main; .scl 2; diff --git a/llvm/test/MC/COFF/basic-coff.s b/llvm/test/MC/COFF/basic-coff.s index 575a937c957..7ad61308d94 100644 --- a/llvm/test/MC/COFF/basic-coff.s +++ b/llvm/test/MC/COFF/basic-coff.s @@ -1,7 +1,7 @@ // This test checks that the COFF object emitter works for the most basic // programs. -// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s .def _main; .scl 2; diff --git a/llvm/test/MC/COFF/bss.s b/llvm/test/MC/COFF/bss.s index 17ae0daa1c3..d707703a4c4 100644 --- a/llvm/test/MC/COFF/bss.s +++ b/llvm/test/MC/COFF/bss.s @@ -1,7 +1,7 @@ // The purpose of this test is to verify that bss sections are emitted correctly. -// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s | FileCheck %s -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -S | FileCheck %s .bss .globl _g0 diff --git a/llvm/test/MC/COFF/comm-align.s b/llvm/test/MC/COFF/comm-align.s index ca6bfbea247..048d92e614f 100644 --- a/llvm/test/MC/COFF/comm-align.s +++ b/llvm/test/MC/COFF/comm-align.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple i686-windows-gnu -filetype obj -o - %s \ -# RUN: | llvm-readobj -coff-directives -symbols | FileCheck %s +# RUN: | llvm-readobj --coff-directives --symbols | FileCheck %s # NOTE: this test checks multiple things: # - that -aligncomm is not emitted for 1-byte alignment diff --git a/llvm/test/MC/COFF/cross-section-relative.s b/llvm/test/MC/COFF/cross-section-relative.s index a9b7e6dbd5d..c448575891d 100644 --- a/llvm/test/MC/COFF/cross-section-relative.s +++ b/llvm/test/MC/COFF/cross-section-relative.s @@ -1,5 +1,5 @@ // Verify the .fix data section conveys the right offsets and the right relocations -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -relocations -expand-relocs -sections -section-data | FileCheck %s --check-prefix=READOBJ +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -r --expand-relocs -S --section-data | FileCheck %s --check-prefix=READOBJ .text .section .rdata,"dr" diff --git a/llvm/test/MC/COFF/cv-def-range-gap.s b/llvm/test/MC/COFF/cv-def-range-gap.s index 2a1a179b430..877eaeef7e4 100644 --- a/llvm/test/MC/COFF/cv-def-range-gap.s +++ b/llvm/test/MC/COFF/cv-def-range-gap.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s +# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s # This tries to test defrange gap edge cases. diff --git a/llvm/test/MC/COFF/cv-def-range.s b/llvm/test/MC/COFF/cv-def-range.s index 7afdac23ea6..cbd62f3fe3b 100644 --- a/llvm/test/MC/COFF/cv-def-range.s +++ b/llvm/test/MC/COFF/cv-def-range.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview -codeview-subsection-bytes | FileCheck %s +# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview --codeview-subsection-bytes | FileCheck %s .text .def @feat.00; .scl 3; diff --git a/llvm/test/MC/COFF/cv-empty-file-table.s b/llvm/test/MC/COFF/cv-empty-file-table.s index 157cd3167d2..2cde1558346 100644 --- a/llvm/test/MC/COFF/cv-empty-file-table.s +++ b/llvm/test/MC/COFF/cv-empty-file-table.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj -codeview - | FileCheck %s +# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj --codeview - | FileCheck %s .text .section .debug$S,"dr" .p2align 2 diff --git a/llvm/test/MC/COFF/cv-empty-linetable.s b/llvm/test/MC/COFF/cv-empty-linetable.s index 865bc7556be..61ba57ad108 100644 --- a/llvm/test/MC/COFF/cv-empty-linetable.s +++ b/llvm/test/MC/COFF/cv-empty-linetable.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj -codeview - | FileCheck %s +# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj --codeview - | FileCheck %s .text .def @feat.00; .scl 3; diff --git a/llvm/test/MC/COFF/cv-fpo-csrs.s b/llvm/test/MC/COFF/cv-fpo-csrs.s index 4235958d66f..1741143ce14 100644 --- a/llvm/test/MC/COFF/cv-fpo-csrs.s +++ b/llvm/test/MC/COFF/cv-fpo-csrs.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=asm < %s -triple i686-windows-msvc | FileCheck %s --check-prefix=ASM -# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ .globl _foo _foo: diff --git a/llvm/test/MC/COFF/cv-fpo-realign.s b/llvm/test/MC/COFF/cv-fpo-realign.s index 247cad9334b..df94b133acd 100644 --- a/llvm/test/MC/COFF/cv-fpo-realign.s +++ b/llvm/test/MC/COFF/cv-fpo-realign.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=i686-windows-msvc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s +# RUN: llvm-mc -triple=i686-windows-msvc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s # Test for .cv_fpo_stackalign. We should generate FPO data that restores CSRs # at each instruction, and in the last FrameData we should use the '@' diff --git a/llvm/test/MC/COFF/cv-fpo-setframe.s b/llvm/test/MC/COFF/cv-fpo-setframe.s index 229a4e92320..217248210ce 100644 --- a/llvm/test/MC/COFF/cv-fpo-setframe.s +++ b/llvm/test/MC/COFF/cv-fpo-setframe.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=asm < %s -triple i686-windows-msvc | FileCheck %s --check-prefix=ASM -# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ +# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ .globl _foo _foo: diff --git a/llvm/test/MC/COFF/cv-inline-linetable-infloop.s b/llvm/test/MC/COFF/cv-inline-linetable-infloop.s index 6b8e708befc..3f5f1f53898 100644 --- a/llvm/test/MC/COFF/cv-inline-linetable-infloop.s +++ b/llvm/test/MC/COFF/cv-inline-linetable-infloop.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s +# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s # CHECK: InlineSiteSym { # CHECK: BinaryAnnotations [ diff --git a/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s b/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s index bfb745bd9bb..0ad3559beb7 100644 --- a/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s +++ b/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=x86_64-windows -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s +# RUN: llvm-mc -triple=x86_64-windows -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s # C source to generate the assembly: # volatile int unlikely_cond = 0; diff --git a/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s b/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s index ab184602c86..b76028e0abf 100644 --- a/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s +++ b/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s +# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s .text .def @feat.00; .scl 3; diff --git a/llvm/test/MC/COFF/cv-inline-linetable.s b/llvm/test/MC/COFF/cv-inline-linetable.s index c5e28c4d078..460c2e9ba2a 100644 --- a/llvm/test/MC/COFF/cv-inline-linetable.s +++ b/llvm/test/MC/COFF/cv-inline-linetable.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s +# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s .text .def @feat.00; .scl 3; diff --git a/llvm/test/MC/COFF/cv-loc-unreachable-2.s b/llvm/test/MC/COFF/cv-loc-unreachable-2.s index 15b3038001e..be96e82fa1b 100644 --- a/llvm/test/MC/COFF/cv-loc-unreachable-2.s +++ b/llvm/test/MC/COFF/cv-loc-unreachable-2.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s +# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s # Based on the other cv-loc-unreachable-2.s, but with other code in the same # section afterwards. We had negative label difference assertions when .cv_loc diff --git a/llvm/test/MC/COFF/cv-loc-unreachable.s b/llvm/test/MC/COFF/cv-loc-unreachable.s index de270690adb..945e519f506 100644 --- a/llvm/test/MC/COFF/cv-loc-unreachable.s +++ b/llvm/test/MC/COFF/cv-loc-unreachable.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s +# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s # Original source, slightly modified with an extra .cv_loc directive (at EXTRA # below) that was causing assertions: diff --git a/llvm/test/MC/COFF/cv-loc.s b/llvm/test/MC/COFF/cv-loc.s index 01d5d02b224..d2e1bba5232 100644 --- a/llvm/test/MC/COFF/cv-loc.s +++ b/llvm/test/MC/COFF/cv-loc.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc < %s -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s +# RUN: llvm-mc < %s -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s .section .debug$S .long 4 diff --git a/llvm/test/MC/COFF/cv-string.s b/llvm/test/MC/COFF/cv-string.s index b3b670c48e9..e9f2631a374 100644 --- a/llvm/test/MC/COFF/cv-string.s +++ b/llvm/test/MC/COFF/cv-string.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=i686-windows-msvc %s -filetype=obj -o %t.obj -# RUN: llvm-readobj -codeview %t.obj | FileCheck %s +# RUN: llvm-readobj --codeview %t.obj | FileCheck %s # The .cv_string directive mainly exists as a convenience for manually writing # FPO data in assembler. Test that we can write FPO data using this directive, diff --git a/llvm/test/MC/COFF/diff.s b/llvm/test/MC/COFF/diff.s index f89e4ed8901..2fb48ccc4ee 100644 --- a/llvm/test/MC/COFF/diff.s +++ b/llvm/test/MC/COFF/diff.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-mingw32 %s | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-mingw32 %s | llvm-readobj -S --sr --sd | FileCheck %s // COFF resolves differences between labels in the same section, unless that // label is declared with function type. diff --git a/llvm/test/MC/COFF/directive-section-characteristics.ll b/llvm/test/MC/COFF/directive-section-characteristics.ll index eed2dbf598e..d47103f22cc 100644 --- a/llvm/test/MC/COFF/directive-section-characteristics.ll +++ b/llvm/test/MC/COFF/directive-section-characteristics.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple i686-windows -filetype obj -o - %s | llvm-readobj -sections \ +; RUN: llc -mtriple i686-windows -filetype obj -o - %s | llvm-readobj --sections \ ; RUN: | FileCheck %s define dllexport void @function() { diff --git a/llvm/test/MC/COFF/early-dce.s b/llvm/test/MC/COFF/early-dce.s index ec1a9bda76f..19788390c20 100644 --- a/llvm/test/MC/COFF/early-dce.s +++ b/llvm/test/MC/COFF/early-dce.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple i686-windows -g -filetype obj -o - %s \ -# RUN: | llvm-readobj -s -t | FileCheck %s +# RUN: | llvm-readobj -S -t | FileCheck %s .section .rdata diff --git a/llvm/test/MC/COFF/eh-frame.s b/llvm/test/MC/COFF/eh-frame.s index 2c5ff202dc6..e51b4c04410 100644 --- a/llvm/test/MC/COFF/eh-frame.s +++ b/llvm/test/MC/COFF/eh-frame.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o - | llvm-readobj -S | FileCheck %s .def _main; .scl 2; diff --git a/llvm/test/MC/COFF/file.s b/llvm/test/MC/COFF/file.s index dbe3b024f6c..96a658c073b 100644 --- a/llvm/test/MC/COFF/file.s +++ b/llvm/test/MC/COFF/file.s @@ -7,7 +7,7 @@ // RUN: | FileCheck %s // RUN: llvm-mc -triple i686-windows -filetype obj %s -o - \ -// RUN: | llvm-readobj -symbols | FileCheck %s -check-prefix CHECK-SCN +// RUN: | llvm-readobj --symbols | FileCheck %s -check-prefix CHECK-SCN .file "null-padded.asm" // CHECK: (nx 1) {{0x[0-9]+}} .file diff --git a/llvm/test/MC/COFF/linkonce.s b/llvm/test/MC/COFF/linkonce.s index f2e350645bf..d490aa778ed 100644 --- a/llvm/test/MC/COFF/linkonce.s +++ b/llvm/test/MC/COFF/linkonce.s @@ -1,7 +1,7 @@ // Test section manipulation via .linkonce directive. // -// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s +// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s .section s1 .linkonce diff --git a/llvm/test/MC/COFF/module-asm.ll b/llvm/test/MC/COFF/module-asm.ll index bf14dc695b5..900694e0532 100644 --- a/llvm/test/MC/COFF/module-asm.ll +++ b/llvm/test/MC/COFF/module-asm.ll @@ -1,8 +1,8 @@ ; The purpose of this test is to verify that various module level assembly ; constructs work. -; RUN: llc -filetype=obj -mtriple i686-pc-win32 %s -o - | llvm-readobj -s -sd | FileCheck %s -; RUN: llc -filetype=obj -mtriple x86_64-pc-win32 %s -o - | llvm-readobj -s -sd | FileCheck %s +; RUN: llc -filetype=obj -mtriple i686-pc-win32 %s -o - | llvm-readobj -S --sd | FileCheck %s +; RUN: llc -filetype=obj -mtriple x86_64-pc-win32 %s -o - | llvm-readobj -S --sd | FileCheck %s module asm ".text" module asm "_foo:" diff --git a/llvm/test/MC/COFF/pr28462.s b/llvm/test/MC/COFF/pr28462.s index 271963d01c5..4289d7b2abb 100644 --- a/llvm/test/MC/COFF/pr28462.s +++ b/llvm/test/MC/COFF/pr28462.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-windows-msvc < %s | llvm-readobj -s --section-data | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-windows-msvc < %s | llvm-readobj -S --section-data | FileCheck %s .text .set var, 42 diff --git a/llvm/test/MC/COFF/secidx.s b/llvm/test/MC/COFF/secidx.s index 022804d8219..736cb8c80a8 100644 --- a/llvm/test/MC/COFF/secidx.s +++ b/llvm/test/MC/COFF/secidx.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s -sr | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S --sr | FileCheck %s // check that we produce the correct relocation for .secidx diff --git a/llvm/test/MC/COFF/secrel32-undef.s b/llvm/test/MC/COFF/secrel32-undef.s index 3a725ab8950..70db082b053 100644 --- a/llvm/test/MC/COFF/secrel32-undef.s +++ b/llvm/test/MC/COFF/secrel32-undef.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o %t.obj -# RUN: llvm-readobj -symbols -relocations %t.obj | FileCheck %s +# RUN: llvm-readobj --symbols -r %t.obj | FileCheck %s # Previously .secrel32 and .secidx relocations against undefined symbols # resulted in an error. That was a mistake. The linker is fully capable of diff --git a/llvm/test/MC/COFF/secrel32.s b/llvm/test/MC/COFF/secrel32.s index deadfe09e0e..d3d59f750f0 100644 --- a/llvm/test/MC/COFF/secrel32.s +++ b/llvm/test/MC/COFF/secrel32.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s -sr | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S --sr | FileCheck %s // check that we produce the correct relocation for .secrel32 diff --git a/llvm/test/MC/COFF/section-comdat.s b/llvm/test/MC/COFF/section-comdat.s index 923c23ab95a..d4681d5388f 100644 --- a/llvm/test/MC/COFF/section-comdat.s +++ b/llvm/test/MC/COFF/section-comdat.s @@ -1,5 +1,5 @@ -// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s +// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s .section assocSec, "dr", discard, "assocSym" .global assocSym diff --git a/llvm/test/MC/COFF/section-name-encoding.s b/llvm/test/MC/COFF/section-name-encoding.s index 73ab4bdb770..09dd02000c3 100644 --- a/llvm/test/MC/COFF/section-name-encoding.s +++ b/llvm/test/MC/COFF/section-name-encoding.s @@ -5,7 +5,7 @@ // (8, 999999]: base 10 string table index (/9999999) // (999999, 0xFFFFFFFF]: base 64 string table index (//AAAAAA) // -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s // Raw encoding diff --git a/llvm/test/MC/COFF/section.s b/llvm/test/MC/COFF/section.s index 409c6446cb4..b7b5422babd 100644 --- a/llvm/test/MC/COFF/section.s +++ b/llvm/test/MC/COFF/section.s @@ -1,5 +1,5 @@ -// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s .section .foo$bar; .long 1 .section .foo@bar; .long 1 diff --git a/llvm/test/MC/COFF/seh-align1.s b/llvm/test/MC/COFF/seh-align1.s index aafc6ede085..09ee7697c4f 100644 --- a/llvm/test/MC/COFF/seh-align1.s +++ b/llvm/test/MC/COFF/seh-align1.s @@ -1,6 +1,6 @@ // This test checks the alignment and padding of the unwind info. -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s // CHECK: Sections [ // CHECK: Section { diff --git a/llvm/test/MC/COFF/seh-align2.s b/llvm/test/MC/COFF/seh-align2.s index 5e6c49a720c..fab1c30d0e5 100644 --- a/llvm/test/MC/COFF/seh-align2.s +++ b/llvm/test/MC/COFF/seh-align2.s @@ -1,6 +1,6 @@ // This test checks the alignment and padding of the unwind info. -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s // CHECK: Sections [ // CHECK: Section { diff --git a/llvm/test/MC/COFF/seh-align3.s b/llvm/test/MC/COFF/seh-align3.s index 238b5de3564..34a2fe3aef7 100644 --- a/llvm/test/MC/COFF/seh-align3.s +++ b/llvm/test/MC/COFF/seh-align3.s @@ -1,6 +1,6 @@ // This test checks the alignment and padding of the unwind info. -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s // CHECK: Sections [ // CHECK: Section { diff --git a/llvm/test/MC/COFF/seh-linkonce.s b/llvm/test/MC/COFF/seh-linkonce.s index 3352d68b3cf..9cd37bb90d4 100644 --- a/llvm/test/MC/COFF/seh-linkonce.s +++ b/llvm/test/MC/COFF/seh-linkonce.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -sections -section-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj --sections --section-symbols | FileCheck %s .text .def weak_func; diff --git a/llvm/test/MC/COFF/seh-section-2.s b/llvm/test/MC/COFF/seh-section-2.s index 650c5b5105b..b9105829648 100644 --- a/llvm/test/MC/COFF/seh-section-2.s +++ b/llvm/test/MC/COFF/seh-section-2.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -symbols | FileCheck %s +# RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj --symbols | FileCheck %s # This assembly should make an object with two .text sections, two .xdata # sections, and two .pdata sections. diff --git a/llvm/test/MC/COFF/seh-section.s b/llvm/test/MC/COFF/seh-section.s index 711b3eaccef..7d3609d327a 100644 --- a/llvm/test/MC/COFF/seh-section.s +++ b/llvm/test/MC/COFF/seh-section.s @@ -1,6 +1,6 @@ // This test ensures functions in custom sections get unwind info emitted in a // distinct .xdata section. -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -S --sd | FileCheck %s // CHECK: Name: .xdata // CHECK-NEXT: VirtualSize diff --git a/llvm/test/MC/COFF/seh.s b/llvm/test/MC/COFF/seh.s index cd884b4fa00..959ac6413d3 100644 --- a/llvm/test/MC/COFF/seh.s +++ b/llvm/test/MC/COFF/seh.s @@ -1,6 +1,6 @@ // This test checks that the SEH directives emit the correct unwind data. -// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -u -r | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -u -r | FileCheck %s // CHECK: Sections [ // CHECK: Section { diff --git a/llvm/test/MC/COFF/simple-fixups.s b/llvm/test/MC/COFF/simple-fixups.s index c1556afb5c0..77dd47b3059 100644 --- a/llvm/test/MC/COFF/simple-fixups.s +++ b/llvm/test/MC/COFF/simple-fixups.s @@ -2,8 +2,8 @@ // references to functions. Failing to do so might cause pointer-to-function // equality to fail if /INCREMENTAL links are used. -// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple i686-pc-win32 %s | llvm-readobj -s | FileCheck %s -// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple x86_64-pc-win32 %s | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple i686-pc-win32 %s | llvm-readobj -S | FileCheck %s +// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple x86_64-pc-win32 %s | llvm-readobj -S | FileCheck %s .def _foo; .scl 2; diff --git a/llvm/test/MC/COFF/symbol-fragment-offset-64.s b/llvm/test/MC/COFF/symbol-fragment-offset-64.s index 94e7d07965b..0e86aaa0227 100644 --- a/llvm/test/MC/COFF/symbol-fragment-offset-64.s +++ b/llvm/test/MC/COFF/symbol-fragment-offset-64.s @@ -1,7 +1,7 @@ // The purpose of this test is to see if the COFF object writer is emitting the // proper relocations for multiple pieces of data in a single data fragment. -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s .def _main; .scl 2; diff --git a/llvm/test/MC/COFF/symbol-fragment-offset.s b/llvm/test/MC/COFF/symbol-fragment-offset.s index 5875bf47f92..2784768168e 100644 --- a/llvm/test/MC/COFF/symbol-fragment-offset.s +++ b/llvm/test/MC/COFF/symbol-fragment-offset.s @@ -1,7 +1,7 @@ // The purpose of this test is to see if the COFF object writer is emitting the // proper relocations for multiple pieces of data in a single data fragment. -// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s .def _main; .scl 2; diff --git a/llvm/test/MC/ELF/ARM/clang-section.s b/llvm/test/MC/ELF/ARM/clang-section.s index 0018cfe13d1..c536507faa8 100644 --- a/llvm/test/MC/ELF/ARM/clang-section.s +++ b/llvm/test/MC/ELF/ARM/clang-section.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple arm-eabi %s -o - | llvm-readobj -s -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple arm-eabi %s -o - | llvm-readobj -S -t | FileCheck %s // Test that global variables and functions are assigned correct section. .text .syntax unified diff --git a/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s b/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s index 26a9c499f89..575f1e4c5f4 100644 --- a/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s +++ b/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple thumbv7m-arm-linux-gnu %s -o - \ -// RUN: | llvm-readobj -s -t | FileCheck %s +// RUN: | llvm-readobj -S -t | FileCheck %s .text bx lr diff --git a/llvm/test/MC/ELF/ARM/execute-only-section.s b/llvm/test/MC/ELF/ARM/execute-only-section.s index 524ba8ac687..6f7e459c24b 100644 --- a/llvm/test/MC/ELF/ARM/execute-only-section.s +++ b/llvm/test/MC/ELF/ARM/execute-only-section.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple thumbv7m-arm-linux-gnu %s -o - \ -// RUN: | llvm-readobj -s -t | FileCheck %s +// RUN: | llvm-readobj -S -t | FileCheck %s .section .text,"axy",%progbits,unique,0 .globl foo diff --git a/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s b/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s index 3e9abca34a2..24086e2b13b 100644 --- a/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s +++ b/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple thumbv7m-arm-linux-gnu %s -o - \ -// RUN: | llvm-readobj -s -t | FileCheck %s +// RUN: | llvm-readobj -S -t | FileCheck %s .text .ascii "test" diff --git a/llvm/test/MC/ELF/addrsig.s b/llvm/test/MC/ELF/addrsig.s index 9e626c889f2..997ad0b3112 100644 --- a/llvm/test/MC/ELF/addrsig.s +++ b/llvm/test/MC/ELF/addrsig.s @@ -1,7 +1,7 @@ // RUN: llvm-mc -filetype=asm -triple x86_64-pc-linux-gnu %s -o - | FileCheck --check-prefix=ASM %s -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -sd -addrsig | FileCheck %s -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -split-dwarf-file %t.dwo -o - | llvm-readobj -s -t -sd -addrsig | FileCheck %s -// RUN: llvm-readobj -s %t.dwo | FileCheck --check-prefix=DWO %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t --sd --addrsig | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -split-dwarf-file %t.dwo -o - | llvm-readobj -S -t --sd --addrsig | FileCheck %s +// RUN: llvm-readobj -S %t.dwo | FileCheck --check-prefix=DWO %s // CHECK: Name: .llvm_addrsig // CHECK-NEXT: Type: SHT_LLVM_ADDRSIG (0x6FFF4C03) diff --git a/llvm/test/MC/ELF/align-bss.s b/llvm/test/MC/ELF/align-bss.s index 776eef38467..1a9191c34ef 100644 --- a/llvm/test/MC/ELF/align-bss.s +++ b/llvm/test/MC/ELF/align-bss.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test that the bss section is correctly aligned diff --git a/llvm/test/MC/ELF/align-nops.s b/llvm/test/MC/ELF/align-nops.s index 32da3dbd8e8..08e8660e4e8 100644 --- a/llvm/test/MC/ELF/align-nops.s +++ b/llvm/test/MC/ELF/align-nops.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -mcpu=pentiumpro %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -mcpu=pentiumpro %s -o - | llvm-readobj -S --sd | FileCheck %s // Test that we get optimal nops in text .text diff --git a/llvm/test/MC/ELF/align-size.s b/llvm/test/MC/ELF/align-size.s index 84a6e998148..2f5e74d1192 100644 --- a/llvm/test/MC/ELF/align-size.s +++ b/llvm/test/MC/ELF/align-size.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test that the alignment does contribute to the size of the section. diff --git a/llvm/test/MC/ELF/align-text.s b/llvm/test/MC/ELF/align-text.s index b00af4a34b0..278102e26e3 100644 --- a/llvm/test/MC/ELF/align-text.s +++ b/llvm/test/MC/ELF/align-text.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test that the .text directive doesn't cause alignment. diff --git a/llvm/test/MC/ELF/align.s b/llvm/test/MC/ELF/align.s index 7e78298540f..27c97980e9d 100644 --- a/llvm/test/MC/ELF/align.s +++ b/llvm/test/MC/ELF/align.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test that the alignment of rodata doesn't force a alignment of the // previous section (.text) diff --git a/llvm/test/MC/ELF/basic-elf-32.s b/llvm/test/MC/ELF/basic-elf-32.s index d4aab27d29c..4a2ac7a24b1 100644 --- a/llvm/test/MC/ELF/basic-elf-32.s +++ b/llvm/test/MC/ELF/basic-elf-32.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -h -s -r -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -h -S -r -t | FileCheck %s .text .globl main diff --git a/llvm/test/MC/ELF/basic-elf-64.s b/llvm/test/MC/ELF/basic-elf-64.s index ae0903ec8cd..dbe09ca0ce8 100644 --- a/llvm/test/MC/ELF/basic-elf-64.s +++ b/llvm/test/MC/ELF/basic-elf-64.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -h -s -r -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -h -S -r -t | FileCheck %s .text .globl main diff --git a/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s b/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s index 7177ccb3650..e935dcbefc4 100644 --- a/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s +++ b/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-advance-loc2.s b/llvm/test/MC/ELF/cfi-advance-loc2.s index 6a60e52acba..aa5f9ddcbf4 100644 --- a/llvm/test/MC/ELF/cfi-advance-loc2.s +++ b/llvm/test/MC/ELF/cfi-advance-loc2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s // test that this produces a correctly encoded cfi_advance_loc2 diff --git a/llvm/test/MC/ELF/cfi-def-cfa-offset.s b/llvm/test/MC/ELF/cfi-def-cfa-offset.s index c4cc6d53e02..5b71c64555a 100644 --- a/llvm/test/MC/ELF/cfi-def-cfa-offset.s +++ b/llvm/test/MC/ELF/cfi-def-cfa-offset.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-def-cfa-register.s b/llvm/test/MC/ELF/cfi-def-cfa-register.s index 708f6b1496e..220e3cba08f 100644 --- a/llvm/test/MC/ELF/cfi-def-cfa-register.s +++ b/llvm/test/MC/ELF/cfi-def-cfa-register.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-def-cfa.s b/llvm/test/MC/ELF/cfi-def-cfa.s index 25931b77ec6..67aa3a65fef 100644 --- a/llvm/test/MC/ELF/cfi-def-cfa.s +++ b/llvm/test/MC/ELF/cfi-def-cfa.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-escape.s b/llvm/test/MC/ELF/cfi-escape.s index fb019be1252..620d1538716 100644 --- a/llvm/test/MC/ELF/cfi-escape.s +++ b/llvm/test/MC/ELF/cfi-escape.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-large-model.s b/llvm/test/MC/ELF/cfi-large-model.s index 5883164a28f..444f38af029 100644 --- a/llvm/test/MC/ELF/cfi-large-model.s +++ b/llvm/test/MC/ELF/cfi-large-model.s @@ -1,9 +1,9 @@ // REQUIRES: powerpc-registered-target // REQUIRES: x86-registered-target // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -large-code-model %s \ -// RUN: -o - | llvm-readobj -s -sd | FileCheck --check-prefix=CHECK-X86 %s +// RUN: -o - | llvm-readobj -S --sd | FileCheck --check-prefix=CHECK-X86 %s // RUN: llvm-mc -filetype=obj -triple powerpc64le-linux-gnu -large-code-model %s \ -// RUN: -o - | llvm-readobj -s -sd | FileCheck --check-prefix=CHECK-PPC %s +// RUN: -o - | llvm-readobj -S --sd | FileCheck --check-prefix=CHECK-PPC %s // CHECK-X86: Section { diff --git a/llvm/test/MC/ELF/cfi-offset.s b/llvm/test/MC/ELF/cfi-offset.s index ea9d0f49915..be571b4a49b 100644 --- a/llvm/test/MC/ELF/cfi-offset.s +++ b/llvm/test/MC/ELF/cfi-offset.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-register.s b/llvm/test/MC/ELF/cfi-register.s index f7c021d06b8..89400cd9a78 100644 --- a/llvm/test/MC/ELF/cfi-register.s +++ b/llvm/test/MC/ELF/cfi-register.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-rel-offset.s b/llvm/test/MC/ELF/cfi-rel-offset.s index 89ca4ff148a..1c877b3e293 100644 --- a/llvm/test/MC/ELF/cfi-rel-offset.s +++ b/llvm/test/MC/ELF/cfi-rel-offset.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-rel-offset2.s b/llvm/test/MC/ELF/cfi-rel-offset2.s index e4d6b58c748..34a667c3091 100644 --- a/llvm/test/MC/ELF/cfi-rel-offset2.s +++ b/llvm/test/MC/ELF/cfi-rel-offset2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-remember.s b/llvm/test/MC/ELF/cfi-remember.s index c438ad3d0f3..d1629d1a508 100644 --- a/llvm/test/MC/ELF/cfi-remember.s +++ b/llvm/test/MC/ELF/cfi-remember.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-restore.s b/llvm/test/MC/ELF/cfi-restore.s index eb968fecbc4..79be928e72a 100644 --- a/llvm/test/MC/ELF/cfi-restore.s +++ b/llvm/test/MC/ELF/cfi-restore.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-same-value.s b/llvm/test/MC/ELF/cfi-same-value.s index 7d744ab5963..dc343999944 100644 --- a/llvm/test/MC/ELF/cfi-same-value.s +++ b/llvm/test/MC/ELF/cfi-same-value.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-sections.s b/llvm/test/MC/ELF/cfi-sections.s index 830fe260ec2..ea22eb6e1d1 100644 --- a/llvm/test/MC/ELF/cfi-sections.s +++ b/llvm/test/MC/ELF/cfi-sections.s @@ -1,11 +1,11 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_2 %s -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_2 %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_2 %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_2 %s -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_3 %s -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_3 %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_3 %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_3 %s -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_4 %s -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_4 %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_4 %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_4 %s .cfi_sections .debug_frame diff --git a/llvm/test/MC/ELF/cfi-signal-frame.s b/llvm/test/MC/ELF/cfi-signal-frame.s index 63244f3fc3e..17d3f6afbf0 100644 --- a/llvm/test/MC/ELF/cfi-signal-frame.s +++ b/llvm/test/MC/ELF/cfi-signal-frame.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-undefined.s b/llvm/test/MC/ELF/cfi-undefined.s index 50c482df79e..dc615bd02bb 100644 --- a/llvm/test/MC/ELF/cfi-undefined.s +++ b/llvm/test/MC/ELF/cfi-undefined.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f: .cfi_startproc diff --git a/llvm/test/MC/ELF/cfi-window-save.s b/llvm/test/MC/ELF/cfi-window-save.s index 01d7ef43378..7eb3ae2f98e 100644 --- a/llvm/test/MC/ELF/cfi-window-save.s +++ b/llvm/test/MC/ELF/cfi-window-save.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s # Should use SPARC as the target to test this. However, SPARC does not # use MC yet. diff --git a/llvm/test/MC/ELF/cfi-zero-addr-delta.s b/llvm/test/MC/ELF/cfi-zero-addr-delta.s index 495d52c234d..81d16987d58 100644 --- a/llvm/test/MC/ELF/cfi-zero-addr-delta.s +++ b/llvm/test/MC/ELF/cfi-zero-addr-delta.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s // Test that we don't produce a DW_CFA_advance_loc 0 diff --git a/llvm/test/MC/ELF/cfi.s b/llvm/test/MC/ELF/cfi.s index abc987d407d..b11cd8a00b2 100644 --- a/llvm/test/MC/ELF/cfi.s +++ b/llvm/test/MC/ELF/cfi.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s f1: .cfi_startproc diff --git a/llvm/test/MC/ELF/cgprofile.ll b/llvm/test/MC/ELF/cgprofile.ll index ec8ec507996..bd437c3f3ec 100644 --- a/llvm/test/MC/ELF/cgprofile.ll +++ b/llvm/test/MC/ELF/cgprofile.ll @@ -1,6 +1,6 @@ ; RUN: llc -filetype=asm %s -o - -mtriple x86_64-pc-linux-gnu | FileCheck %s ; RUN: llc -filetype=obj %s -o %t -mtriple x86_64-pc-linux-gnu -; RUN: llvm-readobj -elf-cg-profile %t | FileCheck %s --check-prefix=OBJ +; RUN: llvm-readobj --elf-cg-profile %t | FileCheck %s --check-prefix=OBJ declare void @b() diff --git a/llvm/test/MC/ELF/cgprofile.s b/llvm/test/MC/ELF/cgprofile.s index 5b5b7fac855..5b16176e21d 100644 --- a/llvm/test/MC/ELF/cgprofile.s +++ b/llvm/test/MC/ELF/cgprofile.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -sd -elf-cg-profile | FileCheck %s +# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t --sd --elf-cg-profile | FileCheck %s .section .test,"aw",@progbits a: .word b diff --git a/llvm/test/MC/ELF/comdat-dup-group-name.s b/llvm/test/MC/ELF/comdat-dup-group-name.s index e11cba62b40..cd75d75b01d 100644 --- a/llvm/test/MC/ELF/comdat-dup-group-name.s +++ b/llvm/test/MC/ELF/comdat-dup-group-name.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t | FileCheck %s // Test that we produce two foo sections, each in separate groups diff --git a/llvm/test/MC/ELF/comdat-name-number.s b/llvm/test/MC/ELF/comdat-name-number.s index 22e3adac2f8..48220d484c9 100644 --- a/llvm/test/MC/ELF/comdat-name-number.s +++ b/llvm/test/MC/ELF/comdat-name-number.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o %t.o -// RUN: llvm-readobj -elf-section-groups %t.o | FileCheck %s +// RUN: llvm-readobj --elf-section-groups %t.o | FileCheck %s // Test that we can handle numeric COMDAT names. diff --git a/llvm/test/MC/ELF/comdat-reloc.s b/llvm/test/MC/ELF/comdat-reloc.s index bc126f67fee..7eff043bede 100644 --- a/llvm/test/MC/ELF/comdat-reloc.s +++ b/llvm/test/MC/ELF/comdat-reloc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s .text .globl hello diff --git a/llvm/test/MC/ELF/comdat.s b/llvm/test/MC/ELF/comdat.s index 5e6fc64bac4..9e8de239e85 100644 --- a/llvm/test/MC/ELF/comdat.s +++ b/llvm/test/MC/ELF/comdat.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t --sd | FileCheck %s // Test that we produce the group sections and that they are before the members diff --git a/llvm/test/MC/ELF/common2.s b/llvm/test/MC/ELF/common2.s index bf9f22f90e9..54a27b05b23 100644 --- a/llvm/test/MC/ELF/common2.s +++ b/llvm/test/MC/ELF/common2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test local common construction. // Unlike gas, common symbols are created when found, not at the end of .bss. diff --git a/llvm/test/MC/ELF/compression.s b/llvm/test/MC/ELF/compression.s index fddc4d28e57..93a77b3fcbd 100644 --- a/llvm/test/MC/ELF/compression.s +++ b/llvm/test/MC/ELF/compression.s @@ -4,16 +4,16 @@ // RUN: llvm-objdump -s %t | FileCheck --check-prefix=CHECK-GNU-STYLE %s // RUN: llvm-dwarfdump -debug-str %t | FileCheck --check-prefix=STR %s // RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib-gnu -triple i386-pc-linux-gnu < %s \ -// RUN: | llvm-readobj -symbols - | FileCheck --check-prefix=386-SYMBOLS-GNU %s +// RUN: | llvm-readobj --symbols - | FileCheck --check-prefix=386-SYMBOLS-GNU %s // Check zlib style // RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib -triple x86_64-pc-linux-gnu < %s -o %t // RUN: llvm-objdump -s %t | FileCheck --check-prefix=CHECK-ZLIB-STYLE %s // RUN: llvm-dwarfdump -debug-str %t | FileCheck --check-prefix=STR %s -// RUN: llvm-readobj -sections %t | FileCheck --check-prefixes=ZLIB-STYLE-FLAGS,ZLIB-STYLE-FLAGS64 %s +// RUN: llvm-readobj --sections %t | FileCheck --check-prefixes=ZLIB-STYLE-FLAGS,ZLIB-STYLE-FLAGS64 %s // RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib -triple i386-pc-linux-gnu < %s -o %t -// RUN: llvm-readobj -symbols -sections %t \ +// RUN: llvm-readobj --symbols -S %t \ // RUN: | FileCheck --check-prefixes=386-SYMBOLS-ZLIB,ZLIB-STYLE-FLAGS,ZLIB-STYLE-FLAGS32 %s // Don't compress small sections, such as this simple debug_abbrev example diff --git a/llvm/test/MC/ELF/debug-line.s b/llvm/test/MC/ELF/debug-line.s index c831eb91571..89f07803f4b 100644 --- a/llvm/test/MC/ELF/debug-line.s +++ b/llvm/test/MC/ELF/debug-line.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s // Test that .debug_line is populated. TODO: This test should really be using // llvm-dwarfdump, but it cannot parse this particular object file. The content diff --git a/llvm/test/MC/ELF/debug-line2.s b/llvm/test/MC/ELF/debug-line2.s index 809b976824a..3c8b73092c5 100644 --- a/llvm/test/MC/ELF/debug-line2.s +++ b/llvm/test/MC/ELF/debug-line2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s // Test that two subsequent .loc directives generate two // distinct line table entries. diff --git a/llvm/test/MC/ELF/debug-loc.s b/llvm/test/MC/ELF/debug-loc.s index 21eac60d896..841c05c2b71 100644 --- a/llvm/test/MC/ELF/debug-loc.s +++ b/llvm/test/MC/ELF/debug-loc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test that we don't regress on the size of the line info section. We used // to handle negative line diffs incorrectly which manifested as very diff --git a/llvm/test/MC/ELF/dot-symbol-assignment.s b/llvm/test/MC/ELF/dot-symbol-assignment.s index 284bef0f337..6f15100ff61 100644 --- a/llvm/test/MC/ELF/dot-symbol-assignment.s +++ b/llvm/test/MC/ELF/dot-symbol-assignment.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -sections -section-data | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj --sections --section-data | FileCheck %s one: .quad 0xffffffffffffffff diff --git a/llvm/test/MC/ELF/empty-dwarf-lines.s b/llvm/test/MC/ELF/empty-dwarf-lines.s index 3b14fe0e6c5..e6ce76280aa 100644 --- a/llvm/test/MC/ELF/empty-dwarf-lines.s +++ b/llvm/test/MC/ELF/empty-dwarf-lines.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test that the dwarf debug_line section contains no line directives. diff --git a/llvm/test/MC/ELF/empty.s b/llvm/test/MC/ELF/empty.s index ea88803a31d..e640715591a 100644 --- a/llvm/test/MC/ELF/empty.s +++ b/llvm/test/MC/ELF/empty.s @@ -1,6 +1,6 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s -// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin14.0.0-elf %s -o - | llvm-readobj -s | FileCheck %s -check-prefix=DARWIN -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32-elf %s -o - | llvm-readobj -s | FileCheck %s -check-prefix=WINDOWS +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin14.0.0-elf %s -o - | llvm-readobj -S | FileCheck %s -check-prefix=DARWIN +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32-elf %s -o - | llvm-readobj -S | FileCheck %s -check-prefix=WINDOWS // Check that we can create ELF files for darwin/windows, even though // it is not the default file format. diff --git a/llvm/test/MC/ELF/entsize.ll b/llvm/test/MC/ELF/entsize.ll index 941a300bdda..36f7ab7688d 100644 --- a/llvm/test/MC/ELF/entsize.ll +++ b/llvm/test/MC/ELF/entsize.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj -mtriple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck -check-prefix=64 %s +; RUN: llc -filetype=obj -mtriple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck -check-prefix=64 %s ; Test that constant mergeable strings have sh_entsize set. diff --git a/llvm/test/MC/ELF/entsize.s b/llvm/test/MC/ELF/entsize.s index 1dc6103189d..856fdcb3390 100644 --- a/llvm/test/MC/ELF/entsize.s +++ b/llvm/test/MC/ELF/entsize.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // Test that mergeable constants have sh_entsize set. diff --git a/llvm/test/MC/ELF/exclude-debug-dwo.s b/llvm/test/MC/ELF/exclude-debug-dwo.s index c0f3b863e6e..02cdc0d3ff2 100644 --- a/llvm/test/MC/ELF/exclude-debug-dwo.s +++ b/llvm/test/MC/ELF/exclude-debug-dwo.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o %t.o -# RUN: llvm-readobj -s --elf-output-style=GNU %t.o | FileCheck %s +# RUN: llvm-readobj -S --elf-output-style=GNU %t.o | FileCheck %s ## Check we add SHF_EXCLUDE flag for .dwo debug sections. # CHECK: .debug_info.dwo {{.*}} E diff --git a/llvm/test/MC/ELF/global-offset.s b/llvm/test/MC/ELF/global-offset.s index c6886734ca4..3e5d8ac1431 100644 --- a/llvm/test/MC/ELF/global-offset.s +++ b/llvm/test/MC/ELF/global-offset.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s // We test that _GLOBAL_OFFSET_TABLE_ will account for the two bytes at the // start of the addl/leal. diff --git a/llvm/test/MC/ELF/ident.s b/llvm/test/MC/ELF/ident.s index 259220522e3..e7df90b9b37 100644 --- a/llvm/test/MC/ELF/ident.s +++ b/llvm/test/MC/ELF/ident.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s // CHECK: Section { // CHECK: Name: .comment diff --git a/llvm/test/MC/ELF/leb128.s b/llvm/test/MC/ELF/leb128.s index 84c5b54fa1a..87cdd33f414 100644 --- a/llvm/test/MC/ELF/leb128.s +++ b/llvm/test/MC/ELF/leb128.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s .sleb128 .Lfoo - .Lbar .Lfoo: diff --git a/llvm/test/MC/ELF/local-reloc.s b/llvm/test/MC/ELF/local-reloc.s index ce0b674364c..ef3713acdce 100644 --- a/llvm/test/MC/ELF/local-reloc.s +++ b/llvm/test/MC/ELF/local-reloc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -r -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -r -t | FileCheck %s // Test that relocations with local symbols are represented as relocations // with the section. They should be equivalent, but gas behaves like this. diff --git a/llvm/test/MC/ELF/many-sections-2.s b/llvm/test/MC/ELF/many-sections-2.s index 71ac870c8bc..c068050cd42 100644 --- a/llvm/test/MC/ELF/many-sections-2.s +++ b/llvm/test/MC/ELF/many-sections-2.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t -// RUN: llvm-readobj -s %t | FileCheck --check-prefix=SECTIONS %s +// RUN: llvm-readobj -S %t | FileCheck --check-prefix=SECTIONS %s // RUN: llvm-readobj -t %t | FileCheck --check-prefix=SYMBOLS %s // Test that we create a .symtab_shndx if a symbol points to a section diff --git a/llvm/test/MC/ELF/many-sections.s b/llvm/test/MC/ELF/many-sections.s index b1348f3b7c3..ceae3d310b8 100644 --- a/llvm/test/MC/ELF/many-sections.s +++ b/llvm/test/MC/ELF/many-sections.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t -// RUN: llvm-readobj -s %t | FileCheck --check-prefix=SECTIONS %s +// RUN: llvm-readobj -S %t | FileCheck --check-prefix=SECTIONS %s // RUN: llvm-readobj -t %t | FileCheck --check-prefix=SYMBOLS %s // Test that we don't create a .symtab_shndx since we are one section short of diff --git a/llvm/test/MC/ELF/n_bytes.s b/llvm/test/MC/ELF/n_bytes.s index fcbd0e88c2c..7ad1b10bb37 100644 --- a/llvm/test/MC/ELF/n_bytes.s +++ b/llvm/test/MC/ELF/n_bytes.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s .2byte 42, 1, 2, 3 .4byte 42, 1, 2, 3 diff --git a/llvm/test/MC/ELF/noexec.s b/llvm/test/MC/ELF/noexec.s index e8f460e65fa..bfed7990b66 100644 --- a/llvm/test/MC/ELF/noexec.s +++ b/llvm/test/MC/ELF/noexec.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -no-exec-stack -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -no-exec-stack -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // CHECK: Section { // CHECK: Index: diff --git a/llvm/test/MC/ELF/org.s b/llvm/test/MC/ELF/org.s index d878fa1aab4..665bddcc482 100644 --- a/llvm/test/MC/ELF/org.s +++ b/llvm/test/MC/ELF/org.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s .zero 4 foo: diff --git a/llvm/test/MC/ELF/popsection.s b/llvm/test/MC/ELF/popsection.s index ace6fac5e4c..69c2be5c22a 100644 --- a/llvm/test/MC/ELF/popsection.s +++ b/llvm/test/MC/ELF/popsection.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -s - | FileCheck %s +// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -S - | FileCheck %s // This used to crash. Test that it create an empty section instead. diff --git a/llvm/test/MC/ELF/relax.s b/llvm/test/MC/ELF/relax.s index 93db0fe9b94..4a00b0f367e 100644 --- a/llvm/test/MC/ELF/relax.s +++ b/llvm/test/MC/ELF/relax.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd -t | FileCheck %s // Test that we do not relax these. diff --git a/llvm/test/MC/ELF/relocation-pc.s b/llvm/test/MC/ELF/relocation-pc.s index 85e97f05958..48bc55b2e0d 100644 --- a/llvm/test/MC/ELF/relocation-pc.s +++ b/llvm/test/MC/ELF/relocation-pc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr | FileCheck %s // Test that we produce the correct relocation. diff --git a/llvm/test/MC/ELF/relocation-tls.s b/llvm/test/MC/ELF/relocation-tls.s index d0c375551cc..00b4046ad34 100644 --- a/llvm/test/MC/ELF/relocation-tls.s +++ b/llvm/test/MC/ELF/relocation-tls.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr | FileCheck %s // Test that we produce the correct relocation. diff --git a/llvm/test/MC/ELF/relocation.s b/llvm/test/MC/ELF/relocation.s index c5bad60f077..d3a53567fe0 100644 --- a/llvm/test/MC/ELF/relocation.s +++ b/llvm/test/MC/ELF/relocation.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr | FileCheck %s // Test that we produce the correct relocation. diff --git a/llvm/test/MC/ELF/rename.s b/llvm/test/MC/ELF/rename.s index 8be06424cf2..1b97f770d9b 100644 --- a/llvm/test/MC/ELF/rename.s +++ b/llvm/test/MC/ELF/rename.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -t | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr -t | FileCheck %s // When doing a rename, all the checks for where the relocation should go // should be performed with the original symbol. Only if we decide to relocate diff --git a/llvm/test/MC/ELF/section-numeric-flag.s b/llvm/test/MC/ELF/section-numeric-flag.s index ee93826e415..b072930364a 100644 --- a/llvm/test/MC/ELF/section-numeric-flag.s +++ b/llvm/test/MC/ELF/section-numeric-flag.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnu %s -o - \ -// RUN: | llvm-readobj -s -t | FileCheck %s +// RUN: | llvm-readobj -S -t | FileCheck %s .section .text, "0x806", %progbits, unique, 0 .section .comment, "0x21" diff --git a/llvm/test/MC/ELF/section-numeric-invalid-type.s b/llvm/test/MC/ELF/section-numeric-invalid-type.s index b8a39600eb1..902f5054693 100644 --- a/llvm/test/MC/ELF/section-numeric-invalid-type.s +++ b/llvm/test/MC/ELF/section-numeric-invalid-type.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnu %s -o - \ -// RUN: | llvm-readobj -s -t | FileCheck --check-prefix=OBJ %s +// RUN: | llvm-readobj -S -t | FileCheck --check-prefix=OBJ %s // RUN: not llvm-mc -filetype=asm -triple=x86_64-pc-linux-gnu %s -o - 2>&1 \ // RUN: | FileCheck --check-prefix=ASM %s diff --git a/llvm/test/MC/ELF/section-numeric-type.s b/llvm/test/MC/ELF/section-numeric-type.s index 2e51bd4eb18..508026a8a46 100644 --- a/llvm/test/MC/ELF/section-numeric-type.s +++ b/llvm/test/MC/ELF/section-numeric-type.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnu %s -o - \ -// RUN: | llvm-readobj -s -t | FileCheck --check-prefix=OBJ %s +// RUN: | llvm-readobj -S -t | FileCheck --check-prefix=OBJ %s // RUN: llvm-mc -filetype=asm -triple=x86_64-pc-linux-gnu %s -o - \ // RUN: | FileCheck --check-prefix=ASM %s diff --git a/llvm/test/MC/ELF/section-sym.s b/llvm/test/MC/ELF/section-sym.s index 5d5486f9f7a..ba49c326891 100644 --- a/llvm/test/MC/ELF/section-sym.s +++ b/llvm/test/MC/ELF/section-sym.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -r --expand-relocs | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t -r --expand-relocs | FileCheck %s .section foo, "aG", @progbits, f1, comdat .section foo, "G", @progbits, f2, comdat diff --git a/llvm/test/MC/ELF/section.s b/llvm/test/MC/ELF/section.s index 57755223db1..d31909f5f42 100644 --- a/llvm/test/MC/ELF/section.s +++ b/llvm/test/MC/ELF/section.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s // RUN: llvm-mc -filetype=asm -triple x86_64-pc-linux-gnu %s -o - | FileCheck %s --check-prefix=ASM // Test that these names are accepted. diff --git a/llvm/test/MC/ELF/sleb.s b/llvm/test/MC/ELF/sleb.s index 280b42d8cac..600ce19754f 100644 --- a/llvm/test/MC/ELF/sleb.s +++ b/llvm/test/MC/ELF/sleb.s @@ -1,7 +1,7 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 %s -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 %s -// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_32 %s -// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_64 %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 %s +// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_32 %s +// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_64 %s .text foo: diff --git a/llvm/test/MC/ELF/strtab-suffix-opt.s b/llvm/test/MC/ELF/strtab-suffix-opt.s index 69aa0933c99..fb9e895642d 100644 --- a/llvm/test/MC/ELF/strtab-suffix-opt.s +++ b/llvm/test/MC/ELF/strtab-suffix-opt.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -symbols | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj --symbols | FileCheck %s .text .globl foobar diff --git a/llvm/test/MC/ELF/uleb-ehtable.s b/llvm/test/MC/ELF/uleb-ehtable.s index 55abefec64b..d54392a2578 100644 --- a/llvm/test/MC/ELF/uleb-ehtable.s +++ b/llvm/test/MC/ELF/uleb-ehtable.s @@ -1,7 +1,7 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF -// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO -// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF +// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO +// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO // Test that we can assemble a GCC-like EH table that has 16381-16383 bytes of // non-padding data between .ttbaseref and .ttbase. The assembler must insert diff --git a/llvm/test/MC/ELF/uleb.s b/llvm/test/MC/ELF/uleb.s index ffa84e9021d..e09ae6ca1cf 100644 --- a/llvm/test/MC/ELF/uleb.s +++ b/llvm/test/MC/ELF/uleb.s @@ -1,7 +1,7 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 %s -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 %s -// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_32 %s -// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_64 %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 %s +// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_32 %s +// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_64 %s .text foo: diff --git a/llvm/test/MC/ELF/version.s b/llvm/test/MC/ELF/version.s index 0bc9c8b7a78..f138e9ddca5 100644 --- a/llvm/test/MC/ELF/version.s +++ b/llvm/test/MC/ELF/version.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s .version "1234" .version "123" diff --git a/llvm/test/MC/ELF/zero.s b/llvm/test/MC/ELF/zero.s index be92eb839e1..bbd2b5604f0 100644 --- a/llvm/test/MC/ELF/zero.s +++ b/llvm/test/MC/ELF/zero.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s .zero 4 .zero 1,42 diff --git a/llvm/test/MC/Hexagon/elf-flags.s b/llvm/test/MC/Hexagon/elf-flags.s index e5c4a8d93fe..5f67b37d4ca 100644 --- a/llvm/test/MC/Hexagon/elf-flags.s +++ b/llvm/test/MC/Hexagon/elf-flags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv5 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V5 %s -# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv55 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V55 %s -# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv60 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V60 %s -# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv62 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V62 %s +# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv5 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V5 %s +# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv55 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V55 %s +# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv60 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V60 %s +# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv62 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V62 %s # CHECK-V5: Flags: 0x4 # CHECK-V55: Flags: 0x5 diff --git a/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s b/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s index a10aef3a5f8..547f5be43f9 100644 --- a/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s +++ b/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s @@ -1,4 +1,4 @@ -; RUN: llvm-mc -triple arm64-apple-darwin -filetype=obj -o - < %s | llvm-readobj -s -sd | FileCheck %s +; RUN: llvm-mc -triple arm64-apple-darwin -filetype=obj -o - < %s | llvm-readobj -S --sd | FileCheck %s ; rdar://13028719 .globl context_save0 diff --git a/llvm/test/MC/MachO/ARM/aliased-symbols.s b/llvm/test/MC/MachO/ARM/aliased-symbols.s index cc2e200ce8a..dfe637c210e 100644 --- a/llvm/test/MC/MachO/ARM/aliased-symbols.s +++ b/llvm/test/MC/MachO/ARM/aliased-symbols.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple thumbv7m-apple-darwin-eabi %s -filetype=obj -o %t -// RUN: llvm-readobj -symbols %t | FileCheck %s +// RUN: llvm-readobj --symbols %t | FileCheck %s .data var1 = var2 diff --git a/llvm/test/MC/MachO/ARM/build-version-encode.s b/llvm/test/MC/MachO/ARM/build-version-encode.s index 19e75fafae9..d68f226cc9c 100644 --- a/llvm/test/MC/MachO/ARM/build-version-encode.s +++ b/llvm/test/MC/MachO/ARM/build-version-encode.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc %s -triple x86_64-apple-tvos -filetype=obj | llvm-readobj -macho-version-min | FileCheck %s +// RUN: llvm-mc %s -triple x86_64-apple-tvos -filetype=obj | llvm-readobj --macho-version-min | FileCheck %s .build_version tvos,1,2,3 // CHECK: MinVersion { diff --git a/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s b/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s index a0bacec7aa5..ab0e3e92258 100644 --- a/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s +++ b/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -n -triple armv7-apple-darwin10 %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.obj > %t.dump +@ RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.obj > %t.dump @ RUN: FileCheck < %t.dump %s .syntax unified diff --git a/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s b/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s index 7c85e0d3fe8..d2ad2c5e704 100644 --- a/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s +++ b/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.obj > %t.dump +@ RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.obj > %t.dump @ RUN: FileCheck < %t.dump %s .syntax unified diff --git a/llvm/test/MC/MachO/ARM/empty-function-nop.ll b/llvm/test/MC/MachO/ARM/empty-function-nop.ll index a2fc988c36e..dc09d165318 100644 --- a/llvm/test/MC/MachO/ARM/empty-function-nop.ll +++ b/llvm/test/MC/MachO/ARM/empty-function-nop.ll @@ -1,7 +1,7 @@ -; RUN: llc < %s -filetype=obj -mtriple=thumbv6-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-T1 %s -; RUN: llc < %s -filetype=obj -mtriple=thumbv7-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-T2 %s -; RUN: llc < %s -filetype=obj -mtriple=armv6-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-ARM %s -; RUN: llc < %s -filetype=obj -mtriple=armv7-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-ARMV7 %s +; RUN: llc < %s -filetype=obj -mtriple=thumbv6-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-T1 %s +; RUN: llc < %s -filetype=obj -mtriple=thumbv7-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-T2 %s +; RUN: llc < %s -filetype=obj -mtriple=armv6-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-ARM %s +; RUN: llc < %s -filetype=obj -mtriple=armv7-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-ARMV7 %s ; Empty functions need a NOP in them for MachO to prevent DWARF FDEs from ; getting all mucked up. See lib/CodeGen/AsmPrinter/AsmPrinter.cpp for diff --git a/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s b/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s index c4d153fc2b6..e781c6d5618 100644 --- a/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s +++ b/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -n -triple armv7-apple-darwin10 %s -filetype=obj -o %t.o -@ RUN: llvm-readobj -relocations -expand-relocs < %t.o | FileCheck %s +@ RUN: llvm-readobj -r --expand-relocs < %t.o | FileCheck %s @ rdar://12359919 diff --git a/llvm/test/MC/MachO/ARM/no-subsections-reloc.s b/llvm/test/MC/MachO/ARM/no-subsections-reloc.s index e367a3cfa73..68b9b3865a2 100644 --- a/llvm/test/MC/MachO/ARM/no-subsections-reloc.s +++ b/llvm/test/MC/MachO/ARM/no-subsections-reloc.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump +@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump @ RUN: FileCheck < %t.dump %s @ When not using subsections-via-symbols, references to non-local symbols diff --git a/llvm/test/MC/MachO/ARM/nop-armv4-padding.s b/llvm/test/MC/MachO/ARM/nop-armv4-padding.s index baab3d7491c..d63e506791e 100644 --- a/llvm/test/MC/MachO/ARM/nop-armv4-padding.s +++ b/llvm/test/MC/MachO/ARM/nop-armv4-padding.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv4-apple-darwin %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump +@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump @ RUN: FileCheck %s < %t.dump x: diff --git a/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s b/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s index a1a21f5f456..2b15ca0f54a 100644 --- a/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s +++ b/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv6t2-apple-darwin %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump +@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump @ RUN: FileCheck %s < %t.dump x: diff --git a/llvm/test/MC/MachO/ARM/nop-thumb-padding.s b/llvm/test/MC/MachO/ARM/nop-thumb-padding.s index 26db12140de..ac041e110fa 100644 --- a/llvm/test/MC/MachO/ARM/nop-thumb-padding.s +++ b/llvm/test/MC/MachO/ARM/nop-thumb-padding.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv6-apple-darwin %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump +@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump @ RUN: FileCheck %s < %t.dump .thumb_func x diff --git a/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s b/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s index a986ff17f2a..e032c8a7de0 100644 --- a/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s +++ b/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple armv7-apple-darwin %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump +@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump @ RUN: FileCheck %s < %t.dump .thumb_func x diff --git a/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s b/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s index f6f2233e6f9..d2d85194d87 100644 --- a/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s +++ b/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump +@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump @ RUN: FileCheck < %t.dump %s .syntax unified diff --git a/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s b/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s index fbac5fd4260..7563f4f62ff 100644 --- a/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s +++ b/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s @@ -1,4 +1,4 @@ -@ RUN: llvm-mc -triple=thumbv7-apple-darwin -show-encoding %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s +@ RUN: llvm-mc -triple=thumbv7-apple-darwin -show-encoding %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s ble Lfoo @ wide encoding diff --git a/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s b/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s index 2657fd9d99d..b5296b70c82 100644 --- a/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s +++ b/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s @@ -1,4 +1,4 @@ -@ RUN: llvm-mc -triple=thumbv7-apple-darwin -filetype=obj -o - < %s | llvm-readobj -s -sd | FileCheck %s +@ RUN: llvm-mc -triple=thumbv7-apple-darwin -filetype=obj -o - < %s | llvm-readobj -S --sd | FileCheck %s .thumb .thumb_func t t: nop diff --git a/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s b/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s index 1a91675fae5..bdc4aa9c47d 100644 --- a/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s +++ b/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj -@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump +@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump @ RUN: FileCheck < %t.dump %s .syntax unified .text diff --git a/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s b/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s index 5cfb3f4c918..c946e5c6ea7 100644 --- a/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s +++ b/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s @@ -1,4 +1,4 @@ -@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -relocations -expand-relocs | FileCheck %s +@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -r --expand-relocs | FileCheck %s _fred: movt r3, :upper16:(_wilma-(LPC0_0+4)) diff --git a/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s b/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s index 9c21d9b5b50..3191a90852b 100644 --- a/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s +++ b/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s @@ -1,4 +1,4 @@ -@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -relocations -expand-relocs | FileCheck %s +@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -r --expand-relocs | FileCheck %s @ rdar://10038370 diff --git a/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s b/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s index 1c3dc37d5bd..31ea99ba71e 100644 --- a/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s +++ b/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple powerpc-apple-darwin8 -arch=ppc32 -filetype=obj %s -o - | llvm-readobj -sections | FileCheck %s +// RUN: llvm-mc -triple powerpc-apple-darwin8 -arch=ppc32 -filetype=obj %s -o - | llvm-readobj --sections | FileCheck %s // CHECK: Section { // CHECK-NEXT: Index: 0 diff --git a/llvm/test/MC/MachO/absolute.s b/llvm/test/MC/MachO/absolute.s index 26850a2d09a..079a16398e4 100644 --- a/llvm/test/MC/MachO/absolute.s +++ b/llvm/test/MC/MachO/absolute.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s _bar: nop diff --git a/llvm/test/MC/MachO/absolutize.s b/llvm/test/MC/MachO/absolutize.s index 1f5ed32ff72..7e2a0452d44 100644 --- a/llvm/test/MC/MachO/absolutize.s +++ b/llvm/test/MC/MachO/absolutize.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s _text_a: xorl %eax,%eax diff --git a/llvm/test/MC/MachO/bss.s b/llvm/test/MC/MachO/bss.s index c5afe107782..426ae163165 100644 --- a/llvm/test/MC/MachO/bss.s +++ b/llvm/test/MC/MachO/bss.s @@ -1,7 +1,7 @@ // The purpose of this test is to verify that bss sections are emitted correctly. -// RUN: llvm-mc -filetype=obj -triple i686-apple-darwin9 %s | llvm-readobj -s | FileCheck %s -// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-apple-darwin9 %s | llvm-readobj -S | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s | llvm-readobj -S | FileCheck %s .bss .globl _g0 diff --git a/llvm/test/MC/MachO/coal-sections-x86_64.s b/llvm/test/MC/MachO/coal-sections-x86_64.s index 5ecdc578dbb..f91373e0793 100644 --- a/llvm/test/MC/MachO/coal-sections-x86_64.s +++ b/llvm/test/MC/MachO/coal-sections-x86_64.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - 2>%t.err | llvm-readobj -sections | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - 2>%t.err | llvm-readobj --sections | FileCheck %s // RUN: FileCheck --check-prefix=WARNING < %t.err %s // CHECK: Section { diff --git a/llvm/test/MC/MachO/comm-1.s b/llvm/test/MC/MachO/comm-1.s index 1b64e94c2c3..18eeb7475cc 100644 --- a/llvm/test/MC/MachO/comm-1.s +++ b/llvm/test/MC/MachO/comm-1.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .comm sym_comm_B, 2 .comm sym_comm_A, 4 diff --git a/llvm/test/MC/MachO/darwin-complex-difference.s b/llvm/test/MC/MachO/darwin-complex-difference.s index 84940ba68f8..1f2f6e71268 100644 --- a/llvm/test/MC/MachO/darwin-complex-difference.s +++ b/llvm/test/MC/MachO/darwin-complex-difference.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o %t.o -// RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.o > %t.dump +// RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.o > %t.dump // RUN: FileCheck < %t.dump %s _a: diff --git a/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s b/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s index 9d69a493dd8..f819f786ffb 100644 --- a/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s +++ b/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .text diff --git a/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s b/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s index 857c3541d65..1559998501f 100644 --- a/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s +++ b/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -n -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment | FileCheck %s +// RUN: llvm-mc -n -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s // Test case for rdar://10062261 diff --git a/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s b/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s index e7f0c5baf8d..177fee634e8 100644 --- a/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s +++ b/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .data diff --git a/llvm/test/MC/MachO/data.s b/llvm/test/MC/MachO/data.s index 90679a989f7..64ca12133dd 100644 --- a/llvm/test/MC/MachO/data.s +++ b/llvm/test/MC/MachO/data.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -macho-segment | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --macho-segment | FileCheck %s .data .ascii "hello" diff --git a/llvm/test/MC/MachO/debug_frame.s b/llvm/test/MC/MachO/debug_frame.s index 509c57ac2c2..7ecc7463bec 100644 --- a/llvm/test/MC/MachO/debug_frame.s +++ b/llvm/test/MC/MachO/debug_frame.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin %s -filetype=obj -o - | llvm-readobj -s -sd -r | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin %s -filetype=obj -o - | llvm-readobj -S --sd -r | FileCheck %s // Make sure MC can handle file level .cfi_startproc and .cfi_endproc that creates // an empty frame. diff --git a/llvm/test/MC/MachO/diff-with-two-sections.s b/llvm/test/MC/MachO/diff-with-two-sections.s index d63f4a05725..0637f267791 100644 --- a/llvm/test/MC/MachO/diff-with-two-sections.s +++ b/llvm/test/MC/MachO/diff-with-two-sections.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment -macho-version-min | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment --macho-version-min | FileCheck %s .section __TEXT,__text,regular,pure_instructions Leh_func_begin0: diff --git a/llvm/test/MC/MachO/direction_labels.s b/llvm/test/MC/MachO/direction_labels.s index 345a7521d7a..91075a7e152 100644 --- a/llvm/test/MC/MachO/direction_labels.s +++ b/llvm/test/MC/MachO/direction_labels.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s direction_labels: 10: nop diff --git a/llvm/test/MC/MachO/file.s b/llvm/test/MC/MachO/file.s index eddbb599d97..487d8e3c3d9 100644 --- a/llvm/test/MC/MachO/file.s +++ b/llvm/test/MC/MachO/file.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -section-data | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --section-data | FileCheck %s // This number-less file directive is ignored on MachO. .file "bar/baz.s" diff --git a/llvm/test/MC/MachO/indirect-symbols.s b/llvm/test/MC/MachO/indirect-symbols.s index 4ab384821d9..4120f8eb8d8 100644 --- a/llvm/test/MC/MachO/indirect-symbols.s +++ b/llvm/test/MC/MachO/indirect-symbols.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s _b: _c = 0 diff --git a/llvm/test/MC/MachO/jcc.s b/llvm/test/MC/MachO/jcc.s index caff25714a0..d9941b9c674 100644 --- a/llvm/test/MC/MachO/jcc.s +++ b/llvm/test/MC/MachO/jcc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s ja 1f 1: nop diff --git a/llvm/test/MC/MachO/lcomm-attributes.s b/llvm/test/MC/MachO/lcomm-attributes.s index 5f902ebac4f..918bb729fd6 100644 --- a/llvm/test/MC/MachO/lcomm-attributes.s +++ b/llvm/test/MC/MachO/lcomm-attributes.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s // Note, this test intentionally mismatches Darwin 'as', which loses the // following global marker. diff --git a/llvm/test/MC/MachO/linker-option-2.s b/llvm/test/MC/MachO/linker-option-2.s index 415d02e536b..8f9a8ffbb09 100644 --- a/llvm/test/MC/MachO/linker-option-2.s +++ b/llvm/test/MC/MachO/linker-option-2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -n -triple x86_64-apple-darwin10 %s -filetype=obj | llvm-readobj -macho-linker-options | FileCheck %s +// RUN: llvm-mc -n -triple x86_64-apple-darwin10 %s -filetype=obj | llvm-readobj --macho-linker-options | FileCheck %s .linker_option "a" .linker_option "a", "b" diff --git a/llvm/test/MC/MachO/linker-options.ll b/llvm/test/MC/MachO/linker-options.ll index d9d7a4a46d8..86c1d8e90b5 100644 --- a/llvm/test/MC/MachO/linker-options.ll +++ b/llvm/test/MC/MachO/linker-options.ll @@ -4,7 +4,7 @@ ; CHECK-ASM: .linker_option "-lz" ; CHECK-ASM-NEXT: .linker_option "-framework", "Cocoa" -; RUN: llc -O0 -mtriple=x86_64-apple-darwin -filetype=obj -o - %s | llvm-readobj -macho-linker-options > %t +; RUN: llc -O0 -mtriple=x86_64-apple-darwin -filetype=obj -o - %s | llvm-readobj --macho-linker-options > %t ; RUN: FileCheck --check-prefix=CHECK-OBJ < %t %s ; CHECK-OBJ: Linker Options { diff --git a/llvm/test/MC/MachO/loc.s b/llvm/test/MC/MachO/loc.s index ef4c815360c..c8f61feb11f 100644 --- a/llvm/test/MC/MachO/loc.s +++ b/llvm/test/MC/MachO/loc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -s -sd | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -S --sd | FileCheck %s .file 2 "foo" .file 1 "bar" .loc 2 64 0 diff --git a/llvm/test/MC/MachO/pcrel-to-other-section.s b/llvm/test/MC/MachO/pcrel-to-other-section.s index cf46b0dcb0f..2277f5a3fa8 100644 --- a/llvm/test/MC/MachO/pcrel-to-other-section.s +++ b/llvm/test/MC/MachO/pcrel-to-other-section.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s nop .section __TEXT,__StaticInit,regular,pure_instructions diff --git a/llvm/test/MC/MachO/relax-jumps.s b/llvm/test/MC/MachO/relax-jumps.s index ab68eb1d6c2..104fd8c8498 100644 --- a/llvm/test/MC/MachO/relax-jumps.s +++ b/llvm/test/MC/MachO/relax-jumps.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s // FIXME: This is a horrible way of checking the output, we need an llvm-mc // based 'otool'. Use: diff --git a/llvm/test/MC/MachO/relax-recompute-align.s b/llvm/test/MC/MachO/relax-recompute-align.s index 1369bcdf5ae..99f8fb95145 100644 --- a/llvm/test/MC/MachO/relax-recompute-align.s +++ b/llvm/test/MC/MachO/relax-recompute-align.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S | FileCheck %s // FIXME: This is a horrible way of checking the output, we need an llvm-mc // based 'otool'. diff --git a/llvm/test/MC/MachO/reloc-pcrel-offset.s b/llvm/test/MC/MachO/reloc-pcrel-offset.s index d4d6ddf48dd..63887bfc9dc 100644 --- a/llvm/test/MC/MachO/reloc-pcrel-offset.s +++ b/llvm/test/MC/MachO/reloc-pcrel-offset.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -n -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -s -sd | FileCheck %s +// RUN: llvm-mc -n -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -S --sd | FileCheck %s .data .long 0 diff --git a/llvm/test/MC/MachO/reloc.s b/llvm/test/MC/MachO/reloc.s index 6a78d0452ed..1379d80eb31 100644 --- a/llvm/test/MC/MachO/reloc.s +++ b/llvm/test/MC/MachO/reloc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -expand-relocs | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r --expand-relocs | FileCheck %s .data .long undef diff --git a/llvm/test/MC/MachO/section-align-1.s b/llvm/test/MC/MachO/section-align-1.s index db071658550..161b52dc702 100644 --- a/llvm/test/MC/MachO/section-align-1.s +++ b/llvm/test/MC/MachO/section-align-1.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -t -file-headers -s -macho-indirect-symbols -macho-dysymtab -macho-segment | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -t --file-headers -S --macho-indirect-symbols --macho-dysymtab --macho-segment | FileCheck %s name: .byte 0 diff --git a/llvm/test/MC/MachO/section-align-2.s b/llvm/test/MC/MachO/section-align-2.s index 4a2099a4b0c..847db230533 100644 --- a/llvm/test/MC/MachO/section-align-2.s +++ b/llvm/test/MC/MachO/section-align-2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .byte 0 diff --git a/llvm/test/MC/MachO/section-attributes.s b/llvm/test/MC/MachO/section-attributes.s index 0c2913e4aca..243d823d68b 100644 --- a/llvm/test/MC/MachO/section-attributes.s +++ b/llvm/test/MC/MachO/section-attributes.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o %t -// RUN: llvm-readobj -s -sd %t | FileCheck %s +// RUN: llvm-readobj -S --sd %t | FileCheck %s .section __TEXT,__objc_opt_ro .long 0 diff --git a/llvm/test/MC/MachO/section-flags.s b/llvm/test/MC/MachO/section-flags.s index da5c4c13317..ca12c50820f 100644 --- a/llvm/test/MC/MachO/section-flags.s +++ b/llvm/test/MC/MachO/section-flags.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s .text diff --git a/llvm/test/MC/MachO/string-table.s b/llvm/test/MC/MachO/string-table.s index 0902a3477b5..bbbef7a4433 100644 --- a/llvm/test/MC/MachO/string-table.s +++ b/llvm/test/MC/MachO/string-table.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s movl $a, b diff --git a/llvm/test/MC/MachO/symbol-diff.s b/llvm/test/MC/MachO/symbol-diff.s index 2c3b52f85a8..b035ab1edb0 100644 --- a/llvm/test/MC/MachO/symbol-diff.s +++ b/llvm/test/MC/MachO/symbol-diff.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s _g: LFB2: .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support diff --git a/llvm/test/MC/MachO/symbol-flags.s b/llvm/test/MC/MachO/symbol-flags.s index 8f001e5c612..bc66be758ec 100644 --- a/llvm/test/MC/MachO/symbol-flags.s +++ b/llvm/test/MC/MachO/symbol-flags.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .reference sym_ref_A .reference sym_ref_def_A diff --git a/llvm/test/MC/MachO/symbol-indirect.s b/llvm/test/MC/MachO/symbol-indirect.s index c0012b70355..5dbe5d07c55 100644 --- a/llvm/test/MC/MachO/symbol-indirect.s +++ b/llvm/test/MC/MachO/symbol-indirect.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s // FIXME: We are missing a lot of diagnostics on this kind of stuff which the // assembler has. diff --git a/llvm/test/MC/MachO/symbols-1.s b/llvm/test/MC/MachO/symbols-1.s index bec31bb7345..a8f83d03883 100644 --- a/llvm/test/MC/MachO/symbols-1.s +++ b/llvm/test/MC/MachO/symbols-1.s @@ -1,5 +1,5 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_32 %s -// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_64 %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_32 %s +// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_64 %s sym_local_B: .globl sym_globl_def_B diff --git a/llvm/test/MC/MachO/tbss.s b/llvm/test/MC/MachO/tbss.s index a2577290926..465b52aad76 100644 --- a/llvm/test/MC/MachO/tbss.s +++ b/llvm/test/MC/MachO/tbss.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .tbss _a$tlv$init, 4 .tbss _b$tlv$init, 4, 3 diff --git a/llvm/test/MC/MachO/tdata.s b/llvm/test/MC/MachO/tdata.s index 855ce54c0ab..90303fad3ca 100644 --- a/llvm/test/MC/MachO/tdata.s +++ b/llvm/test/MC/MachO/tdata.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .tdata _a$tlv$init: .long 4 diff --git a/llvm/test/MC/MachO/thread_init_func.s b/llvm/test/MC/MachO/thread_init_func.s index 912d7824140..c9a5edf6dd4 100644 --- a/llvm/test/MC/MachO/thread_init_func.s +++ b/llvm/test/MC/MachO/thread_init_func.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s .thread_init_func .quad 0 diff --git a/llvm/test/MC/MachO/tls.s b/llvm/test/MC/MachO/tls.s index 438c7f04c8e..3d451a52254 100644 --- a/llvm/test/MC/MachO/tls.s +++ b/llvm/test/MC/MachO/tls.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .section __TEXT,__text,regular,pure_instructions .section __DATA,__thread_data,thread_local_regular diff --git a/llvm/test/MC/MachO/tlv-bss.ll b/llvm/test/MC/MachO/tlv-bss.ll index 9a6ea20266f..1ffddd2e1a0 100644 --- a/llvm/test/MC/MachO/tlv-bss.ll +++ b/llvm/test/MC/MachO/tlv-bss.ll @@ -1,4 +1,4 @@ -; RUN: llc -O0 -mtriple=x86_64-apple-darwin12 -filetype=obj -o - %s | llvm-readobj -s | FileCheck %s +; RUN: llc -O0 -mtriple=x86_64-apple-darwin12 -filetype=obj -o - %s | llvm-readobj -S | FileCheck %s ; Test that we emit weak_odr thread_locals correctly into the thread_bss section ; PR15972 diff --git a/llvm/test/MC/MachO/tlv-reloc.s b/llvm/test/MC/MachO/tlv-reloc.s index ca6873478dc..b8b14705401 100644 --- a/llvm/test/MC/MachO/tlv-reloc.s +++ b/llvm/test/MC/MachO/tlv-reloc.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .tdata _a$tlv$init: diff --git a/llvm/test/MC/MachO/tlv.s b/llvm/test/MC/MachO/tlv.s index 57d74448aea..cd8128490ae 100644 --- a/llvm/test/MC/MachO/tlv.s +++ b/llvm/test/MC/MachO/tlv.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .tlv .globl _a diff --git a/llvm/test/MC/MachO/values.s b/llvm/test/MC/MachO/values.s index 0bdd0946770..d3a85fc887d 100644 --- a/llvm/test/MC/MachO/values.s +++ b/llvm/test/MC/MachO/values.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .long 0 text_def_int: diff --git a/llvm/test/MC/MachO/variable-exprs.s b/llvm/test/MC/MachO/variable-exprs.s index 380e7e75cc7..18b965faa5c 100644 --- a/llvm/test/MC/MachO/variable-exprs.s +++ b/llvm/test/MC/MachO/variable-exprs.s @@ -1,9 +1,9 @@ // RUN: llvm-mc -triple i386-apple-darwin10 %s -filetype=obj -o %t.o -// RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.o > %t.dump +// RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.o > %t.dump // RUN: FileCheck --check-prefix=CHECK-I386 < %t.dump %s // RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o %t.o -// RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.o > %t.dump +// RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.o > %t.dump // RUN: FileCheck --check-prefix=CHECK-X86_64 < %t.dump %s .data diff --git a/llvm/test/MC/MachO/weakdef.s b/llvm/test/MC/MachO/weakdef.s index 2043dc86f74..cc294c3ff8d 100644 --- a/llvm/test/MC/MachO/weakdef.s +++ b/llvm/test/MC/MachO/weakdef.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .section __DATA,__datacoal_nt,coalesced .section __TEXT,__const_coal,coalesced diff --git a/llvm/test/MC/MachO/x86_32-optimal_nop.s b/llvm/test/MC/MachO/x86_32-optimal_nop.s index b9b6fd12d4a..925b747dd1a 100644 --- a/llvm/test/MC/MachO/x86_32-optimal_nop.s +++ b/llvm/test/MC/MachO/x86_32-optimal_nop.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 -mcpu=pentiumpro %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 -mcpu=pentiumpro %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s # 1 byte nop test .align 4, 0 # start with 16 byte alignment filled with zeros diff --git a/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s b/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s index b2dc27b3e1c..909daa2bd27 100644 --- a/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s +++ b/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s // rdar://15526046 diff --git a/llvm/test/MC/MachO/x86_32-sections.s b/llvm/test/MC/MachO/x86_32-sections.s index a78ac17db1d..24c45d0b153 100644 --- a/llvm/test/MC/MachO/x86_32-sections.s +++ b/llvm/test/MC/MachO/x86_32-sections.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd --macho-segment | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd --macho-segment | FileCheck %s .text .section __TEXT,__text,regular,pure_instructions diff --git a/llvm/test/MC/MachO/x86_32-symbols.s b/llvm/test/MC/MachO/x86_32-symbols.s index 1a4ffafb745..abce76f2c85 100644 --- a/llvm/test/MC/MachO/x86_32-symbols.s +++ b/llvm/test/MC/MachO/x86_32-symbols.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .text L0: diff --git a/llvm/test/MC/MachO/x86_64-sections.s b/llvm/test/MC/MachO/x86_64-sections.s index 5ca83257f30..262b5c40b5e 100644 --- a/llvm/test/MC/MachO/x86_64-sections.s +++ b/llvm/test/MC/MachO/x86_64-sections.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r --macho-segment | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s .text .section __TEXT,__text,regular,pure_instructions diff --git a/llvm/test/MC/MachO/zero-space.s b/llvm/test/MC/MachO/zero-space.s index b823c429905..ab1970d5e81 100644 --- a/llvm/test/MC/MachO/zero-space.s +++ b/llvm/test/MC/MachO/zero-space.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .const .p2align 6 diff --git a/llvm/test/MC/MachO/zerofill-1.s b/llvm/test/MC/MachO/zerofill-1.s index c3de2ebbf79..a2fd4fe122d 100644 --- a/llvm/test/MC/MachO/zerofill-1.s +++ b/llvm/test/MC/MachO/zerofill-1.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .text .byte 0 // Align to 2**3 bytes, not 2**1 diff --git a/llvm/test/MC/MachO/zerofill-2.s b/llvm/test/MC/MachO/zerofill-2.s index e2e2dfac6fe..8879c7bfe61 100644 --- a/llvm/test/MC/MachO/zerofill-2.s +++ b/llvm/test/MC/MachO/zerofill-2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .byte 0 diff --git a/llvm/test/MC/MachO/zerofill-3.s b/llvm/test/MC/MachO/zerofill-3.s index 2e4ff278132..4beb93c99d0 100644 --- a/llvm/test/MC/MachO/zerofill-3.s +++ b/llvm/test/MC/MachO/zerofill-3.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s // FIXME: We don't get the order right currently, the assembler first // orders the symbols, then assigns addresses. :( diff --git a/llvm/test/MC/MachO/zerofill-5.s b/llvm/test/MC/MachO/zerofill-5.s index b688e6b0692..fa8e7cdb9c6 100644 --- a/llvm/test/MC/MachO/zerofill-5.s +++ b/llvm/test/MC/MachO/zerofill-5.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s .text .align 3 diff --git a/llvm/test/MC/Mips/addend.s b/llvm/test/MC/Mips/addend.s index 93ce4f413ae..984f69cb796 100644 --- a/llvm/test/MC/Mips/addend.s +++ b/llvm/test/MC/Mips/addend.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 %s -o %t.o -# RUN: llvm-readobj -s -section-data %t.o | FileCheck %s +# RUN: llvm-readobj -S --section-data %t.o | FileCheck %s # CHECK: Name: .text # CHECK-NEXT: Type: diff --git a/llvm/test/MC/Mips/cfi-advance-loc.s b/llvm/test/MC/Mips/cfi-advance-loc.s index c84e7e16237..4f5666ab33c 100644 --- a/llvm/test/MC/Mips/cfi-advance-loc.s +++ b/llvm/test/MC/Mips/cfi-advance-loc.s @@ -1,5 +1,5 @@ -// RUN: llvm-mc -filetype=obj -triple mipsel-pc-Linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK-LE -// RUN: llvm-mc -filetype=obj -triple mips-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK-BE +// RUN: llvm-mc -filetype=obj -triple mipsel-pc-Linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK-LE +// RUN: llvm-mc -filetype=obj -triple mips-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK-BE // test that this produces a correctly encoded cfi_advance_loc for both endians. diff --git a/llvm/test/MC/Mips/crc/module-crc.s b/llvm/test/MC/Mips/crc/module-crc.s index 6d00c52e902..92c428e67ff 100644 --- a/llvm/test/MC/Mips/crc/module-crc.s +++ b/llvm/test/MC/Mips/crc/module-crc.s @@ -3,7 +3,7 @@ # # RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r6 \ # RUN: -filetype=obj -o - | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module crc diff --git a/llvm/test/MC/Mips/crc/module-nocrc.s b/llvm/test/MC/Mips/crc/module-nocrc.s index 19020570ac9..c67279194c8 100644 --- a/llvm/test/MC/Mips/crc/module-nocrc.s +++ b/llvm/test/MC/Mips/crc/module-nocrc.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips32r6 -filetype=obj -o - -mattr=+crc | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module nocrc diff --git a/llvm/test/MC/Mips/directive-ent.s b/llvm/test/MC/Mips/directive-ent.s index fa15b4eb9c8..4271c046c0e 100644 --- a/llvm/test/MC/Mips/directive-ent.s +++ b/llvm/test/MC/Mips/directive-ent.s @@ -4,14 +4,14 @@ # RUN: llvm-mc -mcpu=mips32 -triple mips-unknown-unknown %s | \ # RUN: FileCheck -check-prefix=ASM %s # RUN: llvm-mc -filetype=obj -mcpu=mips32 -triple mips-unknown-unknown %s | \ -# RUN: llvm-readobj -symbols | \ +# RUN: llvm-readobj --symbols | \ # RUN: FileCheck -check-prefixes=OBJ,OBJ-32 %s # # RUN: llvm-mc -mcpu=mips32 -mattr=micromips -triple mips-unknown-unknown %s | \ # RUN: FileCheck -check-prefix=ASM %s # RUN: llvm-mc -filetype=obj -mcpu=mips32 -mattr=micromips \ # RUN: -triple mips-unknown-unknown %s | \ -# RUN: llvm-readobj -symbols | \ +# RUN: llvm-readobj --symbols | \ # RUN: FileCheck -check-prefixes=OBJ,OBJ-MM %s # .ent a diff --git a/llvm/test/MC/Mips/elf-bigendian.ll b/llvm/test/MC/Mips/elf-bigendian.ll index 4990f4e5b75..cbabd537bd6 100644 --- a/llvm/test/MC/Mips/elf-bigendian.ll +++ b/llvm/test/MC/Mips/elf-bigendian.ll @@ -1,4 +1,4 @@ -; DISABLE: llc -filetype=obj -mtriple mips-unknown-linux %s -o - | llvm-readobj -h -s -sd | FileCheck %s +; DISABLE: llc -filetype=obj -mtriple mips-unknown-linux %s -o - | llvm-readobj -h -S --sd | FileCheck %s ; RUN: false ; XFAIL: * diff --git a/llvm/test/MC/Mips/elf-debug-section.s b/llvm/test/MC/Mips/elf-debug-section.s index 6cc901bcb59..8e936f7bac5 100644 --- a/llvm/test/MC/Mips/elf-debug-section.s +++ b/llvm/test/MC/Mips/elf-debug-section.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple=mips-linux-gnu -g %s -o - \ -# RUN: | llvm-readobj -s | FileCheck %s +# RUN: | llvm-readobj -S | FileCheck %s # CHECK: Section { # CHECK: Name: .debug_line diff --git a/llvm/test/MC/Mips/elf_reginfo.s b/llvm/test/MC/Mips/elf_reginfo.s index 8a4ed3b9694..ea6e39601ef 100644 --- a/llvm/test/MC/Mips/elf_reginfo.s +++ b/llvm/test/MC/Mips/elf_reginfo.s @@ -2,9 +2,9 @@ # corresponding options (-mabi=64 -> -mattr=+n64 for example). # RUN: llvm-mc -filetype=obj -triple=mips64el-linux -target-abi n64 %s -o - \ -# RUN: | llvm-readobj -s | FileCheck --check-prefix=CHECK_64 %s +# RUN: | llvm-readobj -S | FileCheck --check-prefix=CHECK_64 %s # RUN: llvm-mc -filetype=obj -triple=mipsel %s -target-abi n32 -o - \ -# RUN: | llvm-readobj -s | FileCheck --check-prefix=CHECK_32 %s +# RUN: | llvm-readobj -S | FileCheck --check-prefix=CHECK_32 %s # Check for register information sections. # diff --git a/llvm/test/MC/Mips/end-directive.s b/llvm/test/MC/Mips/end-directive.s index b2959409e66..a357b35b7be 100644 --- a/llvm/test/MC/Mips/end-directive.s +++ b/llvm/test/MC/Mips/end-directive.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -arch=mips -mcpu=mips32 -filetype=obj %s -o - | \ -# RUN: llvm-readobj -symbols | FileCheck %s +# RUN: llvm-readobj --symbols | FileCheck %s # Check that the assembler doesn't choke on .align between a symbol and the # .end directive. diff --git a/llvm/test/MC/Mips/ginv/module-ginv.s b/llvm/test/MC/Mips/ginv/module-ginv.s index 49f3aa5628e..07f1bc4d40e 100644 --- a/llvm/test/MC/Mips/ginv/module-ginv.s +++ b/llvm/test/MC/Mips/ginv/module-ginv.s @@ -3,7 +3,7 @@ # # RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r6 \ # RUN: -filetype=obj -o - | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module ginv diff --git a/llvm/test/MC/Mips/ginv/module-noginv.s b/llvm/test/MC/Mips/ginv/module-noginv.s index 86edb03c80a..2ed4fd9c314 100644 --- a/llvm/test/MC/Mips/ginv/module-noginv.s +++ b/llvm/test/MC/Mips/ginv/module-noginv.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips32r6 -filetype=obj -o - -mattr=+ginv | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module noginv diff --git a/llvm/test/MC/Mips/insn-directive.s b/llvm/test/MC/Mips/insn-directive.s index f8cc1d6812d..b08fb02d52e 100644 --- a/llvm/test/MC/Mips/insn-directive.s +++ b/llvm/test/MC/Mips/insn-directive.s @@ -1,7 +1,7 @@ # RUN: llvm-mc %s -arch=mips -mcpu=mips32 | FileCheck %s --check-prefix=ASM # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \ -# RUN: llvm-readobj -symbols - | FileCheck %s --check-prefix=OBJ +# RUN: llvm-readobj --symbols - | FileCheck %s --check-prefix=OBJ .set micromips diff --git a/llvm/test/MC/Mips/micromips-ase-directive.s b/llvm/test/MC/Mips/micromips-ase-directive.s index 8cdcdcc0c56..f3ac60057dc 100644 --- a/llvm/test/MC/Mips/micromips-ase-directive.s +++ b/llvm/test/MC/Mips/micromips-ase-directive.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=mips-unknown-linux -filetype=obj %s -o - | \ -# RUN: llvm-readobj -mips-abi-flags | \ +# RUN: llvm-readobj --mips-abi-flags | \ # RUN: FileCheck --check-prefix=ASE-MICROMIPS %s .set micromips diff --git a/llvm/test/MC/Mips/mips-cop0-reginfo.s b/llvm/test/MC/Mips/mips-cop0-reginfo.s index b75b0171fa3..3b4c5afb2e0 100644 --- a/llvm/test/MC/Mips/mips-cop0-reginfo.s +++ b/llvm/test/MC/Mips/mips-cop0-reginfo.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple mips-unknown-linux-gnu -mcpu=mips32r2 -filetype=obj %s -o - \ -# RUN: | llvm-readobj -sections -section-data - | FileCheck %s +# RUN: | llvm-readobj --sections --section-data - | FileCheck %s mfc0 $16, $15, 1 mfc0 $16, $16, 1 diff --git a/llvm/test/MC/Mips/mips-data-directives.s b/llvm/test/MC/Mips/mips-data-directives.s index 390f463c7cb..1fbbc8be4d4 100644 --- a/llvm/test/MC/Mips/mips-data-directives.s +++ b/llvm/test/MC/Mips/mips-data-directives.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .4byte 3735929054 diff --git a/llvm/test/MC/Mips/mips-pdr.s b/llvm/test/MC/Mips/mips-pdr.s index b19dca3148d..267800ebcd5 100644 --- a/llvm/test/MC/Mips/mips-pdr.s +++ b/llvm/test/MC/Mips/mips-pdr.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=ASMOUT # RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \ -# RUN: llvm-readobj -s -section-data -r | \ +# RUN: llvm-readobj -S --section-data -r | \ # RUN: FileCheck %s -check-prefix=OBJOUT # ASMOUT: .text diff --git a/llvm/test/MC/Mips/mips-rdata.s b/llvm/test/MC/Mips/mips-rdata.s index 89f96195297..d2d8aa8c14a 100644 --- a/llvm/test/MC/Mips/mips-rdata.s +++ b/llvm/test/MC/Mips/mips-rdata.s @@ -1,7 +1,7 @@ # Check that .rdata sections have proper name, flags, and section types. # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o - \ -# RUN: | llvm-readobj -s | FileCheck %s +# RUN: | llvm-readobj -S | FileCheck %s .rdata .word 0 diff --git a/llvm/test/MC/Mips/mips-reginfo-fp32.s b/llvm/test/MC/Mips/mips-reginfo-fp32.s index 5b31884ec16..6b7d94aa57a 100644 --- a/llvm/test/MC/Mips/mips-reginfo-fp32.s +++ b/llvm/test/MC/Mips/mips-reginfo-fp32.s @@ -1,5 +1,5 @@ # RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \ -# RUN: llvm-readobj -s -section-data | \ +# RUN: llvm-readobj -S --section-data | \ # RUN: FileCheck %s # CHECK: Section { diff --git a/llvm/test/MC/Mips/mips-reginfo-fp64.s b/llvm/test/MC/Mips/mips-reginfo-fp64.s index ba2bf797394..157801d3cec 100644 --- a/llvm/test/MC/Mips/mips-reginfo-fp64.s +++ b/llvm/test/MC/Mips/mips-reginfo-fp64.s @@ -1,13 +1,13 @@ # RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -mattr=+msa,+fp64 -filetype=obj -o - | \ -# RUN: llvm-readobj -s -section-data | \ +# RUN: llvm-readobj -S --section-data | \ # RUN: FileCheck %s -check-prefix=ELF32 # RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -target-abi n32 -filetype=obj -o - | \ -# RUN: llvm-readobj -s -section-data | \ +# RUN: llvm-readobj -S --section-data | \ # RUN: FileCheck %s -check-prefix=ELF32 # RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -target-abi n64 -filetype=obj -o - | \ -# RUN: llvm-readobj -s -section-data | \ +# RUN: llvm-readobj -S --section-data | \ # RUN: FileCheck %s -check-prefix=ELF64 # ELF32: Section { diff --git a/llvm/test/MC/Mips/mips32/abiflags.s b/llvm/test/MC/Mips/mips32/abiflags.s index c8d74c1b703..a64335b69ac 100644 --- a/llvm/test/MC/Mips/mips32/abiflags.s +++ b/llvm/test/MC/Mips/mips32/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=32 diff --git a/llvm/test/MC/Mips/mips32r2/abiflags.s b/llvm/test/MC/Mips/mips32r2/abiflags.s index 200a8025e8d..46c54384f00 100644 --- a/llvm/test/MC/Mips/mips32r2/abiflags.s +++ b/llvm/test/MC/Mips/mips32r2/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=32 diff --git a/llvm/test/MC/Mips/mips32r3/abiflags.s b/llvm/test/MC/Mips/mips32r3/abiflags.s index 4d691453262..92ca0058069 100644 --- a/llvm/test/MC/Mips/mips32r3/abiflags.s +++ b/llvm/test/MC/Mips/mips32r3/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r3 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=32 diff --git a/llvm/test/MC/Mips/mips32r5/abiflags.s b/llvm/test/MC/Mips/mips32r5/abiflags.s index ab2a8579043..2e29338a7db 100644 --- a/llvm/test/MC/Mips/mips32r5/abiflags.s +++ b/llvm/test/MC/Mips/mips32r5/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r5 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=32 diff --git a/llvm/test/MC/Mips/mips64/abiflags.s b/llvm/test/MC/Mips/mips64/abiflags.s index 10c768942a1..bccfa775ddb 100644 --- a/llvm/test/MC/Mips/mips64/abiflags.s +++ b/llvm/test/MC/Mips/mips64/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n64 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=64 diff --git a/llvm/test/MC/Mips/mips64eb-fixups.s b/llvm/test/MC/Mips/mips64eb-fixups.s index 1ca8b0ae529..2de804d26e1 100644 --- a/llvm/test/MC/Mips/mips64eb-fixups.s +++ b/llvm/test/MC/Mips/mips64eb-fixups.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -filetype=obj -triple mips64eb-unknown-freebsd %s -o - | llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-mc -filetype=obj -triple mips64eb-unknown-freebsd %s -o - | llvm-readobj -S --sd | FileCheck %s .section .fixups,"",@progbits .byte 0xff diff --git a/llvm/test/MC/Mips/mips64r2/abiflags.s b/llvm/test/MC/Mips/mips64r2/abiflags.s index ece133f8f0e..799411d5afe 100644 --- a/llvm/test/MC/Mips/mips64r2/abiflags.s +++ b/llvm/test/MC/Mips/mips64r2/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips64r2 -target-abi n64 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=64 diff --git a/llvm/test/MC/Mips/mips64r3/abiflags.s b/llvm/test/MC/Mips/mips64r3/abiflags.s index e1461ccb3cb..71da8e970be 100644 --- a/llvm/test/MC/Mips/mips64r3/abiflags.s +++ b/llvm/test/MC/Mips/mips64r3/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips64r3 -target-abi n64 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=64 diff --git a/llvm/test/MC/Mips/mips64r5/abiflags.s b/llvm/test/MC/Mips/mips64r5/abiflags.s index 7972f5837de..71253eeb413 100644 --- a/llvm/test/MC/Mips/mips64r5/abiflags.s +++ b/llvm/test/MC/Mips/mips64r5/abiflags.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips64r5 -target-abi n64 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=64 diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx.s b/llvm/test/MC/Mips/mips_abi_flags_xx.s index fb27192b2a9..94101ae0c8f 100644 --- a/llvm/test/MC/Mips/mips_abi_flags_xx.s +++ b/llvm/test/MC/Mips/mips_abi_flags_xx.s @@ -2,19 +2,19 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS # RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mattr=fpxx -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS # RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mcpu=mips32r6 -mattr=fpxx -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R6,CHECK-OBJ-MIPS # RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -mcpu=octeon -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-64R2,CHECK-OBJ-OCTEON # CHECK-ASM: .module fp=xx diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s index b38d1b9a49d..f2445eba777 100644 --- a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s +++ b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=xx diff --git a/llvm/test/MC/Mips/module-hardfloat.s b/llvm/test/MC/Mips/module-hardfloat.s index 8a54fa69dd6..f29fbc09353 100644 --- a/llvm/test/MC/Mips/module-hardfloat.s +++ b/llvm/test/MC/Mips/module-hardfloat.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module hardfloat diff --git a/llvm/test/MC/Mips/module-softfloat.s b/llvm/test/MC/Mips/module-softfloat.s index 18559c5aec1..77e62e38e20 100644 --- a/llvm/test/MC/Mips/module-softfloat.s +++ b/llvm/test/MC/Mips/module-softfloat.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module softfloat diff --git a/llvm/test/MC/Mips/msa/abiflags.s b/llvm/test/MC/Mips/msa/abiflags.s index d4d8cadb8f2..4bd9725bdc4 100644 --- a/llvm/test/MC/Mips/msa/abiflags.s +++ b/llvm/test/MC/Mips/msa/abiflags.s @@ -3,7 +3,7 @@ # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 -mattr=+msa \ # RUN: -filetype=obj -o - \ -# RUN: | llvm-readobj -sections -section-data -section-relocations - \ +# RUN: | llvm-readobj --sections --section-data --section-relocations - \ # RUN: | FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=32 diff --git a/llvm/test/MC/Mips/mt/abiflag.s b/llvm/test/MC/Mips/mt/abiflag.s index b4769cba4c2..2d03c5d1106 100644 --- a/llvm/test/MC/Mips/mt/abiflag.s +++ b/llvm/test/MC/Mips/mt/abiflag.s @@ -1,5 +1,5 @@ # RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -mattr=+mt -filetype=obj -o - \ -# RUN: | llvm-readobj -mips-abi-flags | FileCheck %s +# RUN: | llvm-readobj --mips-abi-flags | FileCheck %s # Test that the usage of the MT ASE is recorded in .MIPS.abiflags diff --git a/llvm/test/MC/Mips/mt/module-directive.s b/llvm/test/MC/Mips/mt/module-directive.s index d316f054eaa..0d9ab97b455 100644 --- a/llvm/test/MC/Mips/mt/module-directive.s +++ b/llvm/test/MC/Mips/mt/module-directive.s @@ -1,5 +1,5 @@ # RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \ -# RUN: llvm-readobj -mips-abi-flags | FileCheck --check-prefix=CHECK-OBJ %s +# RUN: llvm-readobj --mips-abi-flags | FileCheck --check-prefix=CHECK-OBJ %s # RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=asm -o - | \ # RUN: FileCheck --check-prefix=CHECK-ASM %s diff --git a/llvm/test/MC/Mips/mt/set-directive.s b/llvm/test/MC/Mips/mt/set-directive.s index 53ed4b27379..9088655d8c5 100644 --- a/llvm/test/MC/Mips/mt/set-directive.s +++ b/llvm/test/MC/Mips/mt/set-directive.s @@ -1,5 +1,5 @@ # RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \ -# RUN: llvm-readobj -mips-abi-flags | FileCheck %s --check-prefix=CHECK-OBJ +# RUN: llvm-readobj --mips-abi-flags | FileCheck %s --check-prefix=CHECK-OBJ # RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=asm -o - | \ # RUN: FileCheck %s --check-prefix=CHECK-ASM diff --git a/llvm/test/MC/Mips/nooddspreg-cmdarg.s b/llvm/test/MC/Mips/nooddspreg-cmdarg.s index 3bbb8e893e6..2ccce74a5f1 100644 --- a/llvm/test/MC/Mips/nooddspreg-cmdarg.s +++ b/llvm/test/MC/Mips/nooddspreg-cmdarg.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64,+nooddspreg -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # RUN: not llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -mattr=+nooddspreg 2> %t0 diff --git a/llvm/test/MC/Mips/nooddspreg.s b/llvm/test/MC/Mips/nooddspreg.s index a5530ef8f52..6511da78657 100644 --- a/llvm/test/MC/Mips/nooddspreg.s +++ b/llvm/test/MC/Mips/nooddspreg.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # RUN: not llvm-mc %s -triple mips64-unknown-linux-gnuabin32 2> %t1 diff --git a/llvm/test/MC/Mips/oddspreg.s b/llvm/test/MC/Mips/oddspreg.s index c65a27d0828..204ff2c2808 100644 --- a/llvm/test/MC/Mips/oddspreg.s +++ b/llvm/test/MC/Mips/oddspreg.s @@ -2,14 +2,14 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-O32 # # RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32 # RUN: llvm-mc %s -triple mips64-unknown-linux-gnu | \ @@ -18,19 +18,19 @@ # Repeat the -filetype=obj tests but this time use an empty assembly file. The # output should be unchanged. # RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N64 # RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-O32 # # RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnuabin32 -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32 # RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ +# RUN: llvm-readobj --sections --section-data --section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N64 # CHECK-ASM: .module oddspreg diff --git a/llvm/test/MC/Mips/reloc-directive.s b/llvm/test/MC/Mips/reloc-directive.s index bf7c91b851f..b7498105681 100644 --- a/llvm/test/MC/Mips/reloc-directive.s +++ b/llvm/test/MC/Mips/reloc-directive.s @@ -5,13 +5,13 @@ # RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n64 \ # RUN: | FileCheck -check-prefix=ASM %s # RUN: llvm-mc -triple mips-unknown-linux < %s -show-encoding -target-abi=o32 \ -# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ +# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-O32 %s # RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n32 \ -# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ +# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-N32 %s # RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n64 \ -# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ +# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-N64 %s .text foo: diff --git a/llvm/test/MC/Mips/relocation-n64.s b/llvm/test/MC/Mips/relocation-n64.s index cb556e0866a..155ac20653a 100644 --- a/llvm/test/MC/Mips/relocation-n64.s +++ b/llvm/test/MC/Mips/relocation-n64.s @@ -5,7 +5,7 @@ // RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux < %s \ // RUN: | llvm-readobj -r | FileCheck -check-prefix=RELOC %s // RUN: llvm-mc -filetype=obj -triple mips64-unknown-linux < %s \ -// RUN: | llvm-readobj -sections -section-data \ +// RUN: | llvm-readobj --sections --section-data \ // RUN: | FileCheck -check-prefix=DATA %s // Test that we produce the correct relocation. diff --git a/llvm/test/MC/Mips/relocation-xfail.s b/llvm/test/MC/Mips/relocation-xfail.s index dcb78beb413..25db54a727e 100644 --- a/llvm/test/MC/Mips/relocation-xfail.s +++ b/llvm/test/MC/Mips/relocation-xfail.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple mips-unknown-linux -mattr=+micromips < %s \ -// RUN: | llvm-readobj -sections -section-data \ +// RUN: | llvm-readobj --sections --section-data \ // RUN: | FileCheck -check-prefix=DATA %s // // XFAIL: * diff --git a/llvm/test/MC/Mips/relocation.s b/llvm/test/MC/Mips/relocation.s index aa36b873bfc..0ff450b24a0 100644 --- a/llvm/test/MC/Mips/relocation.s +++ b/llvm/test/MC/Mips/relocation.s @@ -5,7 +5,7 @@ // RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux < %s \ // RUN: | llvm-readobj -r | FileCheck -check-prefix=RELOC %s // RUN: llvm-mc -filetype=obj -triple mips-unknown-linux < %s \ -// RUN: | llvm-readobj -sections -section-data \ +// RUN: | llvm-readobj --sections --section-data \ // RUN: | FileCheck -check-prefix=DATA %s // Test that we produce the correct relocation. diff --git a/llvm/test/MC/Mips/section-size.s b/llvm/test/MC/Mips/section-size.s index f6ffa8fe2de..1d3319cbf09 100644 --- a/llvm/test/MC/Mips/section-size.s +++ b/llvm/test/MC/Mips/section-size.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple mips-unknown-linux -filetype=obj \ -# RUN: -mips-round-section-sizes %s | llvm-readobj -sections | FileCheck %s +# RUN: -mips-round-section-sizes %s | llvm-readobj --sections | FileCheck %s .section ".talign1", "ax" .p2align 4 t1: .byte 1 diff --git a/llvm/test/MC/Mips/sym-offset.ll b/llvm/test/MC/Mips/sym-offset.ll index 55adc22d971..c5a063b8795 100644 --- a/llvm/test/MC/Mips/sym-offset.ll +++ b/llvm/test/MC/Mips/sym-offset.ll @@ -1,4 +1,4 @@ -; DISABLED: llc -filetype=obj -mtriple mipsel-unknown-linux %s -o - | llvm-readobj -s -sd | FileCheck %s +; DISABLED: llc -filetype=obj -mtriple mipsel-unknown-linux %s -o - | llvm-readobj -S --sd | FileCheck %s ; RUN: false ; XFAIL: * diff --git a/llvm/test/MC/Mips/virt/module-novirt.s b/llvm/test/MC/Mips/virt/module-novirt.s index 53c04599e8f..0f531dbbc80 100644 --- a/llvm/test/MC/Mips/virt/module-novirt.s +++ b/llvm/test/MC/Mips/virt/module-novirt.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # RUN: llvm-mc %s -arch=mips -mcpu=mips32r5 -filetype=obj -o - -mattr=+virt | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module novirt diff --git a/llvm/test/MC/Mips/virt/module-virt.s b/llvm/test/MC/Mips/virt/module-virt.s index 9a025ed7ed4..ae38b83d848 100644 --- a/llvm/test/MC/Mips/virt/module-virt.s +++ b/llvm/test/MC/Mips/virt/module-virt.s @@ -3,7 +3,7 @@ # # RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r5 \ # RUN: -filetype=obj -o - | \ -# RUN: llvm-readobj -mips-abi-flags - | \ +# RUN: llvm-readobj --mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module virt diff --git a/llvm/test/MC/PowerPC/lcomm.s b/llvm/test/MC/PowerPC/lcomm.s index a84f138479b..cc62332378e 100644 --- a/llvm/test/MC/PowerPC/lcomm.s +++ b/llvm/test/MC/PowerPC/lcomm.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple powerpc-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s # RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s .lcomm foo, 16, 16 diff --git a/llvm/test/MC/PowerPC/ppc-llong.s b/llvm/test/MC/PowerPC/ppc-llong.s index bbe0c95a084..8b7bf133dd0 100644 --- a/llvm/test/MC/PowerPC/ppc-llong.s +++ b/llvm/test/MC/PowerPC/ppc-llong.s @@ -1,10 +1,10 @@ # RUN: llvm-mc -triple powerpc-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s # RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s # RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s .data .llong 0 diff --git a/llvm/test/MC/PowerPC/ppc-nop.s b/llvm/test/MC/PowerPC/ppc-nop.s index 29fd8e4f748..8cc2f177cc8 100644 --- a/llvm/test/MC/PowerPC/ppc-nop.s +++ b/llvm/test/MC/PowerPC/ppc-nop.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux-gnu %s | llvm-readobj -s -sd - | FileCheck -check-prefix=CHECK-BE %s -# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux-gnu %s | llvm-readobj -s -sd - | FileCheck -check-prefix=CHECK-BE %s -# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux-gnu %s | llvm-readobj -s -sd - | FileCheck -check-prefix=CHECK-LE %s +# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux-gnu %s | llvm-readobj -S --sd - | FileCheck -check-prefix=CHECK-BE %s +# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux-gnu %s | llvm-readobj -S --sd - | FileCheck -check-prefix=CHECK-BE %s +# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux-gnu %s | llvm-readobj -S --sd - | FileCheck -check-prefix=CHECK-LE %s blr .p2align 3 diff --git a/llvm/test/MC/PowerPC/ppc-word.s b/llvm/test/MC/PowerPC/ppc-word.s index c52129c57cd..aade96a6437 100644 --- a/llvm/test/MC/PowerPC/ppc-word.s +++ b/llvm/test/MC/PowerPC/ppc-word.s @@ -1,10 +1,10 @@ # RUN: llvm-mc -triple powerpc-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s # RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s # RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s .data .word 0 diff --git a/llvm/test/MC/PowerPC/ppc64-fixup-apply.s b/llvm/test/MC/PowerPC/ppc64-fixup-apply.s index d16c9f20380..fd449c4e6c8 100644 --- a/llvm/test/MC/PowerPC/ppc64-fixup-apply.s +++ b/llvm/test/MC/PowerPC/ppc64-fixup-apply.s @@ -1,8 +1,8 @@ # RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-BE %s +# RUN: llvm-readobj -S --sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-BE %s # RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-LE %s +# RUN: llvm-readobj -S --sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-LE %s # This checks that fixups that can be resolved within the same # object file are applied correctly. diff --git a/llvm/test/MC/PowerPC/ppc64-initial-cfa.s b/llvm/test/MC/PowerPC/ppc64-initial-cfa.s index 819cd1114ae..39567f59659 100644 --- a/llvm/test/MC/PowerPC/ppc64-initial-cfa.s +++ b/llvm/test/MC/PowerPC/ppc64-initial-cfa.s @@ -1,11 +1,11 @@ # RUN: llvm-mc -triple=powerpc64-unknown-linux-gnu -filetype=obj %s | \ -# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-BE +# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-BE # RUN: llvm-mc -triple=powerpc64-unknown-linux-gnu -filetype=obj %s | \ -# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-BE +# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-BE # RUN: llvm-mc -triple=powerpc64le-unknown-linux-gnu -filetype=obj %s | \ -# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-LE +# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-LE # RUN: llvm-mc -triple=powerpc64le-unknown-linux-gnu -filetype=obj %s | \ -# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-LE +# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-LE _proc: .cfi_startproc diff --git a/llvm/test/MC/PowerPC/ppc64-localentry.s b/llvm/test/MC/PowerPC/ppc64-localentry.s index cc1de288fc1..883b2fcc38e 100644 --- a/llvm/test/MC/PowerPC/ppc64-localentry.s +++ b/llvm/test/MC/PowerPC/ppc64-localentry.s @@ -1,8 +1,8 @@ # RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -h -r -symbols | FileCheck %s +# RUN: llvm-readobj -h -r --symbols | FileCheck %s # RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \ -# RUN: llvm-readobj -h -r -symbols | FileCheck %s +# RUN: llvm-readobj -h -r --symbols | FileCheck %s .type callee1, @function callee1: diff --git a/llvm/test/MC/RISCV/elf-flags.s b/llvm/test/MC/RISCV/elf-flags.s index 347f11adf4a..7e17377b34d 100644 --- a/llvm/test/MC/RISCV/elf-flags.s +++ b/llvm/test/MC/RISCV/elf-flags.s @@ -1,9 +1,9 @@ -# RUN: llvm-mc -triple=riscv32 -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVI %s -# RUN: llvm-mc -triple=riscv64 -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVI %s -# RUN: llvm-mc -triple=riscv32 -mattr=+c -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s -# RUN: llvm-mc -triple=riscv64 -mattr=+c -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s +# RUN: llvm-mc -triple=riscv32 -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVI %s +# RUN: llvm-mc -triple=riscv64 -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVI %s +# RUN: llvm-mc -triple=riscv32 -mattr=+c -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s +# RUN: llvm-mc -triple=riscv64 -mattr=+c -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s # RUN: llvm-mc -triple=riscv32 -mattr=+e -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-RVE %s # CHECK-RVI: Flags [ (0x0) diff --git a/llvm/test/MC/RISCV/target-abi-valid.s b/llvm/test/MC/RISCV/target-abi-valid.s index 985d1741567..dab4420d024 100644 --- a/llvm/test/MC/RISCV/target-abi-valid.s +++ b/llvm/test/MC/RISCV/target-abi-valid.s @@ -1,50 +1,50 @@ # RUN: llvm-mc -triple=riscv32 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv32 -target-abi ilp32 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv32 -mattr=+f -target-abi ilp32 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv32 -mattr=+d -target-abi ilp32 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv64 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv64 -target-abi lp64 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv64 -mattr=+f -target-abi lp64 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv64 -mattr=+d -target-abi lp64 -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-NONE %s # RUN: llvm-mc -triple=riscv32 -mattr=+f -target-abi ilp32f -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s # RUN: llvm-mc -triple=riscv32 -mattr=+d -target-abi ilp32f -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s # RUN: llvm-mc -triple=riscv64 -mattr=+f -target-abi lp64f -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s # RUN: llvm-mc -triple=riscv64 -mattr=+d -target-abi lp64f -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s # RUN: llvm-mc -triple=riscv32 -mattr=+d -target-abi ilp32d -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-FLOAT-DOUBLE %s # RUN: llvm-mc -triple=riscv64 -mattr=+d -target-abi lp64d -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-FLOAT-DOUBLE %s # RUN: llvm-mc -triple=riscv32 -target-abi ilp32e -filetype=obj < %s \ -# RUN: | llvm-readobj -file-headers - \ +# RUN: | llvm-readobj --file-headers - \ # RUN: | FileCheck -check-prefix=CHECK-RVE %s # CHECK-NONE: Flags [ (0x0) diff --git a/llvm/test/MC/Sparc/sparc-nop-data.s b/llvm/test/MC/Sparc/sparc-nop-data.s index 1538505af73..2ba8cd43b36 100644 --- a/llvm/test/MC/Sparc/sparc-nop-data.s +++ b/llvm/test/MC/Sparc/sparc-nop-data.s @@ -1,5 +1,5 @@ -! RUN: llvm-mc %s -arch=sparc -filetype=obj | llvm-readobj -s -sd | FileCheck %s -! RUN: llvm-mc %s -arch=sparcv9 -filetype=obj | llvm-readobj -s -sd | FileCheck %s +! RUN: llvm-mc %s -arch=sparc -filetype=obj | llvm-readobj -S --sd | FileCheck %s +! RUN: llvm-mc %s -arch=sparcv9 -filetype=obj | llvm-readobj -S --sd | FileCheck %s ! CHECK: 0000: BA1F401D 01000000 01000000 01000000 ! CHECK: 0010: BA1F401D diff --git a/llvm/test/MC/SystemZ/word.s b/llvm/test/MC/SystemZ/word.s index 70f009a1e85..6299101bc3c 100644 --- a/llvm/test/MC/SystemZ/word.s +++ b/llvm/test/MC/SystemZ/word.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple s390x-linux-gnu -filetype=obj %s | \ -# RUN: llvm-readobj -s -sd | FileCheck %s +# RUN: llvm-readobj -S --sd | FileCheck %s .section word, "aw" .word 0xabcd diff --git a/llvm/test/MC/WebAssembly/custom-sections.ll b/llvm/test/MC/WebAssembly/custom-sections.ll index f662d55352b..d0fc5df9977 100644 --- a/llvm/test/MC/WebAssembly/custom-sections.ll +++ b/llvm/test/MC/WebAssembly/custom-sections.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s +; RUN: llc -filetype=obj %s -o - | llvm-readobj -S | FileCheck %s ; Test the mechanism for defining user custom sections. diff --git a/llvm/test/MC/WebAssembly/debug-info.ll b/llvm/test/MC/WebAssembly/debug-info.ll index d0c49b7c836..0d78f97fbb2 100644 --- a/llvm/test/MC/WebAssembly/debug-info.ll +++ b/llvm/test/MC/WebAssembly/debug-info.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj %s -o - | llvm-readobj -r -s -symbols | FileCheck %s +; RUN: llc -filetype=obj %s -o - | llvm-readobj -r -S --symbols | FileCheck %s ; CHECK: Format: WASM ; CHECK-NEXT:Arch: wasm32 diff --git a/llvm/test/MC/WebAssembly/event-section.ll b/llvm/test/MC/WebAssembly/event-section.ll index b42ddd20570..2b5b5bba9fe 100644 --- a/llvm/test/MC/WebAssembly/event-section.ll +++ b/llvm/test/MC/WebAssembly/event-section.ll @@ -1,5 +1,5 @@ ; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o - | obj2yaml | FileCheck %s -; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o - | llvm-readobj -s | FileCheck -check-prefix=SEC %s +; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o - | llvm-readobj -S | FileCheck -check-prefix=SEC %s target triple = "wasm32-unknown-unknown" diff --git a/llvm/test/MC/WebAssembly/file-headers.ll b/llvm/test/MC/WebAssembly/file-headers.ll index ae6bc88b996..ff738f8066c 100644 --- a/llvm/test/MC/WebAssembly/file-headers.ll +++ b/llvm/test/MC/WebAssembly/file-headers.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj %s -o - | llvm-readobj -file-headers | FileCheck %s +; RUN: llc -filetype=obj %s -o - | llvm-readobj --file-headers | FileCheck %s target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128" target triple = "wasm32-unknown-unknown" diff --git a/llvm/test/MC/WebAssembly/func-address.ll b/llvm/test/MC/WebAssembly/func-address.ll index e7bea2808f3..c5eb0ea5938 100644 --- a/llvm/test/MC/WebAssembly/func-address.ll +++ b/llvm/test/MC/WebAssembly/func-address.ll @@ -1,4 +1,4 @@ -; RUN: llc -O2 -filetype=obj %s -o - | llvm-readobj -r -s -expand-relocs | FileCheck %s +; RUN: llc -O2 -filetype=obj %s -o - | llvm-readobj -r -S --expand-relocs | FileCheck %s target triple = "wasm32-unknown-unknown" diff --git a/llvm/test/MC/WebAssembly/function-alias.ll b/llvm/test/MC/WebAssembly/function-alias.ll index 9fc91b6a8e2..a6a44ab0bd0 100644 --- a/llvm/test/MC/WebAssembly/function-alias.ll +++ b/llvm/test/MC/WebAssembly/function-alias.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj %s -o - | llvm-readobj -symbols | FileCheck %s +; RUN: llc -filetype=obj %s -o - | llvm-readobj --symbols | FileCheck %s target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128" target triple = "wasm32-unknown-unknown-wasm" diff --git a/llvm/test/MC/WebAssembly/reloc-code.ll b/llvm/test/MC/WebAssembly/reloc-code.ll index c16de2ec2a6..2c2cbba0bd9 100644 --- a/llvm/test/MC/WebAssembly/reloc-code.ll +++ b/llvm/test/MC/WebAssembly/reloc-code.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj -wasm-keep-registers %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s +; RUN: llc -filetype=obj -wasm-keep-registers %s -o - | llvm-readobj -r --expand-relocs | FileCheck %s target triple = "wasm32-unknown-unknown" diff --git a/llvm/test/MC/WebAssembly/reloc-data.ll b/llvm/test/MC/WebAssembly/reloc-data.ll index aedaa4e58ff..124db881b2f 100644 --- a/llvm/test/MC/WebAssembly/reloc-data.ll +++ b/llvm/test/MC/WebAssembly/reloc-data.ll @@ -1,4 +1,4 @@ -; RUN: llc -O0 -filetype=obj %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s +; RUN: llc -O0 -filetype=obj %s -o - | llvm-readobj -r --expand-relocs | FileCheck %s target triple = "wasm32-unknown-unknown" diff --git a/llvm/test/MC/WebAssembly/sections.ll b/llvm/test/MC/WebAssembly/sections.ll index 9dc7dbea8ed..abc1fe48607 100644 --- a/llvm/test/MC/WebAssembly/sections.ll +++ b/llvm/test/MC/WebAssembly/sections.ll @@ -1,4 +1,4 @@ -; RUN: llc -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s +; RUN: llc -filetype=obj %s -o - | llvm-readobj -S | FileCheck %s target triple = "wasm32-unknown-unknown" diff --git a/llvm/test/MC/X86/AlignedBundling/section-alignment.s b/llvm/test/MC/X86/AlignedBundling/section-alignment.s index 9ee5f6776c1..5cbe58e5675 100644 --- a/llvm/test/MC/X86/AlignedBundling/section-alignment.s +++ b/llvm/test/MC/X86/AlignedBundling/section-alignment.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -# RUN: | llvm-readobj -sections | FileCheck %s +# RUN: | llvm-readobj --sections | FileCheck %s # Test that bundle-aligned sections with instructions are aligned diff --git a/llvm/test/MC/X86/cfi_def_cfa-crash.s b/llvm/test/MC/X86/cfi_def_cfa-crash.s index 74b41d9943a..61a03e1e4c5 100644 --- a/llvm/test/MC/X86/cfi_def_cfa-crash.s +++ b/llvm/test/MC/X86/cfi_def_cfa-crash.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - | llvm-readobj -sections | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - | llvm-readobj --sections | FileCheck %s // We were trying to generate compact unwind info for assembly like this. // The .cfi_def_cfa directive, however, throws a wrench into that and was diff --git a/llvm/test/MC/X86/eval-fill.s b/llvm/test/MC/X86/eval-fill.s index f09166ee0f1..838eedf5e17 100644 --- a/llvm/test/MC/X86/eval-fill.s +++ b/llvm/test/MC/X86/eval-fill.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -S | FileCheck %s // CHECK: Name: .text // CHECK-NEXT: Type: SHT_PROGBITS diff --git a/llvm/test/MC/X86/fp-setup-macho.s b/llvm/test/MC/X86/fp-setup-macho.s index aaae07a48c0..4bfff129f19 100644 --- a/llvm/test/MC/X86/fp-setup-macho.s +++ b/llvm/test/MC/X86/fp-setup-macho.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-apple-macho -filetype obj -o - %s | llvm-readobj -sections | FileCheck %s +// RUN: llvm-mc -triple x86_64-apple-macho -filetype obj -o - %s | llvm-readobj --sections | FileCheck %s _label: .cfi_startproc diff --git a/llvm/test/MC/X86/large-bss.s b/llvm/test/MC/X86/large-bss.s index edb111e9092..97fcc5de704 100644 --- a/llvm/test/MC/X86/large-bss.s +++ b/llvm/test/MC/X86/large-bss.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -triple x86_64-pc-linux -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s +// RUN: llvm-mc -triple x86_64-pc-linux -filetype=obj %s -o - | llvm-readobj -S | FileCheck %s .bss .zero 0x10000000000000 diff --git a/llvm/test/MC/X86/no-elf-compact-unwind.s b/llvm/test/MC/X86/no-elf-compact-unwind.s index 4e9236b8797..e61c24c141a 100644 --- a/llvm/test/MC/X86/no-elf-compact-unwind.s +++ b/llvm/test/MC/X86/no-elf-compact-unwind.s @@ -1,6 +1,6 @@ -// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-macosx10.8.0 | llvm-readobj -s | FileCheck -check-prefix=MACHO %s -// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-ios7.0.0 | llvm-readobj -s | FileCheck -check-prefix=MACHO %s -// RUN: llvm-mc < %s -filetype=obj -triple x86_64-unknown-linux | llvm-readobj -s | FileCheck -check-prefix=ELF %s +// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-macosx10.8.0 | llvm-readobj -S | FileCheck -check-prefix=MACHO %s +// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-ios7.0.0 | llvm-readobj -S | FileCheck -check-prefix=MACHO %s +// RUN: llvm-mc < %s -filetype=obj -triple x86_64-unknown-linux | llvm-readobj -S | FileCheck -check-prefix=ELF %s .globl __Z3barv .align 4, 0x90 diff --git a/llvm/test/MC/X86/reloc-directive.s b/llvm/test/MC/X86/reloc-directive.s index 901427a6ab6..124f5209628 100644 --- a/llvm/test/MC/X86/reloc-directive.s +++ b/llvm/test/MC/X86/reloc-directive.s @@ -1,10 +1,10 @@ # RUN: llvm-mc -triple i686-pc-win32 < %s -show-encoding \ # RUN: | FileCheck -check-prefix=ASM %s # RUN: llvm-mc -triple i686-pc-win32 < %s -show-encoding \ -# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ +# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-32 %s # RUN: llvm-mc -triple x86_64-pc-win32 < %s -show-encoding \ -# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ +# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-64 %s .text foo: diff --git a/llvm/test/MC/X86/x86-evenDirective.s b/llvm/test/MC/X86/x86-evenDirective.s index 6d6555e7077..d59ae903e2d 100644 --- a/llvm/test/MC/X86/x86-evenDirective.s +++ b/llvm/test/MC/X86/x86-evenDirective.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple -x86_64-unknown-unknown -filetype obj -o - %s | llvm-readobj -s -sd \ +# RUN: llvm-mc -triple -x86_64-unknown-unknown -filetype obj -o - %s | llvm-readobj -S --sd \ # RUN: | FileCheck %s .text diff --git a/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml b/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml index 7a594843c20..501c276c892 100644 --- a/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml +++ b/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml @@ -1,98 +1,98 @@ # RUN: yaml2obj -docnum=1 %s > %t.o.1 -# RUN: llvm-readobj -s -file-headers %t.o.1 | FileCheck --check-prefixes=ELF-ALL,ELF-R600 %s +# RUN: llvm-readobj -S --file-headers %t.o.1 | FileCheck --check-prefixes=ELF-ALL,ELF-R600 %s # RUN: obj2yaml %t.o.1 | FileCheck --check-prefixes=YAML-R600 %s # RUN: yaml2obj -docnum=2 %s > %t.o.2 -# RUN: llvm-readobj -s -file-headers %t.o.2 | FileCheck --check-prefixes=ELF-ALL,ELF-R630 %s +# RUN: llvm-readobj -S --file-headers %t.o.2 | FileCheck --check-prefixes=ELF-ALL,ELF-R630 %s # RUN: obj2yaml %t.o.2 | FileCheck --check-prefixes=YAML-R630 %s # RUN: yaml2obj -docnum=3 %s > %t.o.3 -# RUN: llvm-readobj -s -file-headers %t.o.3 | FileCheck --check-prefixes=ELF-ALL,ELF-RS880 %s +# RUN: llvm-readobj -S --file-headers %t.o.3 | FileCheck --check-prefixes=ELF-ALL,ELF-RS880 %s # RUN: obj2yaml %t.o.3 | FileCheck --check-prefixes=YAML-RS880 %s # RUN: yaml2obj -docnum=4 %s > %t.o.4 -# RUN: llvm-readobj -s -file-headers %t.o.4 | FileCheck --check-prefixes=ELF-ALL,ELF-RV670 %s +# RUN: llvm-readobj -S --file-headers %t.o.4 | FileCheck --check-prefixes=ELF-ALL,ELF-RV670 %s # RUN: obj2yaml %t.o.4 | FileCheck --check-prefixes=YAML-RV670 %s # RUN: yaml2obj -docnum=5 %s > %t.o.5 -# RUN: llvm-readobj -s -file-headers %t.o.5 | FileCheck --check-prefixes=ELF-ALL,ELF-RV710 %s +# RUN: llvm-readobj -S --file-headers %t.o.5 | FileCheck --check-prefixes=ELF-ALL,ELF-RV710 %s # RUN: obj2yaml %t.o.5 | FileCheck --check-prefixes=YAML-RV710 %s # RUN: yaml2obj -docnum=6 %s > %t.o.6 -# RUN: llvm-readobj -s -file-headers %t.o.6 | FileCheck --check-prefixes=ELF-ALL,ELF-RV730 %s +# RUN: llvm-readobj -S --file-headers %t.o.6 | FileCheck --check-prefixes=ELF-ALL,ELF-RV730 %s # RUN: obj2yaml %t.o.6 | FileCheck --check-prefixes=YAML-RV730 %s # RUN: yaml2obj -docnum=7 %s > %t.o.7 -# RUN: llvm-readobj -s -file-headers %t.o.7 | FileCheck --check-prefixes=ELF-ALL,ELF-RV770 %s +# RUN: llvm-readobj -S --file-headers %t.o.7 | FileCheck --check-prefixes=ELF-ALL,ELF-RV770 %s # RUN: obj2yaml %t.o.7 | FileCheck --check-prefixes=YAML-RV770 %s # RUN: yaml2obj -docnum=8 %s > %t.o.8 -# RUN: llvm-readobj -s -file-headers %t.o.8 | FileCheck --check-prefixes=ELF-ALL,ELF-CEDAR %s +# RUN: llvm-readobj -S --file-headers %t.o.8 | FileCheck --check-prefixes=ELF-ALL,ELF-CEDAR %s # RUN: obj2yaml %t.o.8 | FileCheck --check-prefixes=YAML-CEDAR %s # RUN: yaml2obj -docnum=9 %s > %t.o.9 -# RUN: llvm-readobj -s -file-headers %t.o.9 | FileCheck --check-prefixes=ELF-ALL,ELF-CYPRESS %s +# RUN: llvm-readobj -S --file-headers %t.o.9 | FileCheck --check-prefixes=ELF-ALL,ELF-CYPRESS %s # RUN: obj2yaml %t.o.9 | FileCheck --check-prefixes=YAML-CYPRESS %s # RUN: yaml2obj -docnum=10 %s > %t.o.10 -# RUN: llvm-readobj -s -file-headers %t.o.10 | FileCheck --check-prefixes=ELF-ALL,ELF-JUNIPER %s +# RUN: llvm-readobj -S --file-headers %t.o.10 | FileCheck --check-prefixes=ELF-ALL,ELF-JUNIPER %s # RUN: obj2yaml %t.o.10 | FileCheck --check-prefixes=YAML-JUNIPER %s # RUN: yaml2obj -docnum=11 %s > %t.o.11 -# RUN: llvm-readobj -s -file-headers %t.o.11 | FileCheck --check-prefixes=ELF-ALL,ELF-REDWOOD %s +# RUN: llvm-readobj -S --file-headers %t.o.11 | FileCheck --check-prefixes=ELF-ALL,ELF-REDWOOD %s # RUN: obj2yaml %t.o.11 | FileCheck --check-prefixes=YAML-REDWOOD %s # RUN: yaml2obj -docnum=12 %s > %t.o.12 -# RUN: llvm-readobj -s -file-headers %t.o.12 | FileCheck --check-prefixes=ELF-ALL,ELF-SUMO %s +# RUN: llvm-readobj -S --file-headers %t.o.12 | FileCheck --check-prefixes=ELF-ALL,ELF-SUMO %s # RUN: obj2yaml %t.o.12 | FileCheck --check-prefixes=YAML-SUMO %s # RUN: yaml2obj -docnum=13 %s > %t.o.13 -# RUN: llvm-readobj -s -file-headers %t.o.13 | FileCheck --check-prefixes=ELF-ALL,ELF-BARTS %s +# RUN: llvm-readobj -S --file-headers %t.o.13 | FileCheck --check-prefixes=ELF-ALL,ELF-BARTS %s # RUN: obj2yaml %t.o.13 | FileCheck --check-prefixes=YAML-BARTS %s # RUN: yaml2obj -docnum=14 %s > %t.o.14 -# RUN: llvm-readobj -s -file-headers %t.o.14 | FileCheck --check-prefixes=ELF-ALL,ELF-CAICOS %s +# RUN: llvm-readobj -S --file-headers %t.o.14 | FileCheck --check-prefixes=ELF-ALL,ELF-CAICOS %s # RUN: obj2yaml %t.o.14 | FileCheck --check-prefixes=YAML-CAICOS %s # RUN: yaml2obj -docnum=15 %s > %t.o.15 -# RUN: llvm-readobj -s -file-headers %t.o.15 | FileCheck --check-prefixes=ELF-ALL,ELF-CAYMAN %s +# RUN: llvm-readobj -S --file-headers %t.o.15 | FileCheck --check-prefixes=ELF-ALL,ELF-CAYMAN %s # RUN: obj2yaml %t.o.15 | FileCheck --check-prefixes=YAML-CAYMAN %s # RUN: yaml2obj -docnum=16 %s > %t.o.16 -# RUN: llvm-readobj -s -file-headers %t.o.16 | FileCheck --check-prefixes=ELF-ALL,ELF-TURKS %s +# RUN: llvm-readobj -S --file-headers %t.o.16 | FileCheck --check-prefixes=ELF-ALL,ELF-TURKS %s # RUN: obj2yaml %t.o.16 | FileCheck --check-prefixes=YAML-TURKS %s # RUN: yaml2obj -docnum=17 %s > %t.o.17 -# RUN: llvm-readobj -s -file-headers %t.o.17 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX600 %s +# RUN: llvm-readobj -S --file-headers %t.o.17 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX600 %s # RUN: obj2yaml %t.o.17 | FileCheck --check-prefixes=YAML-GFX600 %s # RUN: yaml2obj -docnum=18 %s > %t.o.18 -# RUN: llvm-readobj -s -file-headers %t.o.18 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX601 %s +# RUN: llvm-readobj -S --file-headers %t.o.18 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX601 %s # RUN: obj2yaml %t.o.18 | FileCheck --check-prefixes=YAML-GFX601 %s # RUN: yaml2obj -docnum=19 %s > %t.o.19 -# RUN: llvm-readobj -s -file-headers %t.o.19 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX700 %s +# RUN: llvm-readobj -S --file-headers %t.o.19 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX700 %s # RUN: obj2yaml %t.o.19 | FileCheck --check-prefixes=YAML-GFX700 %s # RUN: yaml2obj -docnum=20 %s > %t.o.20 -# RUN: llvm-readobj -s -file-headers %t.o.20 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX701 %s +# RUN: llvm-readobj -S --file-headers %t.o.20 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX701 %s # RUN: obj2yaml %t.o.20 | FileCheck --check-prefixes=YAML-GFX701 %s # RUN: yaml2obj -docnum=21 %s > %t.o.21 -# RUN: llvm-readobj -s -file-headers %t.o.21 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX702 %s +# RUN: llvm-readobj -S --file-headers %t.o.21 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX702 %s # RUN: obj2yaml %t.o.21 | FileCheck --check-prefixes=YAML-GFX702 %s # RUN: yaml2obj -docnum=22 %s > %t.o.22 -# RUN: llvm-readobj -s -file-headers %t.o.22 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX703 %s +# RUN: llvm-readobj -S --file-headers %t.o.22 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX703 %s # RUN: obj2yaml %t.o.22 | FileCheck --check-prefixes=YAML-GFX703 %s # RUN: yaml2obj -docnum=23 %s > %t.o.23 -# RUN: llvm-readobj -s -file-headers %t.o.23 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX704 %s +# RUN: llvm-readobj -S --file-headers %t.o.23 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX704 %s # RUN: obj2yaml %t.o.23 | FileCheck --check-prefixes=YAML-GFX704 %s # RUN: yaml2obj -docnum=24 %s > %t.o.24 -# RUN: llvm-readobj -s -file-headers %t.o.24 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX801 %s +# RUN: llvm-readobj -S --file-headers %t.o.24 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX801 %s # RUN: obj2yaml %t.o.24 | FileCheck --check-prefixes=YAML-GFX801 %s # RUN: yaml2obj -docnum=25 %s > %t.o.25 -# RUN: llvm-readobj -s -file-headers %t.o.25 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX802 %s +# RUN: llvm-readobj -S --file-headers %t.o.25 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX802 %s # RUN: obj2yaml %t.o.25 | FileCheck --check-prefixes=YAML-GFX802 %s # RUN: yaml2obj -docnum=26 %s > %t.o.26 -# RUN: llvm-readobj -s -file-headers %t.o.26 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX803 %s +# RUN: llvm-readobj -S --file-headers %t.o.26 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX803 %s # RUN: obj2yaml %t.o.26 | FileCheck --check-prefixes=YAML-GFX803 %s # RUN: yaml2obj -docnum=27 %s > %t.o.27 -# RUN: llvm-readobj -s -file-headers %t.o.27 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX810 %s +# RUN: llvm-readobj -S --file-headers %t.o.27 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX810 %s # RUN: obj2yaml %t.o.27 | FileCheck --check-prefixes=YAML-GFX810 %s # RUN: yaml2obj -docnum=28 %s > %t.o.28 -# RUN: llvm-readobj -s -file-headers %t.o.28 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX900 %s +# RUN: llvm-readobj -S --file-headers %t.o.28 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX900 %s # RUN: obj2yaml %t.o.28 | FileCheck --check-prefixes=YAML-GFX900 %s # RUN: yaml2obj -docnum=29 %s > %t.o.29 -# RUN: llvm-readobj -s -file-headers %t.o.29 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX902 %s +# RUN: llvm-readobj -S --file-headers %t.o.29 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX902 %s # RUN: obj2yaml %t.o.29 | FileCheck --check-prefixes=YAML-GFX902 %s # RUN: yaml2obj -docnum=30 %s > %t.o.30 -# RUN: llvm-readobj -s -file-headers %t.o.30 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX904 %s +# RUN: llvm-readobj -S --file-headers %t.o.30 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX904 %s # RUN: obj2yaml %t.o.30 | FileCheck --check-prefixes=YAML-GFX904 %s # RUN: yaml2obj -docnum=31 %s > %t.o.31 -# RUN: llvm-readobj -s -file-headers %t.o.31 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX906 %s +# RUN: llvm-readobj -S --file-headers %t.o.31 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX906 %s # RUN: obj2yaml %t.o.31 | FileCheck --check-prefixes=YAML-GFX906 %s # RUN: yaml2obj -docnum=32 %s > %t.o.32 -# RUN: llvm-readobj -s -file-headers %t.o.32 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX909 %s +# RUN: llvm-readobj -S --file-headers %t.o.32 | FileCheck --check-prefixes=ELF-ALL,ELF-GFX909 %s # RUN: obj2yaml %t.o.32 | FileCheck --check-prefixes=YAML-GFX909 %s diff --git a/llvm/test/Object/AMDGPU/elf-header-flags-sram-ecc.yaml b/llvm/test/Object/AMDGPU/elf-header-flags-sram-ecc.yaml index 78b2913be04..6d105193f66 100644 --- a/llvm/test/Object/AMDGPU/elf-header-flags-sram-ecc.yaml +++ b/llvm/test/Object/AMDGPU/elf-header-flags-sram-ecc.yaml @@ -1,11 +1,11 @@ # RUN: yaml2obj -docnum=1 %s > %t.o.1 -# RUN: llvm-readobj -s -file-headers %t.o.1 | FileCheck --check-prefixes=ELF-ALL,ELF-SRAM-ECC-NONE %s +# RUN: llvm-readobj -S --file-headers %t.o.1 | FileCheck --check-prefixes=ELF-ALL,ELF-SRAM-ECC-NONE %s # RUN: obj2yaml %t.o.1 | FileCheck --check-prefixes=YAML-SRAM-ECC-NONE %s # RUN: yaml2obj -docnum=2 %s > %t.o.2 -# RUN: llvm-readobj -s -file-headers %t.o.2 | FileCheck --check-prefixes=ELF-ALL,ELF-SRAM-ECC-GFX900 %s +# RUN: llvm-readobj -S --file-headers %t.o.2 | FileCheck --check-prefixes=ELF-ALL,ELF-SRAM-ECC-GFX900 %s # RUN: obj2yaml %t.o.2 | FileCheck --check-prefixes=YAML-SRAM-ECC-GFX900 %s # RUN: yaml2obj -docnum=3 %s > %t.o.3 -# RUN: llvm-readobj -s -file-headers %t.o.3 | FileCheck --check-prefixes=ELF-ALL,ELF-SRAM-ECC-XNACK-GFX900 %s +# RUN: llvm-readobj -S --file-headers %t.o.3 | FileCheck --check-prefixes=ELF-ALL,ELF-SRAM-ECC-XNACK-GFX900 %s # RUN: obj2yaml %t.o.3 | FileCheck --check-prefixes=YAML-SRAM-ECC-XNACK-GFX900 %s # ELF-SRAM-ECC-NONE: Flags [ diff --git a/llvm/test/Object/AMDGPU/elf-header-flags-xnack.yaml b/llvm/test/Object/AMDGPU/elf-header-flags-xnack.yaml index 1514a5d654b..c2431646737 100644 --- a/llvm/test/Object/AMDGPU/elf-header-flags-xnack.yaml +++ b/llvm/test/Object/AMDGPU/elf-header-flags-xnack.yaml @@ -1,8 +1,8 @@ # RUN: yaml2obj -docnum=1 %s > %t.o.1 -# RUN: llvm-readobj -s -file-headers %t.o.1 | FileCheck --check-prefixes=ELF-ALL,ELF-XNACK-NONE %s +# RUN: llvm-readobj -S --file-headers %t.o.1 | FileCheck --check-prefixes=ELF-ALL,ELF-XNACK-NONE %s # RUN: obj2yaml %t.o.1 | FileCheck --check-prefixes=YAML-XNACK-NONE %s # RUN: yaml2obj -docnum=2 %s > %t.o.2 -# RUN: llvm-readobj -s -file-headers %t.o.2 | FileCheck --check-prefixes=ELF-ALL,ELF-XNACK-GFX801 %s +# RUN: llvm-readobj -S --file-headers %t.o.2 | FileCheck --check-prefixes=ELF-ALL,ELF-XNACK-GFX801 %s # RUN: obj2yaml %t.o.2 | FileCheck --check-prefixes=YAML-XNACK-GFX801 %s # ELF-ALL: Flags [ diff --git a/llvm/test/Object/AMDGPU/elf-header-osabi.yaml b/llvm/test/Object/AMDGPU/elf-header-osabi.yaml index 942515c2c13..b22c1976fc1 100644 --- a/llvm/test/Object/AMDGPU/elf-header-osabi.yaml +++ b/llvm/test/Object/AMDGPU/elf-header-osabi.yaml @@ -1,11 +1,11 @@ # RUN: yaml2obj -docnum=1 %s > %t.o.1 -# RUN: llvm-readobj -s -file-headers %t.o.1 | FileCheck --check-prefixes=ELF-HSA %s +# RUN: llvm-readobj -S --file-headers %t.o.1 | FileCheck --check-prefixes=ELF-HSA %s # RUN: obj2yaml %t.o.1 | FileCheck --check-prefixes=YAML-HSA %s # RUN: yaml2obj -docnum=2 %s > %t.o.2 -# RUN: llvm-readobj -s -file-headers %t.o.2 | FileCheck --check-prefixes=ELF-PAL %s +# RUN: llvm-readobj -S --file-headers %t.o.2 | FileCheck --check-prefixes=ELF-PAL %s # RUN: obj2yaml %t.o.2 | FileCheck --check-prefixes=YAML-PAL %s # RUN: yaml2obj -docnum=3 %s > %t.o.3 -# RUN: llvm-readobj -s -file-headers %t.o.3 | FileCheck --check-prefixes=ELF-MESA3D %s +# RUN: llvm-readobj -S --file-headers %t.o.3 | FileCheck --check-prefixes=ELF-MESA3D %s # RUN: obj2yaml %t.o.3 | FileCheck --check-prefixes=YAML-MESA3D %s # ELF-HSA: OS/ABI: AMDGPU_HSA (0x40) diff --git a/llvm/test/Object/AMDGPU/elf32-unknown.yaml b/llvm/test/Object/AMDGPU/elf32-unknown.yaml index c4305950607..27283b895e7 100644 --- a/llvm/test/Object/AMDGPU/elf32-unknown.yaml +++ b/llvm/test/Object/AMDGPU/elf32-unknown.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s > %t.o -# RUN: llvm-readobj -s -file-headers %t.o | FileCheck %s +# RUN: llvm-readobj -S --file-headers %t.o | FileCheck %s # CHECK: Format: ELF32-amdgpu diff --git a/llvm/test/Object/AMDGPU/elf64-unknown.yaml b/llvm/test/Object/AMDGPU/elf64-unknown.yaml index 600eb7442d5..d54a50d1c85 100644 --- a/llvm/test/Object/AMDGPU/elf64-unknown.yaml +++ b/llvm/test/Object/AMDGPU/elf64-unknown.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s > %t.o -# RUN: llvm-readobj -s -file-headers %t.o | FileCheck %s +# RUN: llvm-readobj -S --file-headers %t.o | FileCheck %s # CHECK: Format: ELF64-amdgpu diff --git a/llvm/test/Object/Mips/abi-flags.yaml b/llvm/test/Object/Mips/abi-flags.yaml index cdfaebe6e70..b5142fd3303 100644 --- a/llvm/test/Object/Mips/abi-flags.yaml +++ b/llvm/test/Object/Mips/abi-flags.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-readobj -mips-abi-flags %t | FileCheck -check-prefix=OBJ %s +# RUN: llvm-readobj --mips-abi-flags %t | FileCheck -check-prefix=OBJ %s # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s # OBJ: MIPS ABI Flags { diff --git a/llvm/test/Object/Mips/elf-abi.yaml b/llvm/test/Object/Mips/elf-abi.yaml index ceb64a38700..7914dcba35f 100644 --- a/llvm/test/Object/Mips/elf-abi.yaml +++ b/llvm/test/Object/Mips/elf-abi.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj -docnum=1 %s > %t.o32 -# RUN: llvm-readobj -file-headers %t.o32 | FileCheck -check-prefix=O32OBJ %s +# RUN: llvm-readobj --file-headers %t.o32 | FileCheck -check-prefix=O32OBJ %s # RUN: obj2yaml %t.o32 | FileCheck -check-prefix=O32YAML %s # O32OBJ: Flags [ (0x50001002) @@ -11,7 +11,7 @@ # O32YAML: Flags: [ EF_MIPS_PIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ] # RUN: yaml2obj -docnum=2 %s > %t.o64 -# RUN: llvm-readobj -file-headers %t.o64 | FileCheck -check-prefix=O64OBJ %s +# RUN: llvm-readobj --file-headers %t.o64 | FileCheck -check-prefix=O64OBJ %s # RUN: obj2yaml %t.o64 | FileCheck -check-prefix=O64YAML %s # O64OBJ: Flags [ (0x60002002) @@ -23,7 +23,7 @@ # O64YAML: Flags: [ EF_MIPS_PIC, EF_MIPS_ABI_O64, EF_MIPS_ARCH_64 ] # RUN: yaml2obj -docnum=3 %s > %t.eabi32 -# RUN: llvm-readobj -file-headers %t.eabi32 | FileCheck -check-prefix=E32OBJ %s +# RUN: llvm-readobj --file-headers %t.eabi32 | FileCheck -check-prefix=E32OBJ %s # RUN: obj2yaml %t.eabi32 | FileCheck -check-prefix=E32YAML %s # E32OBJ: Flags [ (0x50003002) @@ -35,7 +35,7 @@ # E32YAML: Flags: [ EF_MIPS_PIC, EF_MIPS_ABI_EABI32, EF_MIPS_ARCH_32 ] # RUN: yaml2obj -docnum=4 %s > %t.eabi64 -# RUN: llvm-readobj -file-headers %t.eabi64 | FileCheck -check-prefix=E64OBJ %s +# RUN: llvm-readobj --file-headers %t.eabi64 | FileCheck -check-prefix=E64OBJ %s # RUN: obj2yaml %t.eabi64 | FileCheck -check-prefix=E64YAML %s # E64OBJ: Flags [ (0x60004002) diff --git a/llvm/test/Object/Mips/elf-flags.yaml b/llvm/test/Object/Mips/elf-flags.yaml index ad71f343f02..97b3f0aefa2 100644 --- a/llvm/test/Object/Mips/elf-flags.yaml +++ b/llvm/test/Object/Mips/elf-flags.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-readobj -file-headers %t | FileCheck -check-prefix=OBJ %s +# RUN: llvm-readobj --file-headers %t | FileCheck -check-prefix=OBJ %s # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s # OBJ: Flags [ (0x9E8B1727) diff --git a/llvm/test/Object/RISCV/elf-flags.yaml b/llvm/test/Object/RISCV/elf-flags.yaml index ff8637f000a..24c8e6c26d6 100644 --- a/llvm/test/Object/RISCV/elf-flags.yaml +++ b/llvm/test/Object/RISCV/elf-flags.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-readobj -file-headers %t | FileCheck -check-prefix=OBJ %s +# RUN: llvm-readobj --file-headers %t | FileCheck -check-prefix=OBJ %s # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s # OBJ: Flags [ (0xD) diff --git a/llvm/test/Object/coff-empty-drectve.test b/llvm/test/Object/coff-empty-drectve.test index f76d7bf7271..c1d3f6419b4 100644 --- a/llvm/test/Object/coff-empty-drectve.test +++ b/llvm/test/Object/coff-empty-drectve.test @@ -1,3 +1,3 @@ -RUN: yaml2obj %p/Inputs/COFF/empty-drectve.yaml | llvm-readobj -coff-directives - | FileCheck %s +RUN: yaml2obj %p/Inputs/COFF/empty-drectve.yaml | llvm-readobj --coff-directives - | FileCheck %s CHECK: Directive(s): {{$}} diff --git a/llvm/test/Object/coff-invalid.test b/llvm/test/Object/coff-invalid.test index b85543dcfe8..3ab3f41b15f 100644 --- a/llvm/test/Object/coff-invalid.test +++ b/llvm/test/Object/coff-invalid.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -s %p/Inputs/invalid-bad-section-address.coff 2>&1 | \ +RUN: llvm-readobj -S %p/Inputs/invalid-bad-section-address.coff 2>&1 | \ RUN: FileCheck --check-prefix=SECTIONS %s SECTIONS: Section { diff --git a/llvm/test/Object/corrupt.test b/llvm/test/Object/corrupt.test index 82a581f486f..35623b431b7 100644 --- a/llvm/test/Object/corrupt.test +++ b/llvm/test/Object/corrupt.test @@ -27,45 +27,45 @@ VER: error: Invalid version entry // The file is missing the dynamic string table but has references to it. -RUN: not llvm-readobj -dynamic-table %p/Inputs/corrupt-invalid-strtab.elf.x86-64 \ +RUN: not llvm-readobj --dynamic-table %p/Inputs/corrupt-invalid-strtab.elf.x86-64 \ RUN: 2>&1 | FileCheck --check-prefix=STRTAB %s STRTAB: Invalid dynamic string table reference -RUN: not llvm-readobj -program-headers \ +RUN: not llvm-readobj -l \ RUN: %p/Inputs/corrupt-invalid-phentsize.elf.x86-64 2>&1 | \ RUN: FileCheck --check-prefix=PHENTSIZE %s PHENTSIZE: invalid e_phentsize -RUN: not llvm-readobj -dynamic-table \ +RUN: not llvm-readobj --dynamic-table \ RUN: %p/Inputs/corrupt-invalid-virtual-addr.elf.x86-64 2>&1 | \ RUN: FileCheck --check-prefix=VIRTADDR %s VIRTADDR: Virtual address is not in any segment -RUN: not llvm-readobj -dyn-relocations \ +RUN: not llvm-readobj --dyn-relocations \ RUN: %p/Inputs/corrupt-invalid-relocation-size.elf.x86-64 2>&1 | \ RUN: FileCheck --check-prefix=RELOC %s RELOC: Invalid entity size -RUN: not llvm-readobj -dyn-relocations \ +RUN: not llvm-readobj --dyn-relocations \ RUN: %p/Inputs/corrupt-invalid-dynamic-table-size.elf.x86-64 2>&1 | \ RUN: FileCheck --check-prefix=DYN-TABLE-SIZE %s DYN-TABLE-SIZE: Invalid entity size -RUN: not llvm-readobj -dyn-relocations \ +RUN: not llvm-readobj --dyn-relocations \ RUN: %p/Inputs/corrupt-invalid-dynamic-table-offset.elf.x86-64 2>&1 | \ RUN: FileCheck --check-prefix=DYN-TABLE-OFFSET %s DYN-TABLE-OFFSET: error: Invalid data was encountered while parsing the file -RUN: not llvm-readobj -dyn-relocations \ +RUN: not llvm-readobj --dyn-relocations \ RUN: %p/Inputs/corrupt-invalid-dynamic-table-too-large.elf.x86-64 2>&1 | \ RUN: FileCheck --check-prefix=DYN-TABLE-TOO-LARGE %s diff --git a/llvm/test/Object/dyn-rel-relocation.test b/llvm/test/Object/dyn-rel-relocation.test index 4b528a7ef91..9b563f36e6c 100644 --- a/llvm/test/Object/dyn-rel-relocation.test +++ b/llvm/test/Object/dyn-rel-relocation.test @@ -1,4 +1,4 @@ -// Check that 'llvm-readobj -dyn-relocations' shows dynamic relocations +// Check that 'llvm-readobj --dyn-relocations' shows dynamic relocations // if they have REL record format. // dyn-rel.so.elf-mips @@ -23,7 +23,7 @@ // % llvm-mc -filetype=obj -triple=mips-unknown-linux -o test.o test.s // % ld -m elf32btsmip -shared -o dyn-rel.so.elf-mips test.o -RUN: llvm-readobj -relocations -dyn-relocations -expand-relocs \ +RUN: llvm-readobj -r --dyn-relocations --expand-relocs \ RUN: %p/Inputs/dyn-rel.so.elf-mips | FileCheck %s // CHECK: Relocations [ diff --git a/llvm/test/Object/elf-unknown-type.test b/llvm/test/Object/elf-unknown-type.test index 1ef4f58085d..508e831ae90 100644 --- a/llvm/test/Object/elf-unknown-type.test +++ b/llvm/test/Object/elf-unknown-type.test @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -file-headers - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --file-headers - | FileCheck %s !ELF FileHeader: !FileHeader diff --git a/llvm/test/Object/invalid.test b/llvm/test/Object/invalid.test index a2650b88335..1283c23ccc4 100644 --- a/llvm/test/Object/invalid.test +++ b/llvm/test/Object/invalid.test @@ -10,7 +10,7 @@ RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-non-null.elf 2>&1 | FileCheck NON-NULL: Invalid data was encountered while parsing the file Test the sh_entsize are invalid -RUN: llvm-readobj -s %p/Inputs/invalid-sh_entsize.elf | FileCheck --check-prefix=SECTION %s +RUN: llvm-readobj -S %p/Inputs/invalid-sh_entsize.elf | FileCheck --check-prefix=SECTION %s SECTION: Name: .dynsym SECTION-NEXT: Type: SHT_DYNSYM @@ -46,7 +46,7 @@ INVALID-DYNSYM-SIZE: Invalid entity size RUN: not llvm-readobj -t %p/Inputs/invalid-section-index.elf 2>&1 | FileCheck --check-prefix=INVALID-SECTION-INDEX %s INVALID-SECTION-INDEX: invalid section index -RUN: not llvm-readobj -s %p/Inputs/invalid-section-size.elf 2>&1 | FileCheck --check-prefix=INVALID-SECTION-SIZE %s +RUN: not llvm-readobj -S %p/Inputs/invalid-section-size.elf 2>&1 | FileCheck --check-prefix=INVALID-SECTION-SIZE %s INVALID-SECTION-SIZE: invalid section header entry size (e_shentsize) in ELF header diff --git a/llvm/test/Object/obj2yaml-sectiongroup.test b/llvm/test/Object/obj2yaml-sectiongroup.test index 2387c75494f..29492a00e79 100644 --- a/llvm/test/Object/obj2yaml-sectiongroup.test +++ b/llvm/test/Object/obj2yaml-sectiongroup.test @@ -2,7 +2,7 @@ RUN: obj2yaml %p/Inputs/sectionGroup.elf.x86-64 > %t1.sectiongroup.yaml RUN: FileCheck %s --check-prefix ELF-GROUP < %t1.sectiongroup.yaml RUN: yaml2obj %t1.sectiongroup.yaml -o %t2.o.elf -RUN: llvm-readobj -sections %t2.o.elf | FileCheck %s -check-prefix=SECTIONS +RUN: llvm-readobj --sections %t2.o.elf | FileCheck %s -check-prefix=SECTIONS #ELF-GROUP: - Name: .group #ELF-GROUP: Type: SHT_GROUP #ELF-GROUP: Link: .symtab diff --git a/llvm/test/Object/readobj-absent.test b/llvm/test/Object/readobj-absent.test index 0968f3c3102..b35b55e140f 100644 --- a/llvm/test/Object/readobj-absent.test +++ b/llvm/test/Object/readobj-absent.test @@ -1,2 +1,2 @@ // Don't crash if required information is absent -RUN: llvm-readobj -dyn-symbols %p/Inputs/trivial-object-test.elf-x86-64 +RUN: llvm-readobj --dyn-syms %p/Inputs/trivial-object-test.elf-x86-64 diff --git a/llvm/test/Object/readobj-elf-versioning.test b/llvm/test/Object/readobj-elf-versioning.test index 40852877457..d5361c2d9fc 100644 --- a/llvm/test/Object/readobj-elf-versioning.test +++ b/llvm/test/Object/readobj-elf-versioning.test @@ -1,10 +1,10 @@ -RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.i386 \ +RUN: llvm-readobj --dyn-syms %p/Inputs/elf-versioning-test.i386 \ RUN: | FileCheck %s -check-prefix ELF -RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.i386 \ +RUN: llvm-readobj --dyn-syms %p/Inputs/elf-versioning-test.i386 \ RUN: | FileCheck %s -check-prefix ELF32 -RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.x86_64 \ +RUN: llvm-readobj --dyn-syms %p/Inputs/elf-versioning-test.x86_64 \ RUN: | FileCheck %s -check-prefix ELF -RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.x86_64 \ +RUN: llvm-readobj --dyn-syms %p/Inputs/elf-versioning-test.x86_64 \ RUN: | FileCheck %s -check-prefix ELF64 ELF: DynamicSymbols [ diff --git a/llvm/test/Object/readobj-shared-object.test b/llvm/test/Object/readobj-shared-object.test index da594af799e..ab4c71220a2 100644 --- a/llvm/test/Object/readobj-shared-object.test +++ b/llvm/test/Object/readobj-shared-object.test @@ -1,14 +1,14 @@ -RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \ +RUN: llvm-readobj -S -t --dyn-syms --dynamic-table --needed-libs \ RUN: %p/Inputs/shared-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF -RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \ +RUN: llvm-readobj -S -t --dyn-syms --dynamic-table --needed-libs \ RUN: %p/Inputs/shared-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF32 -RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \ +RUN: llvm-readobj -S -t --dyn-syms --dynamic-table --needed-libs \ RUN: %p/Inputs/shared-object-test.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF -RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \ +RUN: llvm-readobj -S -t --dyn-syms --dynamic-table --needed-libs \ RUN: %p/Inputs/shared-object-test.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF64 diff --git a/llvm/test/Object/relocation-executable.test b/llvm/test/Object/relocation-executable.test index bb0bb157b6a..d0a1783fc52 100644 --- a/llvm/test/Object/relocation-executable.test +++ b/llvm/test/Object/relocation-executable.test @@ -1,6 +1,6 @@ -RUN: llvm-readobj -r -expand-relocs %p/Inputs/hello-world.elf-x86-64 \ +RUN: llvm-readobj -r --expand-relocs %p/Inputs/hello-world.elf-x86-64 \ RUN: | FileCheck %s -RUN: llvm-readobj -dyn-relocations -expand-relocs \ +RUN: llvm-readobj --dyn-relocations --expand-relocs \ RUN: %p/Inputs/hello-world.elf-x86-64 | FileCheck %s --check-prefix=DYN // CHECK: Relocations [ @@ -48,7 +48,7 @@ RUN: %p/Inputs/hello-world.elf-x86-64 | FileCheck %s --check-prefix=DYN // DYN-NEXT: } // DYN-NEXT: } -RUN: llvm-readobj -dyn-relocations -expand-relocs \ +RUN: llvm-readobj --dyn-relocations --expand-relocs \ RUN: %p/Inputs/rel-no-sec-table.elf-x86-64 | FileCheck %s --check-prefix=DYN2 // DYN2: Dynamic Relocations { diff --git a/llvm/test/Object/stackmap-dump.test b/llvm/test/Object/stackmap-dump.test index a121bc3ce22..0d9b23af2ca 100644 --- a/llvm/test/Object/stackmap-dump.test +++ b/llvm/test/Object/stackmap-dump.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -stackmap %p/Inputs/stackmap-test.macho-x86-64 | FileCheck %s +RUN: llvm-readobj --stackmap %p/Inputs/stackmap-test.macho-x86-64 | FileCheck %s ; Note: the macho object file in this test was generated in the following way: ; llc -mtriple=x86_64-apple-darwin test/CodeGen/X86/stackmap.ll -o test/Object/Inputs/stackmap-test.macho-x86-64 -filetype=obj diff --git a/llvm/test/Object/yaml2obj-coff-multi-doc.test b/llvm/test/Object/yaml2obj-coff-multi-doc.test index 0335a72bfcf..03dc910852f 100644 --- a/llvm/test/Object/yaml2obj-coff-multi-doc.test +++ b/llvm/test/Object/yaml2obj-coff-multi-doc.test @@ -1,7 +1,7 @@ # RUN: yaml2obj -docnum=1 %s \ -# RUN: | llvm-readobj -symbols - | FileCheck -check-prefix=DOC1 %s +# RUN: | llvm-readobj --symbols - | FileCheck -check-prefix=DOC1 %s # RUN: yaml2obj -docnum=2 %s \ -# RUN: | llvm-readobj -symbols - | FileCheck -check-prefix=DOC2 %s +# RUN: | llvm-readobj --symbols - | FileCheck -check-prefix=DOC2 %s # RUN: not yaml2obj -docnum=3 %s 2>&1 \ # RUN: | FileCheck -check-prefix=DOC3 %s diff --git a/llvm/test/Object/yaml2obj-elf-alignment.yaml b/llvm/test/Object/yaml2obj-elf-alignment.yaml index d626849af2c..5921ecf9f11 100644 --- a/llvm/test/Object/yaml2obj-elf-alignment.yaml +++ b/llvm/test/Object/yaml2obj-elf-alignment.yaml @@ -1,7 +1,7 @@ # Check that yaml2obj takes in account section AddressAlign field. # RUN: yaml2obj %s > %t -# RUN: llvm-readobj -s %t | FileCheck %s +# RUN: llvm-readobj -S %t | FileCheck %s # CHECK: Section { # CHECK: Index: 2 diff --git a/llvm/test/Object/yaml2obj-elf-bits-endian.test b/llvm/test/Object/yaml2obj-elf-bits-endian.test index e8bd2f1d8d1..b0c6ca1ce64 100644 --- a/llvm/test/Object/yaml2obj-elf-bits-endian.test +++ b/llvm/test/Object/yaml2obj-elf-bits-endian.test @@ -1,7 +1,7 @@ -RUN: yaml2obj %p/Inputs/ELF/LE64.yaml | llvm-readobj -file-headers - | FileCheck %s --check-prefix LE64 -RUN: yaml2obj %p/Inputs/ELF/BE64.yaml | llvm-readobj -file-headers - | FileCheck %s --check-prefix BE64 -RUN: yaml2obj %p/Inputs/ELF/LE32.yaml | llvm-readobj -file-headers - | FileCheck %s --check-prefix LE32 -RUN: yaml2obj %p/Inputs/ELF/BE32.yaml | llvm-readobj -file-headers - | FileCheck %s --check-prefix BE32 +RUN: yaml2obj %p/Inputs/ELF/LE64.yaml | llvm-readobj --file-headers - | FileCheck %s --check-prefix LE64 +RUN: yaml2obj %p/Inputs/ELF/BE64.yaml | llvm-readobj --file-headers - | FileCheck %s --check-prefix BE64 +RUN: yaml2obj %p/Inputs/ELF/LE32.yaml | llvm-readobj --file-headers - | FileCheck %s --check-prefix LE32 +RUN: yaml2obj %p/Inputs/ELF/BE32.yaml | llvm-readobj --file-headers - | FileCheck %s --check-prefix BE32 LE64: Class: 64-bit (0x2) LE64-NEXT: DataEncoding: LittleEndian (0x1) diff --git a/llvm/test/Object/yaml2obj-elf-file-headers-with-e_flags.yaml b/llvm/test/Object/yaml2obj-elf-file-headers-with-e_flags.yaml index ad032e80d64..a5016101c6e 100644 --- a/llvm/test/Object/yaml2obj-elf-file-headers-with-e_flags.yaml +++ b/llvm/test/Object/yaml2obj-elf-file-headers-with-e_flags.yaml @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -file-headers - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --file-headers - | FileCheck %s !ELF FileHeader: Class: ELFCLASS32 diff --git a/llvm/test/Object/yaml2obj-elf-file-headers.yaml b/llvm/test/Object/yaml2obj-elf-file-headers.yaml index 4dfee5f9387..4558078b5d9 100644 --- a/llvm/test/Object/yaml2obj-elf-file-headers.yaml +++ b/llvm/test/Object/yaml2obj-elf-file-headers.yaml @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -file-headers - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --file-headers - | FileCheck %s !ELF FileHeader: Class: ELFCLASS64 diff --git a/llvm/test/Object/yaml2obj-elf-multi-doc.test b/llvm/test/Object/yaml2obj-elf-multi-doc.test index be298d1cdc7..2e16d7d687b 100644 --- a/llvm/test/Object/yaml2obj-elf-multi-doc.test +++ b/llvm/test/Object/yaml2obj-elf-multi-doc.test @@ -1,7 +1,7 @@ # RUN: yaml2obj -docnum=1 %s \ -# RUN: | llvm-readobj -symbols - | FileCheck -check-prefix=DOC1 %s +# RUN: | llvm-readobj --symbols - | FileCheck -check-prefix=DOC1 %s # RUN: yaml2obj -docnum=2 %s \ -# RUN: | llvm-readobj -symbols - | FileCheck -check-prefix=DOC2 %s +# RUN: | llvm-readobj --symbols - | FileCheck -check-prefix=DOC2 %s # RUN: not yaml2obj -docnum=3 %s 2>&1 \ # RUN: | FileCheck -check-prefix=DOC3 %s diff --git a/llvm/test/Object/yaml2obj-elf-rel-noref.yaml b/llvm/test/Object/yaml2obj-elf-rel-noref.yaml index 41674494c93..904ec0e28f0 100644 --- a/llvm/test/Object/yaml2obj-elf-rel-noref.yaml +++ b/llvm/test/Object/yaml2obj-elf-rel-noref.yaml @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -sections -relocations - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --sections -r - | FileCheck %s !ELF FileHeader: !FielHeader diff --git a/llvm/test/Object/yaml2obj-elf-rel.yaml b/llvm/test/Object/yaml2obj-elf-rel.yaml index b84d5b85bee..14e7f9effaf 100644 --- a/llvm/test/Object/yaml2obj-elf-rel.yaml +++ b/llvm/test/Object/yaml2obj-elf-rel.yaml @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -sections -relocations - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --sections -r - | FileCheck %s !ELF FileHeader: !FileHeader diff --git a/llvm/test/Object/yaml2obj-elf-section-basic.yaml b/llvm/test/Object/yaml2obj-elf-section-basic.yaml index c2dde8c26ff..6e03bb05b70 100644 --- a/llvm/test/Object/yaml2obj-elf-section-basic.yaml +++ b/llvm/test/Object/yaml2obj-elf-section-basic.yaml @@ -1,6 +1,6 @@ -# RUN: yaml2obj %s | llvm-readobj -sections -section-data - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --sections --section-data - | FileCheck %s # RUN: yaml2obj -o %t %s -# RUN: llvm-readobj -sections -section-data %t | FileCheck %s +# RUN: llvm-readobj --sections --section-data %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/Object/yaml2obj-elf-symbol-LocalGlobalWeak.yaml b/llvm/test/Object/yaml2obj-elf-symbol-LocalGlobalWeak.yaml index 62101b32f2a..47162e76c2d 100644 --- a/llvm/test/Object/yaml2obj-elf-symbol-LocalGlobalWeak.yaml +++ b/llvm/test/Object/yaml2obj-elf-symbol-LocalGlobalWeak.yaml @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -symbols - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --symbols - | FileCheck %s !ELF FileHeader: Class: ELFCLASS64 diff --git a/llvm/test/Object/yaml2obj-elf-symbol-basic.yaml b/llvm/test/Object/yaml2obj-elf-symbol-basic.yaml index 05d9b44926c..007d7c8656d 100644 --- a/llvm/test/Object/yaml2obj-elf-symbol-basic.yaml +++ b/llvm/test/Object/yaml2obj-elf-symbol-basic.yaml @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -symbols - | FileCheck %s +# RUN: yaml2obj %s | llvm-readobj --symbols - | FileCheck %s !ELF FileHeader: Class: ELFCLASS64 diff --git a/llvm/test/Object/yaml2obj-elf-symbol-visibility.yaml b/llvm/test/Object/yaml2obj-elf-symbol-visibility.yaml index e37656c7d4d..935b9443933 100644 --- a/llvm/test/Object/yaml2obj-elf-symbol-visibility.yaml +++ b/llvm/test/Object/yaml2obj-elf-symbol-visibility.yaml @@ -1,4 +1,4 @@ -# RUN: yaml2obj %s | llvm-readobj -symbols - | \ +# RUN: yaml2obj %s | llvm-readobj --symbols - | \ # RUN: FileCheck --check-prefix OBJ %s # RUN: yaml2obj %s | obj2yaml - | FileCheck --check-prefix YAML %s diff --git a/llvm/test/Object/yaml2obj-readobj.test b/llvm/test/Object/yaml2obj-readobj.test index e7ee2a016a4..c1110a0fd05 100644 --- a/llvm/test/Object/yaml2obj-readobj.test +++ b/llvm/test/Object/yaml2obj-readobj.test @@ -1,6 +1,6 @@ -RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-readobj -file-headers -relocations -expand-relocs - | FileCheck %s --check-prefix COFF-I386 +RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-readobj --file-headers -r --expand-relocs - | FileCheck %s --check-prefix COFF-I386 RUN: yaml2obj -o %t %p/Inputs/COFF/i386.yaml -RUN: llvm-readobj -file-headers -relocations -expand-relocs %t \ +RUN: llvm-readobj --file-headers -r --expand-relocs %t \ RUN: | FileCheck %s --check-prefix COFF-I386 // COFF-I386: Characteristics [ (0x200) diff --git a/llvm/test/ObjectYAML/ELF/shf-compressed.yaml b/llvm/test/ObjectYAML/ELF/shf-compressed.yaml index becad6407a9..b7655aaea70 100644 --- a/llvm/test/ObjectYAML/ELF/shf-compressed.yaml +++ b/llvm/test/ObjectYAML/ELF/shf-compressed.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck -check-prefix=OBJ %s +# RUN: llvm-readobj --sections %t | FileCheck -check-prefix=OBJ %s # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s --- !ELF diff --git a/llvm/test/Support/check-default-options.txt b/llvm/test/Support/check-default-options.txt index 403092ec5c5..a8870baa544 100644 --- a/llvm/test/Support/check-default-options.txt +++ b/llvm/test/Support/check-default-options.txt @@ -1,8 +1,8 @@ -# RUN: llvm-objdump -help-hidden %t | FileCheck --check-prefix=CHECK-OBJDUMP %s -# RUN: llvm-readobj -help-hidden %t | FileCheck --check-prefix=CHECK-READOBJ %s -# RUN: llvm-tblgen -help-hidden %t | FileCheck --check-prefix=CHECK-TBLGEN %s -# RUN: llvm-opt-report -help-hidden %t | FileCheck --check-prefix=CHECK-OPT-RPT %s -# RUN: llvm-dwarfdump -help-hidden %t | FileCheck --check-prefix=CHECK-DWARF %s +# RUN: llvm-objdump --help-hidden %t | FileCheck --check-prefix=CHECK-OBJDUMP %s +# RUN: llvm-readobj --help-hidden %t | FileCheck --check-prefix=CHECK-READOBJ %s +# RUN: llvm-tblgen --help-hidden %t | FileCheck --check-prefix=CHECK-TBLGEN %s +# RUN: llvm-opt-report --help-hidden %t | FileCheck --check-prefix=CHECK-OPT-RPT %s +# RUN: llvm-dwarfdump --help-hidden %t | FileCheck --check-prefix=CHECK-DWARF %s # RUN: llvm-dwarfdump -h %t | FileCheck --check-prefix=CHECK-DWARF-H %s diff --git a/llvm/test/tools/dsymutil/X86/dsym-companion.test b/llvm/test/tools/dsymutil/X86/dsym-companion.test index 8f16bf74fd1..fa9df3950a2 100644 --- a/llvm/test/tools/dsymutil/X86/dsym-companion.test +++ b/llvm/test/tools/dsymutil/X86/dsym-companion.test @@ -1,5 +1,5 @@ -RUN: dsymutil -o - %p/../Inputs/basic.macho.i386 -f | llvm-readobj -file-headers -program-headers -sections -symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK32 -RUN: dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -f | llvm-readobj -file-headers -program-headers -sections -symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK64 +RUN: dsymutil -o - %p/../Inputs/basic.macho.i386 -f | llvm-readobj --file-headers -l -S --symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK32 +RUN: dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -f | llvm-readobj --file-headers -l -S --symbols - | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK64 This test checks that the dSYM companion binaries generated in 32 and 64 bits are correct. The check are pretty strict (we check even the offsets and sizes diff --git a/llvm/test/tools/dsymutil/X86/minimize.test b/llvm/test/tools/dsymutil/X86/minimize.test index d4e8de5e464..4e2d5b56839 100644 --- a/llvm/test/tools/dsymutil/X86/minimize.test +++ b/llvm/test/tools/dsymutil/X86/minimize.test @@ -1,6 +1,6 @@ -RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s --check-prefix=FULL -RUN: dsymutil --minimize -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s -RUN: dsymutil -z -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj -sections - | FileCheck %s +RUN: dsymutil -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj --sections - | FileCheck %s --check-prefix=FULL +RUN: dsymutil --minimize -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj --sections - | FileCheck %s +RUN: dsymutil -z -f -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-readobj --sections - | FileCheck %s FULL: Name: __debug_pubnames FULL: Name: __debug_pubtypes diff --git a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test index e124a9d5b4d..55fe2c314a6 100644 --- a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test +++ b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test @@ -1,5 +1,5 @@ RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64 -o %T/swift-ast.dSYM -verbose -no-swiftmodule-timestamp | FileCheck %s --check-prefix=DSYMUTIL -RUN: llvm-readobj -sections -section-data %T/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck %s --check-prefix=READOBJ +RUN: llvm-readobj --sections --section-data %T/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck %s --check-prefix=READOBJ The tested object file has been created by the dummy Swift code: let x = 1 diff --git a/llvm/test/tools/gold/X86/multiple-data.s b/llvm/test/tools/gold/X86/multiple-data.s index eb46776e5ae..0601c32fb8a 100644 --- a/llvm/test/tools/gold/X86/multiple-data.s +++ b/llvm/test/tools/gold/X86/multiple-data.s @@ -7,7 +7,7 @@ # RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \ # RUN: -m elf_x86_64 -o %t.exe %t2.o %t.o \ # RUN: --section-ordering-file=%t_order_lto.txt -# RUN: llvm-readobj -elf-output-style=GNU -t %t.exe | FileCheck %s +# RUN: llvm-readelf -t %t.exe | FileCheck %s # CHECK-DAG: 00000000004010fc 4 OBJECT GLOBAL DEFAULT 2 dipsy # CHECK-DAG: 00000000004010f8 4 OBJECT GLOBAL DEFAULT 2 tin diff --git a/llvm/test/tools/gold/X86/multiple-sections.ll b/llvm/test/tools/gold/X86/multiple-sections.ll index 61ab291e6cd..21f0b988a61 100644 --- a/llvm/test/tools/gold/X86/multiple-sections.ll +++ b/llvm/test/tools/gold/X86/multiple-sections.ll @@ -5,7 +5,7 @@ ; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \ ; RUN: -m elf_x86_64 -o %t.exe %t.o \ ; RUN: --section-ordering-file=%t_order_lto.txt -; RUN: llvm-readobj -elf-output-style=GNU -t %t.exe | FileCheck %s +; RUN: llvm-readelf -t %t.exe | FileCheck %s ; Check that the order of the sections is tin -> _start -> pat. diff --git a/llvm/test/tools/gold/X86/relocatable.ll b/llvm/test/tools/gold/X86/relocatable.ll index cc4d020a78c..1ca81f1ea2e 100644 --- a/llvm/test/tools/gold/X86/relocatable.ll +++ b/llvm/test/tools/gold/X86/relocatable.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as %s -o %t1.o ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \ ; RUN: -r %t1.o -o %t -; RUN: llvm-readobj -symbols %t | FileCheck %s +; RUN: llvm-readobj --symbols %t | FileCheck %s ; CHECK: Symbol { ; CHECK: Name: foo diff --git a/llvm/test/tools/llvm-cvtres/combined.test b/llvm/test/tools/llvm-cvtres/combined.test index b1dcf91e6d9..41e64661d9e 100644 --- a/llvm/test/tools/llvm-cvtres/combined.test +++ b/llvm/test/tools/llvm-cvtres/combined.test @@ -9,7 +9,7 @@ // languages.res test_resource.res RUN: llvm-cvtres /verbose /out:%t %p/Inputs/languages.res %p/Inputs/test_resource.res -RUN: llvm-readobj -coff-resources -section-data %t | FileCheck %s +RUN: llvm-readobj --coff-resources --section-data %t | FileCheck %s CHECK: Resources [ CHECK-NEXT: Total Number of Resources: 12 diff --git a/llvm/test/tools/llvm-cvtres/machine.test b/llvm/test/tools/llvm-cvtres/machine.test index 5ce6cbaf697..aacc8c554c1 100644 --- a/llvm/test/tools/llvm-cvtres/machine.test +++ b/llvm/test/tools/llvm-cvtres/machine.test @@ -14,16 +14,16 @@ // test_resource.res RUN: llvm-cvtres /machine:X86 /out:%t %p/Inputs/test_resource.res -RUN: llvm-readobj -h -relocations %t | FileCheck %s -check-prefix=X86 +RUN: llvm-readobj -h -r %t | FileCheck %s -check-prefix=X86 RUN: llvm-cvtres /machine:X64 /out:%t %p/Inputs/test_resource.res -RUN: llvm-readobj -h -relocations %t | FileCheck %s -check-prefix=X64 +RUN: llvm-readobj -h -r %t | FileCheck %s -check-prefix=X64 RUN: llvm-cvtres /machine:ARM /out:%t %p/Inputs/test_resource.res -RUN: llvm-readobj -h -relocations %t | FileCheck %s -check-prefix=ARM +RUN: llvm-readobj -h -r %t | FileCheck %s -check-prefix=ARM RUN: llvm-cvtres /machine:ARM64 /out:%t %p/Inputs/test_resource.res -RUN: llvm-readobj -h -relocations %t | FileCheck %s -check-prefix=ARM64 +RUN: llvm-readobj -h -r %t | FileCheck %s -check-prefix=ARM64 X86: Machine: IMAGE_FILE_MACHINE_I386 (0x14C) X86-DAG: Relocations [ diff --git a/llvm/test/tools/llvm-cvtres/object.test b/llvm/test/tools/llvm-cvtres/object.test index a12beeeb327..74cdb66f14b 100644 --- a/llvm/test/tools/llvm-cvtres/object.test +++ b/llvm/test/tools/llvm-cvtres/object.test @@ -8,7 +8,7 @@ // test_resource.res RUN: llvm-cvtres /verbose /out:%t %p/Inputs/test_resource.res -RUN: llvm-readobj -coff-resources -section-data %t | FileCheck %s +RUN: llvm-readobj --coff-resources --section-data %t | FileCheck %s CHECK: Resources [ CHECK-NEXT: Total Number of Resources: 8 diff --git a/llvm/test/tools/llvm-cvtres/symbols.test b/llvm/test/tools/llvm-cvtres/symbols.test index 5af517707cd..08fbe80fefc 100644 --- a/llvm/test/tools/llvm-cvtres/symbols.test +++ b/llvm/test/tools/llvm-cvtres/symbols.test @@ -8,11 +8,11 @@ // test_resource.res RUN: llvm-cvtres /verbose /out:%t %p/Inputs/test_resource.res -RUN: llvm-readobj -symbols %t | FileCheck %s +RUN: llvm-readobj --symbols %t | FileCheck %s // Test that parameters can be preceded by '-' in addition to '/': RUN: llvm-cvtres -verbose -machine:X86 -out:%t %p/Inputs/test_resource.res -RUN: llvm-readobj -symbols %t | FileCheck %s +RUN: llvm-readobj --symbols %t | FileCheck %s CHECK: Name: $R000000 CHECK-NEXT: Value: 0 diff --git a/llvm/test/tools/llvm-dlltool/coff-exports.def b/llvm/test/tools/llvm-dlltool/coff-exports.def index 0656a44a0a1..78ca8801af2 100644 --- a/llvm/test/tools/llvm-dlltool/coff-exports.def +++ b/llvm/test/tools/llvm-dlltool/coff-exports.def @@ -1,7 +1,7 @@ ; RUN: llvm-dlltool -m i386:x86-64 --input-def %s --output-lib %t.a -; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s +; RUN: llvm-readobj --coff-exports %t.a | FileCheck %s ; RUN: llvm-dlltool -m arm64 --input-def %s --output-lib %t.a -; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s +; RUN: llvm-readobj --coff-exports %t.a | FileCheck %s LIBRARY test.dll EXPORTS diff --git a/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test b/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test index fd47d79739e..7afe4cddd61 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test +++ b/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test @@ -4,7 +4,7 @@ RUN: yaml2obj %p/Inputs/x86_64-exe.yaml > %t.in123.exe # showcase padding in CONTENTS below. RUN: llvm-objcopy --add-gnu-debuglink=%t.in123.exe %t.in123.exe %t.out.exe -RUN: llvm-readobj -sections %t.out.exe | FileCheck %s --check-prefix=SECTIONS +RUN: llvm-readobj --sections %t.out.exe | FileCheck %s --check-prefix=SECTIONS RUN: llvm-objdump -s %t.out.exe | FileCheck %s --check-prefix=CONTENTS # Show the last of the preexisting sections, which is used for choosing diff --git a/llvm/test/tools/llvm-objcopy/COFF/strip-all.test b/llvm/test/tools/llvm-objcopy/COFF/strip-all.test index 8a92ac61509..5e3ed9c4091 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/strip-all.test +++ b/llvm/test/tools/llvm-objcopy/COFF/strip-all.test @@ -4,7 +4,7 @@ # RUN: llvm-objcopy --strip-all %t.in.o %t.out.o # RUN: llvm-objdump -t %t.out.o | FileCheck %s --check-prefix=SYMBOLS -# RUN: llvm-readobj -relocs %t.out.o | FileCheck %s --check-prefix=RELOCS +# RUN: llvm-readobj -r %t.out.o | FileCheck %s --check-prefix=RELOCS # Test that -S, llvm-strip without arguments and --strip-all-gnu produces # output identical to --strip-all above. diff --git a/llvm/test/tools/llvm-objcopy/COFF/strip-symbol.test b/llvm/test/tools/llvm-objcopy/COFF/strip-symbol.test index 268b097255d..5eb64426179 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/strip-symbol.test +++ b/llvm/test/tools/llvm-objcopy/COFF/strip-symbol.test @@ -1,14 +1,14 @@ RUN: yaml2obj %p/Inputs/strip-symbols.yaml > %t.in.o -RUN: llvm-readobj -relocations %t.in.o | FileCheck %s --check-prefixes=RELOCS,RELOCS-PRE +RUN: llvm-readobj -r %t.in.o | FileCheck %s --check-prefixes=RELOCS,RELOCS-PRE RUN: llvm-objdump -t %t.in.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-PRE RUN: llvm-objcopy -N mainfunc %t.in.o %t.out.o -RUN: llvm-readobj -relocations %t.out.o | FileCheck %s --check-prefixes=RELOCS,RELOCS-POST +RUN: llvm-readobj -r %t.out.o | FileCheck %s --check-prefixes=RELOCS,RELOCS-POST RUN: llvm-objdump -t %t.out.o | FileCheck %s --check-prefix=SYMBOLS RUN: llvm-objcopy --strip-symbol mainfunc %t.in.o %t.out.o -RUN: llvm-readobj -relocations %t.out.o | FileCheck %s --check-prefixes=RELOCS,RELOCS-POST +RUN: llvm-readobj -r %t.out.o | FileCheck %s --check-prefixes=RELOCS,RELOCS-POST RUN: llvm-objdump -t %t.out.o | FileCheck %s --check-prefix=SYMBOLS Explicitly listing the relocations for the input as well, to show diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-default.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-default.test index 8ed887da3b0..02f0bb97f2c 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-default.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-default.test @@ -2,7 +2,7 @@ # RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o # RUN: llvm-objcopy --compress-debug-sections %t.o %t-compressed.o -# RUN: llvm-readobj -s %t-compressed.o | FileCheck %s +# RUN: llvm-readobj -S %t-compressed.o | FileCheck %s # CHECK: Name: .debug_foo # CHECK-NEXT: Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-groups.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-groups.test index a72ecbfc04c..e99cc0d7ee3 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-groups.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-groups.test @@ -7,22 +7,22 @@ ## Check compression of debug sections. # RUN: llvm-objcopy --compress-debug-sections %t.o %t-compressed.o -# RUN: llvm-readobj -s -elf-section-groups %t-compressed.o | \ +# RUN: llvm-readobj -S --elf-section-groups %t-compressed.o | \ # RUN: FileCheck %s --check-prefixes=CHECK,COMPRESS ## Check zlib-gnu compression of debug sections. # RUN: llvm-objcopy --compress-debug-sections=zlib-gnu %t.o %t-compressed-gnu.o -# RUN: llvm-readobj -s -elf-section-groups %t-compressed-gnu.o | \ +# RUN: llvm-readobj -S --elf-section-groups %t-compressed-gnu.o | \ # RUN: FileCheck %s --check-prefixes=CHECK,COMPRESSZLIB ## Check decompression of debug sections. # RUN: llvm-objcopy --decompress-debug-sections %t-compressed.o %t-decompressed.o -# RUN: llvm-readobj -elf-section-groups %t-decompressed.o | \ +# RUN: llvm-readobj --elf-section-groups %t-decompressed.o | \ # RUN: FileCheck %s --check-prefixes=CHECK,DECOMPRESS ## Check decompression of zlib-gnu debug sections. # RUN: llvm-objcopy --decompress-debug-sections %t-compressed-gnu.o %t-decompressed-gnu.o -# RUN: llvm-readobj -elf-section-groups %t-decompressed-gnu.o | \ +# RUN: llvm-readobj --elf-section-groups %t-decompressed-gnu.o | \ # RUN: FileCheck %s --check-prefixes=CHECK,DECOMPRESS # COMPRESSZLIB: Name: .zdebug_in_group diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-symbols.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-symbols.test index 1d6ac308d8f..969aa5973bf 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-symbols.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-symbols.test @@ -6,10 +6,10 @@ ## and it is placed into the right section. # RUN: llvm-objcopy --compress-debug-sections %t.o %t-compressed1.o -# RUN: llvm-readobj -symbols %t-compressed1.o | FileCheck %s --check-prefixes=CHECK,ZLIB +# RUN: llvm-readobj --symbols %t-compressed1.o | FileCheck %s --check-prefixes=CHECK,ZLIB # RUN: llvm-objcopy --compress-debug-sections=zlib-gnu %t.o %t-compressed2.o -# RUN: llvm-readobj -symbols %t-compressed2.o | FileCheck %s --check-prefixes=CHECK,ZLIBGNU +# RUN: llvm-readobj --symbols %t-compressed2.o | FileCheck %s --check-prefixes=CHECK,ZLIBGNU # CHECK: Name: .Linfo_string0 # CHECK-NEXT: Value: 0x0 diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test index 70eb2e8af50..2abd22e5781 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test @@ -6,9 +6,9 @@ # RUN: llvm-objdump -s %t.o --section=.debug_foo | FileCheck %s # RUN: llvm-objdump -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-COMPRESSED -# RUN: llvm-readobj --relocations -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS -# RUN: llvm-readobj --relocations -s %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER -# RUN: llvm-readobj --relocations -s %t.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-readobj --relocations -S %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS +# RUN: llvm-readobj --relocations -S %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-readobj --relocations -S %t.o | FileCheck %s --check-prefix=CHECK-HEADER # RUN: llvm-objdump -s %t-decompressed.o --section=.debug_foo | FileCheck %s # CHECK: .debug_foo: diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test index 0e7d713aebc..fb4919b6c9a 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test @@ -2,7 +2,7 @@ # RUN: yaml2obj %s -o %t1.o # RUN: llvm-objcopy --compress-debug-sections %t1.o %t2.o -# RUN: llvm-readobj -s %t2.o | FileCheck %s +# RUN: llvm-readobj -S %t2.o | FileCheck %s # Non-.zdebug* sections whose data does start with "ZLIB" should # not be considered as zlib-gnu compressed sections. diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test index d6c74295e26..374a8264af0 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test @@ -6,9 +6,9 @@ # RUN: llvm-objdump -s %t.o --section=.debug_foo | FileCheck %s # RUN: llvm-objdump -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-COMPRESSED -# RUN: llvm-readobj --relocations -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS -# RUN: llvm-readobj --relocations -s %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER -# RUN: llvm-readobj --relocations -s %t.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-readobj --relocations -S %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS +# RUN: llvm-readobj --relocations -S %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-readobj --relocations -S %t.o | FileCheck %s --check-prefix=CHECK-HEADER # RUN: llvm-objdump -s %t-decompressed.o --section=.debug_foo | FileCheck %s # CHECK: .debug_foo: diff --git a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test index 6fed22a9800..906fb3a6fbb 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test +++ b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test @@ -3,7 +3,7 @@ RUN: llvm-objcopy %t %t2 RUN: llvm-readobj --file-headers %t2 | FileCheck --check-prefix=EHDR %s RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s RUN: llvm-readobj --symbols %t2 | grep "Symbol {" | wc -l | FileCheck --check-prefix=SYMS %s -RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=SYM_SEC_IDS +RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=SYM_SEC_IDS EHDR: Format: ELF64-x86-64 EHDR-NEXT: Arch: x86_64 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-0.s b/llvm/test/tools/llvm-readobj/ARM/attribute-0.s index bad23957b79..24049941492 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-0.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-0.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 0 @CHECK: .eabi_attribute 6, 0 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-1.s b/llvm/test/tools/llvm-readobj/ARM/attribute-1.s index c710bc873f1..e493a426576 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-1.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-1.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 1 @CHECK: .eabi_attribute 6, 1 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-10.s b/llvm/test/tools/llvm-readobj/ARM/attribute-10.s index 667db8c5640..570e27b08f5 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-10.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-10.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 10 @CHECK: .eabi_attribute 6, 10 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-11.s b/llvm/test/tools/llvm-readobj/ARM/attribute-11.s index 2d8e43b58ce..b70e5a0c5e4 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-11.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-11.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 11 @CHECK: .eabi_attribute 6, 11 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-12.s b/llvm/test/tools/llvm-readobj/ARM/attribute-12.s index 4387527a3f7..1bedf6dc4c4 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-12.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-12.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 12 @CHECK: .eabi_attribute 6, 12 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-13.s b/llvm/test/tools/llvm-readobj/ARM/attribute-13.s index 25ac5f19f6e..d3b9fb70953 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-13.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-13.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 13 @CHECK: .eabi_attribute 6, 13 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-136.s b/llvm/test/tools/llvm-readobj/ARM/attribute-136.s index a2d2a9aa411..5952b34ccc4 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-136.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-136.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_compatibility, 136, "Foo Corp" @CHECK: .eabi_attribute 32, 136 @CHECK-OBJ: Tag: 32 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-14.s b/llvm/test/tools/llvm-readobj/ARM/attribute-14.s index e0d8e468daf..aad44332af7 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-14.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-14.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 14 @CHECK: .eabi_attribute 6, 14 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-15.s b/llvm/test/tools/llvm-readobj/ARM/attribute-15.s index 7877ce7aeb7..efe4c7a3e58 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-15.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-15.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_compatibility, 15, "Longer Corporation NaMe" @CHECK: .eabi_attribute 32, 15 @CHECK-OBJ: Tag: 32 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-2.s b/llvm/test/tools/llvm-readobj/ARM/attribute-2.s index 21ee41fbc09..dd7fc9e4ca7 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-2.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-2.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 2 @CHECK: .eabi_attribute 6, 2 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-3.s b/llvm/test/tools/llvm-readobj/ARM/attribute-3.s index ad2de257ecc..3ef7dde5cdc 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-3.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-3.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 3 @CHECK: .eabi_attribute 6, 3 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-4.s b/llvm/test/tools/llvm-readobj/ARM/attribute-4.s index 2c27785410e..01cd6d41206 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-4.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-4.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 4 @CHECK: .eabi_attribute 6, 4 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-5.s b/llvm/test/tools/llvm-readobj/ARM/attribute-5.s index 97e37e2f460..cadf1fc1d69 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-5.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-5.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 5 @CHECK: .eabi_attribute 6, 5 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-6.s b/llvm/test/tools/llvm-readobj/ARM/attribute-6.s index 8da7b9924e1..cf603971cbf 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-6.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-6.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 6 @CHECK: .eabi_attribute 6, 6 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-7.s b/llvm/test/tools/llvm-readobj/ARM/attribute-7.s index 2fd1b209d31..36242c0aa88 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-7.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-7.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 7 @CHECK: .eabi_attribute 6, 7 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-8.s b/llvm/test/tools/llvm-readobj/ARM/attribute-8.s index ac3e3a0b405..42a6116e6af 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-8.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-8.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 8 @CHECK: .eabi_attribute 6, 8 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-9.s b/llvm/test/tools/llvm-readobj/ARM/attribute-9.s index 68f6ccb5a63..1c75784932f 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-9.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-9.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch, 9 @CHECK: .eabi_attribute 6, 9 @CHECK-OBJ: Tag: 6 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-A.s b/llvm/test/tools/llvm-readobj/ARM/attribute-A.s index 720f56e9ddf..8c08c7eb2d1 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-A.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-A.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch_profile, 'A' @CHECK: .eabi_attribute 7, 65 @CHECK-OBJ: Tag: 7 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-M.s b/llvm/test/tools/llvm-readobj/ARM/attribute-M.s index 7d1e1efba3e..56c0c953ae2 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-M.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-M.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch_profile, 'M' @CHECK: .eabi_attribute 7, 77 @CHECK-OBJ: Tag: 7 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-R.s b/llvm/test/tools/llvm-readobj/ARM/attribute-R.s index 096d55764c1..add4192ff69 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-R.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-R.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch_profile, 'R' @CHECK: .eabi_attribute 7, 82 @CHECK-OBJ: Tag: 7 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-S.s b/llvm/test/tools/llvm-readobj/ARM/attribute-S.s index cb909580ab3..0bd4924adce 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-S.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-S.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_CPU_arch_profile, 'S' @CHECK: .eabi_attribute 7, 83 @CHECK-OBJ: Tag: 7 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s index daa44c14eca..cfa426d155f 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_conformance, "0" @CHECK: .eabi_attribute 67, "0" @CHECK-OBJ: Tag: 67 diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s index 47c83c03696..00d08fbcc64 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s +++ b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s @@ -1,6 +1,6 @@ @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \ -@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ +@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ .eabi_attribute Tag_conformance, "A.long--non numeric oddity...!!" @CHECK: .eabi_attribute 67, "A.long--non numeric oddity...!!" @CHECK-OBJ: Tag: 67 diff --git a/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test b/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test index 9b077ff5231..24dcc7c052b 100644 --- a/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test +++ b/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -file-headers -program-headers -sections -symbols %p/Inputs/trivial.obj.elf-amdhsa-gfx803 | FileCheck %s +RUN: llvm-readobj --file-headers -l -S --symbols %p/Inputs/trivial.obj.elf-amdhsa-gfx803 | FileCheck %s CHECK: Format: ELF64-amdgpu CHECK: Arch: unknown diff --git a/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s b/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s index 054f1dd0cab..a1b53980936 100644 --- a/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s +++ b/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s @@ -1,6 +1,6 @@ // REQUIRES: aarch64-registered-target // RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \ -// RUN: | not llvm-readobj -unwind - | FileCheck %s +// RUN: | not llvm-readobj --unwind - | FileCheck %s // Older versions of LLVM had a bug where we would accidentally // truncate the number of epilogue scopes to a uint8_t; make diff --git a/llvm/test/tools/llvm-readobj/arm64-win-error1.s b/llvm/test/tools/llvm-readobj/arm64-win-error1.s index cd449efb550..4cf35902739 100644 --- a/llvm/test/tools/llvm-readobj/arm64-win-error1.s +++ b/llvm/test/tools/llvm-readobj/arm64-win-error1.s @@ -3,7 +3,7 @@ // REQUIRES: aarch64-registered-target // RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \ -// RUN: | llvm-readobj -unwind - | FileCheck %s +// RUN: | llvm-readobj --unwind - | FileCheck %s // CHECK: Prologue [ // CHECK: 0xdf ; Bad opcode! diff --git a/llvm/test/tools/llvm-readobj/arm64-win-error2.s b/llvm/test/tools/llvm-readobj/arm64-win-error2.s index 93c461de8ee..74a61dd0201 100644 --- a/llvm/test/tools/llvm-readobj/arm64-win-error2.s +++ b/llvm/test/tools/llvm-readobj/arm64-win-error2.s @@ -6,7 +6,7 @@ // REQUIRES: aarch64-registered-target // RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \ -// RUN: | not llvm-readobj -unwind - 2>&1 | FileCheck %s +// RUN: | not llvm-readobj --unwind - 2>&1 | FileCheck %s // CHECK: LLVM ERROR: Malformed unwind data diff --git a/llvm/test/tools/llvm-readobj/arm64-win-error3.s b/llvm/test/tools/llvm-readobj/arm64-win-error3.s index 5cbc3d7c585..8e1e1e1321b 100644 --- a/llvm/test/tools/llvm-readobj/arm64-win-error3.s +++ b/llvm/test/tools/llvm-readobj/arm64-win-error3.s @@ -5,7 +5,7 @@ // REQUIRES: aarch64-registered-target // RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \ -// RUN: | llvm-readobj -unwind - | FileCheck %s +// RUN: | llvm-readobj --unwind - | FileCheck %s // CHECK: Prologue [ // CHECK: Opcode 0xe0 goes past the unwind data diff --git a/llvm/test/tools/llvm-readobj/broken-group.test b/llvm/test/tools/llvm-readobj/broken-group.test index 8b8989a182f..3742fe237b6 100644 --- a/llvm/test/tools/llvm-readobj/broken-group.test +++ b/llvm/test/tools/llvm-readobj/broken-group.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s -o %t.o -# RUN: llvm-readobj --elf-section-groups -elf-output-style=GNU \ +# RUN: llvm-readobj --elf-section-groups --elf-output-style=GNU \ # RUN: %t.o >%tout.log 2>%terr.log # RUN: FileCheck %s -check-prefix=GNU-STDERR < %terr.log # GNU-STDERR: Error: section [ 3] in group section [ 4] already in group section [ 2] diff --git a/llvm/test/tools/llvm-readobj/codeview-inlinees.test b/llvm/test/tools/llvm-readobj/codeview-inlinees.test index bbbe8b45de7..9f818dfc289 100644 --- a/llvm/test/tools/llvm-readobj/codeview-inlinees.test +++ b/llvm/test/tools/llvm-readobj/codeview-inlinees.test @@ -8,7 +8,7 @@ void k() { h(); } -RUN: llvm-readobj -codeview %p/Inputs/codeview-inlinees.obj | FileCheck %s +RUN: llvm-readobj --codeview %p/Inputs/codeview-inlinees.obj | FileCheck %s CHECK: SubSectionType: InlineeLines (0xF6) CHECK: Inlinee: f (0x1003) diff --git a/llvm/test/tools/llvm-readobj/codeview-inlining.test b/llvm/test/tools/llvm-readobj/codeview-inlining.test index 78569935307..14c4f1af75c 100644 --- a/llvm/test/tools/llvm-readobj/codeview-inlining.test +++ b/llvm/test/tools/llvm-readobj/codeview-inlining.test @@ -30,7 +30,7 @@ ; ; Both a.h and b.h contain "__asm nop". -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/codeview-inlining.obj.coff | FileCheck %s +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/codeview-inlining.obj.coff | FileCheck %s ; FIXME: If we were more clever, we could turn FileIDs into paths. diff --git a/llvm/test/tools/llvm-readobj/codeview-label.test b/llvm/test/tools/llvm-readobj/codeview-label.test index 3bf6debe0d7..66afcb377e9 100644 --- a/llvm/test/tools/llvm-readobj/codeview-label.test +++ b/llvm/test/tools/llvm-readobj/codeview-label.test @@ -1,4 +1,4 @@ -; RUN: llvm-readobj -codeview %S/Inputs/codeview-label.obj | FileCheck %s +; RUN: llvm-readobj --codeview %S/Inputs/codeview-label.obj | FileCheck %s ; CHECK-LABEL: Label (0x1000) { ; CHECK-NEXT: TypeLeafKind: LF_LABEL (0xE) diff --git a/llvm/test/tools/llvm-readobj/codeview-linetables.test b/llvm/test/tools/llvm-readobj/codeview-linetables.test index 9256aefe433..81d193ad30e 100644 --- a/llvm/test/tools/llvm-readobj/codeview-linetables.test +++ b/llvm/test/tools/llvm-readobj/codeview-linetables.test @@ -18,13 +18,13 @@ ; z(); ; } ; using 32-/64-bit versions of CL v17.00.61030 and v18.00.21005.1 respectively. -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-i368 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-i368 \ RUN: | FileCheck %s -check-prefix MFUN32 -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-i368 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-i368 \ RUN: | FileCheck %s -check-prefix MFUN32 -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-x86_64 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-x86_64 \ RUN: | FileCheck %s -check-prefix MFUN64 -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-x86_64 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-x86_64 \ RUN: | FileCheck %s -check-prefix MFUN64 MFUN32: CodeViewDebugInfo [ @@ -343,13 +343,13 @@ MFUN64: ] ; g(); ; } ; using 32-/64-bit versions of CL v17.00.61030 and v18.00.21005.1 respectively. -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-i368 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-i368 \ RUN: | FileCheck %s -check-prefix MFILE32 -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-i368 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-i368 \ RUN: | FileCheck %s -check-prefix MFILE32 -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-x86_64 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-x86_64 \ RUN: | FileCheck %s -check-prefix MFILE64 -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-x86_64 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-x86_64 \ RUN: | FileCheck %s -check-prefix MFILE64 MFILE32: CodeViewDebugInfo [ @@ -523,9 +523,9 @@ MFILE64: ] ; return 0; ; } ; using 32-version of CL v17.00.61030 and v18.00.21005.1 respectively. -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2012-i386 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2012-i386 \ RUN: | FileCheck %s -check-prefix MCOMDAT -RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2013-i386 \ +RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2013-i386 \ RUN: | FileCheck %s -check-prefix MCOMDAT MCOMDAT: GlobalProcIdSym { diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-anon.test b/llvm/test/tools/llvm-readobj/codeview-merging-anon.test index cf0484074d0..bbc40f9a25e 100644 --- a/llvm/test/tools/llvm-readobj/codeview-merging-anon.test +++ b/llvm/test/tools/llvm-readobj/codeview-merging-anon.test @@ -6,8 +6,8 @@ # struct { int x; } o; # $ cl -Z7 t.c -RUN: llvm-readobj -codeview %S/Inputs/codeview-merging-anon.obj | FileCheck %s -RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-merging-anon.obj | FileCheck %s +RUN: llvm-readobj --codeview %S/Inputs/codeview-merging-anon.obj | FileCheck %s +RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-merging-anon.obj | FileCheck %s CHECK-LABEL: FieldList (0x1000) { CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203) diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test b/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test index 4d612e8314d..b7c63c84392 100644 --- a/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test +++ b/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test @@ -1,4 +1,4 @@ -; RUN: not llvm-readobj -codeview-merged-types %S/Inputs/codeview-cycle.obj 2>&1 | FileCheck %s +; RUN: not llvm-readobj --codeview-merged-types %S/Inputs/codeview-cycle.obj 2>&1 | FileCheck %s ; CHECK: error{{.*}} Input type graph contains cycles diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test b/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test index 04b30ffa7cd..7c57cf0b5dc 100644 --- a/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test +++ b/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s -o=%t.obj -# RUN: llvm-readobj -codeview-merged-types %t.obj | FileCheck %s --check-prefix=MERGED -# RUN: llvm-readobj -codeview-merged-types -codeview-ghash %t.obj | FileCheck %s --check-prefix=MERGED +# RUN: llvm-readobj --codeview-merged-types %t.obj | FileCheck %s --check-prefix=MERGED +# RUN: llvm-readobj --codeview-merged-types --codeview-ghash %t.obj | FileCheck %s --check-prefix=MERGED # MERGED: Format: COFF-x86-64 # MERGED-NEXT: Arch: x86_64 diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test b/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test index 6aaab3a891e..a52755a3c8a 100644 --- a/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test +++ b/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test @@ -1,5 +1,5 @@ -; RUN: llvm-readobj -codeview %S/Inputs/codeview-unsorted.obj | FileCheck %s -; RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-unsorted.obj | FileCheck %s --check-prefix=MERGED +; RUN: llvm-readobj --codeview %S/Inputs/codeview-unsorted.obj | FileCheck %s +; RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-unsorted.obj | FileCheck %s --check-prefix=MERGED ; The input type stream has records that refer to later type indices in the same ; stream: diff --git a/llvm/test/tools/llvm-readobj/codeview-merging.test b/llvm/test/tools/llvm-readobj/codeview-merging.test index 4d453e5a116..af7b29f7e7c 100644 --- a/llvm/test/tools/llvm-readobj/codeview-merging.test +++ b/llvm/test/tools/llvm-readobj/codeview-merging.test @@ -17,9 +17,9 @@ # #endif # $ cl -c -DCONFIG1 -Z7 t.cpp -Fot1.obj && cl -c -Z7 t.cpp -Fot2.obj -RUN: llvm-readobj -codeview %S/Inputs/codeview-merging-1.obj | FileCheck %s --check-prefix=OBJ1 -RUN: llvm-readobj -codeview %S/Inputs/codeview-merging-2.obj | FileCheck %s --check-prefix=OBJ2 -RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-merging-1.obj %S/Inputs/codeview-merging-2.obj | FileCheck %s +RUN: llvm-readobj --codeview %S/Inputs/codeview-merging-1.obj | FileCheck %s --check-prefix=OBJ1 +RUN: llvm-readobj --codeview %S/Inputs/codeview-merging-2.obj | FileCheck %s --check-prefix=OBJ2 +RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-merging-1.obj %S/Inputs/codeview-merging-2.obj | FileCheck %s OBJ1: Procedure ({{.*}}) { OBJ1-NEXT: TypeLeafKind: LF_PROCEDURE (0x1008) diff --git a/llvm/test/tools/llvm-readobj/codeview-types.test b/llvm/test/tools/llvm-readobj/codeview-types.test index 4545b8e01dd..3c2939611fa 100644 --- a/llvm/test/tools/llvm-readobj/codeview-types.test +++ b/llvm/test/tools/llvm-readobj/codeview-types.test @@ -5,8 +5,8 @@ // type records, we can regenerate the test using it instead. // RUNX: cl -GR- -Z7 -c -TP %s -Fo%S/Inputs/codeview-types.obj -// RUN: llvm-readobj -codeview %S/Inputs/codeview-types.obj | FileCheck %s -// RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-types.obj | FileCheck %s +// RUN: llvm-readobj --codeview %S/Inputs/codeview-types.obj | FileCheck %s +// RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-types.obj | FileCheck %s // TYPE_RECORD // CHECK-DAG: {{^ *Pointer (.*) {$}} diff --git a/llvm/test/tools/llvm-readobj/codeview-vftable.test b/llvm/test/tools/llvm-readobj/codeview-vftable.test index 772f0c76498..fb7acad11ea 100644 --- a/llvm/test/tools/llvm-readobj/codeview-vftable.test +++ b/llvm/test/tools/llvm-readobj/codeview-vftable.test @@ -17,7 +17,7 @@ ; B b; ; C c; -RUN: llvm-readobj -codeview %p/Inputs/codeview-vftable.obj.coff | FileCheck %s +RUN: llvm-readobj --codeview %p/Inputs/codeview-vftable.obj.coff | FileCheck %s CHECK: VFTable (0x10F0) { CHECK-NEXT: TypeLeafKind: LF_VFTABLE (0x151D) diff --git a/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test b/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test index c0febd74aef..5d6b53831d5 100644 --- a/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test +++ b/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test @@ -1,4 +1,4 @@ -# RUN: llvm-readobj -coff-basereloc %p/Inputs/trivial.exe.coff-arm | FileCheck %s +# RUN: llvm-readobj --coff-basereloc %p/Inputs/trivial.exe.coff-arm | FileCheck %s # CHECK: Entry { # CHECK: Type: ARM_MOV32(T) diff --git a/llvm/test/tools/llvm-readobj/coff-basereloc.test b/llvm/test/tools/llvm-readobj/coff-basereloc.test index cd6687cae44..3256a3a4adb 100644 --- a/llvm/test/tools/llvm-readobj/coff-basereloc.test +++ b/llvm/test/tools/llvm-readobj/coff-basereloc.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -coff-basereloc %p/Inputs/basereloc.obj.coff-i386 | FileCheck %s +RUN: llvm-readobj --coff-basereloc %p/Inputs/basereloc.obj.coff-i386 | FileCheck %s CHECK: Format: COFF-i386 CHECK-NEXT: Arch: i386 diff --git a/llvm/test/tools/llvm-readobj/coff-const-import.test b/llvm/test/tools/llvm-readobj/coff-const-import.test index 3c3c48242c6..432dee0e6eb 100644 --- a/llvm/test/tools/llvm-readobj/coff-const-import.test +++ b/llvm/test/tools/llvm-readobj/coff-const-import.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -coff-exports %S/Inputs/const-import.lib | FileCheck %s +RUN: llvm-readobj --coff-exports %S/Inputs/const-import.lib | FileCheck %s CHECK: Type: const CHECK: Name type: noprefix diff --git a/llvm/test/tools/llvm-readobj/coff-debug-directory.test b/llvm/test/tools/llvm-readobj/coff-debug-directory.test index f5c31c77abf..f67eb70d820 100644 --- a/llvm/test/tools/llvm-readobj/coff-debug-directory.test +++ b/llvm/test/tools/llvm-readobj/coff-debug-directory.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -coff-debug-directory %p/Inputs/has_pdb.exe | FileCheck %s +RUN: llvm-readobj --coff-debug-directory %p/Inputs/has_pdb.exe | FileCheck %s CHECK: DebugDirectory [ CHECK: DebugEntry { diff --git a/llvm/test/tools/llvm-readobj/coff-directives.test b/llvm/test/tools/llvm-readobj/coff-directives.test index 83efffcf217..a932583b4e0 100644 --- a/llvm/test/tools/llvm-readobj/coff-directives.test +++ b/llvm/test/tools/llvm-readobj/coff-directives.test @@ -1,2 +1,2 @@ -RUN: llvm-readobj -coff-directives %p/Inputs/directives.obj.coff-x86_64 | FileCheck %s +RUN: llvm-readobj --coff-directives %p/Inputs/directives.obj.coff-x86_64 | FileCheck %s CHECK: Directive(s): /DEFAULTLIB:"LIBCMT" /DEFAULTLIB:"OLDNAMES" diff --git a/llvm/test/tools/llvm-readobj/coff-exports-implib.test b/llvm/test/tools/llvm-readobj/coff-exports-implib.test index 2b327384b25..75d0809ecbb 100644 --- a/llvm/test/tools/llvm-readobj/coff-exports-implib.test +++ b/llvm/test/tools/llvm-readobj/coff-exports-implib.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -coff-exports %p/Inputs/library.lib | FileCheck %s +RUN: llvm-readobj --coff-exports %p/Inputs/library.lib | FileCheck %s CHECK: File: library.dll CHECK: Format: COFF-import-file diff --git a/llvm/test/tools/llvm-readobj/coff-exports.test b/llvm/test/tools/llvm-readobj/coff-exports.test index 54b42fef84b..c0c977d9d4b 100644 --- a/llvm/test/tools/llvm-readobj/coff-exports.test +++ b/llvm/test/tools/llvm-readobj/coff-exports.test @@ -1,6 +1,6 @@ -RUN: llvm-readobj -coff-exports %p/Inputs/export-x86.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X86 -RUN: llvm-readobj -coff-exports %p/Inputs/export-x64.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X64 -RUN: llvm-readobj -coff-exports %p/Inputs/export-arm.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-ARM +RUN: llvm-readobj --coff-exports %p/Inputs/export-x86.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X86 +RUN: llvm-readobj --coff-exports %p/Inputs/export-x64.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X64 +RUN: llvm-readobj --coff-exports %p/Inputs/export-arm.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-ARM CHECK: Export { CHECK: Ordinal: 1 diff --git a/llvm/test/tools/llvm-readobj/coff-load-config.test b/llvm/test/tools/llvm-readobj/coff-load-config.test index 45c83b12430..b65c83b8ace 100644 --- a/llvm/test/tools/llvm-readobj/coff-load-config.test +++ b/llvm/test/tools/llvm-readobj/coff-load-config.test @@ -1,9 +1,9 @@ -RUN: llvm-readobj -coff-load-config %S/Inputs/coff-load-config-x86.dll | FileCheck %s --check-prefix=X86 -RUN: llvm-readobj -coff-load-config %S/Inputs/coff-load-config-x64.dll | FileCheck %s --check-prefix=X64 +RUN: llvm-readobj --coff-load-config %S/Inputs/coff-load-config-x86.dll | FileCheck %s --check-prefix=X86 +RUN: llvm-readobj --coff-load-config %S/Inputs/coff-load-config-x64.dll | FileCheck %s --check-prefix=X64 -RUN: llvm-readobj -coff-load-config %S/Inputs/coff-load-config-data-end.exe | FileCheck %s --check-prefix=DATAEND +RUN: llvm-readobj --coff-load-config %S/Inputs/coff-load-config-data-end.exe | FileCheck %s --check-prefix=DATAEND -RUN: llvm-readobj -coff-load-config %S/Inputs/coff-no-load-config.exe | FileCheck %s --check-prefix=NOCONFIG +RUN: llvm-readobj --coff-load-config %S/Inputs/coff-no-load-config.exe | FileCheck %s --check-prefix=NOCONFIG X86: LoadConfig [ X86: Size: 0x5C diff --git a/llvm/test/tools/llvm-readobj/coff-needed-libs.test b/llvm/test/tools/llvm-readobj/coff-needed-libs.test index deb6bc299eb..7009f9c1a2e 100644 --- a/llvm/test/tools/llvm-readobj/coff-needed-libs.test +++ b/llvm/test/tools/llvm-readobj/coff-needed-libs.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -needed-libs %p/Inputs/needed-libs.obj.coff-am64 | FileCheck %s +RUN: llvm-readobj --needed-libs %p/Inputs/needed-libs.obj.coff-am64 | FileCheck %s CHECK: NeededLibraries [ CHECK-NEXT: KERNEL32.dll diff --git a/llvm/test/tools/llvm-readobj/coff-resources.test b/llvm/test/tools/llvm-readobj/coff-resources.test index e426b6e56c2..10cb4381481 100644 --- a/llvm/test/tools/llvm-readobj/coff-resources.test +++ b/llvm/test/tools/llvm-readobj/coff-resources.test @@ -4,9 +4,9 @@ // > rc /fo test_resource.res /nologo test_resource.rc // > cvtres /machine:X86 /readonly /nologo /out:test_resource.o test_resource.res -RUN: llvm-readobj -coff-resources -section-data %p/Inputs/zero-string-table.obj.coff-i386 \ +RUN: llvm-readobj --coff-resources --section-data %p/Inputs/zero-string-table.obj.coff-i386 \ RUN: | FileCheck %s -check-prefix ZERO -RUN: llvm-readobj -coff-resources %p/Inputs/resources/test_resource.obj.coff \ +RUN: llvm-readobj --coff-resources %p/Inputs/resources/test_resource.obj.coff \ RUN: | FileCheck %s -check-prefix TEST_RES ZERO: Resources [ diff --git a/llvm/test/tools/llvm-readobj/dyn-symbols.test b/llvm/test/tools/llvm-readobj/dyn-symbols.test index 16a2aba99e1..0a80e5caa26 100644 --- a/llvm/test/tools/llvm-readobj/dyn-symbols.test +++ b/llvm/test/tools/llvm-readobj/dyn-symbols.test @@ -1,8 +1,8 @@ RUN: llvm-readobj --dyn-symbols %p/Inputs/dynamic-table-so.x86 | FileCheck %s -# Check the two-letter alias -dt is equivalent to the --dyn-symbols full flag +# Check the two-letter alias --dt is equivalent to the --dyn-symbols full flag # name. -RUN: llvm-readobj -dt %p/Inputs/dynamic-table-so.x86 > %t.readobj-dt-alias +RUN: llvm-readobj --dt %p/Inputs/dynamic-table-so.x86 > %t.readobj-dt-alias RUN: llvm-readobj --dyn-symbols %p/Inputs/dynamic-table-so.x86 > %t.readobj-dt-no-alias RUN: diff %t.readobj-dt-alias %t.readobj-dt-no-alias diff --git a/llvm/test/tools/llvm-readobj/dynamic.test b/llvm/test/tools/llvm-readobj/dynamic.test index 71b6b06cbc0..02ae622038c 100644 --- a/llvm/test/tools/llvm-readobj/dynamic.test +++ b/llvm/test/tools/llvm-readobj/dynamic.test @@ -1,5 +1,5 @@ // Check dynamic section tags in case of shared library file. -RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-so.mips \ +RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.mips \ RUN: | FileCheck %s -check-prefix ELF-MIPS ELF-MIPS: Format: ELF32-mips @@ -34,7 +34,7 @@ ELF-MIPS: 0x00000000 NULL 0x0 ELF-MIPS: ] // Check dynamic section tags in case of non-pic executable file. -RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-exe.mips \ +RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-exe.mips \ RUN: | FileCheck %s -check-prefix ELF-MIPS-EXE ELF-MIPS-EXE: Format: ELF32-mips @@ -71,7 +71,7 @@ ELF-MIPS-EXE: 0x6FFFFFF0 VERSYM 0x4003D8 ELF-MIPS-EXE: 0x00000000 NULL 0x0 ELF-MIPS-EXE: ] -RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-exe.x86 \ +RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-exe.x86 \ RUN: | FileCheck %s -check-prefix ELF-X86-EXE ELF-X86-EXE: Format: ELF32-i386 @@ -112,7 +112,7 @@ ELF-X86-EXE: 0x6FFFFFFA RELCOUNT 6 ELF-X86-EXE: 0x00000000 NULL 0x0 ELF-X86-EXE: ] -RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-so.x86 \ +RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.x86 \ RUN: | FileCheck %s -check-prefix ELF-X86-SO ELF-X86-SO: Format: ELF64-x86-64 @@ -149,7 +149,7 @@ ELF-X86-SO: 0x000000006FFFFFF0 VERSYM 0x{{[0-9A-F]+}} ELF-X86-SO: 0x000000006FFFFFF9 RELACOUNT 3 ELF-X86-SO: 0x0000000000000000 NULL 0x0 -RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-so.aarch64 \ +RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.aarch64 \ RUN: | FileCheck %s -check-prefix ELF-AARCH64-SO ELF-AARCH64-SO: Format: ELF64-aarch64-little diff --git a/llvm/test/tools/llvm-readobj/elf-dtflags.test b/llvm/test/tools/llvm-readobj/elf-dtflags.test index 4e6c90d9f06..b15ca77aabf 100644 --- a/llvm/test/tools/llvm-readobj/elf-dtflags.test +++ b/llvm/test/tools/llvm-readobj/elf-dtflags.test @@ -4,7 +4,7 @@ // $ cat example.c // int main(void) { return (0); } -RUN: llvm-readobj -dynamic-table %p/Inputs/dtflags.elf-x86-64 | FileCheck %s +RUN: llvm-readobj --dynamic-table %p/Inputs/dtflags.elf-x86-64 | FileCheck %s CHECK: 0x000000000000001E FLAGS ORIGIN BIND_NOW CHECK: 0x000000006FFFFFFB FLAGS_1 NOW ORIGIN diff --git a/llvm/test/tools/llvm-readobj/elf-gnuhash.test b/llvm/test/tools/llvm-readobj/elf-gnuhash.test index 8642a4dc9d7..c7d15dc3153 100644 --- a/llvm/test/tools/llvm-readobj/elf-gnuhash.test +++ b/llvm/test/tools/llvm-readobj/elf-gnuhash.test @@ -12,10 +12,10 @@ // .globl foo // foo: -RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-i386 | FileCheck %s -check-prefix I386 -RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-x86_64 | FileCheck %s -check-prefix X86_64 -RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc | FileCheck %s -check-prefix PPC -RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc64 | FileCheck %s -check-prefix PPC64 +RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-i386 | FileCheck %s -check-prefix I386 +RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-x86_64 | FileCheck %s -check-prefix X86_64 +RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc | FileCheck %s -check-prefix PPC +RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc64 | FileCheck %s -check-prefix PPC64 I386: Arch: i386 I386: GnuHashTable { diff --git a/llvm/test/tools/llvm-readobj/elf-groups.test b/llvm/test/tools/llvm-readobj/elf-groups.test index f877d3f7946..9d13900a214 100644 --- a/llvm/test/tools/llvm-readobj/elf-groups.test +++ b/llvm/test/tools/llvm-readobj/elf-groups.test @@ -15,7 +15,7 @@ RUN: llvm-readobj -g %p/Inputs/elf-groups.x86_64 \ RUN: | FileCheck %s -RUN: llvm-readobj -g -elf-output-style=GNU %p/Inputs/elf-groups.x86_64 \ +RUN: llvm-readobj -g --elf-output-style=GNU %p/Inputs/elf-groups.x86_64 \ RUN: | FileCheck --check-prefix="GNU" %s CHECK: Groups { CHECK-NEXT: Group { diff --git a/llvm/test/tools/llvm-readobj/elf-hash-histogram.test b/llvm/test/tools/llvm-readobj/elf-hash-histogram.test index b7ddfabacaa..e500c4fa8cd 100644 --- a/llvm/test/tools/llvm-readobj/elf-hash-histogram.test +++ b/llvm/test/tools/llvm-readobj/elf-hash-histogram.test @@ -1,8 +1,8 @@ -RUN: llvm-readobj -elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \ +RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \ RUN: --elf-output-style=GNU | FileCheck %s -check-prefix PPC64GNU -RUN: llvm-readobj -elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \ +RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \ RUN: | FileCheck %s -check-prefix X86GNU -RUN: llvm-readobj -elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel --elf-output-style=GNU \ +RUN: llvm-readobj --elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel --elf-output-style=GNU \ RUN: | FileCheck %s -check-prefix SYSV PPC64GNU: Histogram for `.gnu.hash' bucket list length (total of 3 buckets) diff --git a/llvm/test/tools/llvm-readobj/elf-linker-options.ll b/llvm/test/tools/llvm-readobj/elf-linker-options.ll index 8af33d8d6eb..31d08cf0252 100644 --- a/llvm/test/tools/llvm-readobj/elf-linker-options.ll +++ b/llvm/test/tools/llvm-readobj/elf-linker-options.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple x86_64-elf -filetype obj -o - %s | llvm-readobj -elf-linker-options - | FileCheck %s +; RUN: llc -mtriple x86_64-elf -filetype obj -o - %s | llvm-readobj --elf-linker-options - | FileCheck %s ; REQUIRES: x86-registered-target !llvm.linker.options = !{!0, !1} diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s index b108d44f9a8..28b35470de3 100644 --- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s +++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -relocations - | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -r - | FileCheck %s // CHECK: Relocations [ // CHECK-NEXT: Section (3) .rela.dyn { diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s index e418353465b..c83748185b5 100644 --- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s +++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s // CHECK: error: invalid packed relocation header diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s index 28c325fec08..23dd33e5a93 100644 --- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s +++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s // CHECK: error: malformed sleb128, extends past end diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s index e373a53f730..e2a6376e366 100644 --- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s +++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s // CHECK: error: malformed sleb128, extends past end diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s index 94ef6f4ca56..97aee3a9ce1 100644 --- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s +++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s // CHECK: error: malformed sleb128, extends past end diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s index b0c549fe06f..1c2eb890ac6 100644 --- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s +++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s @@ -1,5 +1,5 @@ // REQUIRES: x86-registered-target -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s // CHECK: error: relocation group unexpectedly large diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs.test b/llvm/test/tools/llvm-readobj/elf-packed-relocs.test index 8fa73c386a5..4de725d130a 100644 --- a/llvm/test/tools/llvm-readobj/elf-packed-relocs.test +++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs.test @@ -1,7 +1,7 @@ # The binary blobs in this file were created like this: # llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu Inputs/elf-packed-relocs1.s -o - | obj2yaml | grep Content: -# RUN: yaml2obj -docnum 1 %s | llvm-readobj -elf-output-style=LLVM -relocations - | FileCheck --check-prefix=LLVM1 %s +# RUN: yaml2obj -docnum 1 %s | llvm-readobj --relocations - | FileCheck --check-prefix=LLVM1 %s # LLVM1: Section (1) .rela.dyn { # LLVM1-NEXT: 0x1100 R_X86_64_RELATIVE - 0x0 # LLVM1-NEXT: 0x1180 R_X86_64_RELATIVE - 0x0 @@ -13,7 +13,7 @@ # LLVM1-NEXT: 0x119F R_X86_64_64 sym2 0xA # LLVM1-NEXT: } -# RUN: yaml2obj -docnum 1 %s | llvm-readobj -elf-output-style=GNU -relocations - | FileCheck --check-prefix=GNU1 %s +# RUN: yaml2obj -docnum 1 %s | llvm-readelf -relocations - | FileCheck --check-prefix=GNU1 %s # GNU1: Relocation section '.rela.dyn' at offset 0x180 contains 8 entries: # GNU1: 0000000000001100 0000000000000008 R_X86_64_RELATIVE 0 # GNU1-NEXT: 0000000000001180 0000000000000008 R_X86_64_RELATIVE 0 @@ -47,7 +47,7 @@ Symbols: Binding: STB_GLOBAL ... -# RUN: yaml2obj -docnum 2 %s | llvm-readobj -elf-output-style=LLVM -relocations - | FileCheck --check-prefix=LLVM2 %s +# RUN: yaml2obj -docnum 2 %s | llvm-readobj --relocations - | FileCheck --check-prefix=LLVM2 %s # LLVM2: Section (1) .rel.dyn { # LLVM2-NEXT: 0x1008 R_386_32 sym1 0x0 # LLVM2-NEXT: 0x1010 R_386_GOT32 sym2 0x0 @@ -61,7 +61,7 @@ Symbols: # LLVM2-NEXT: 0xFF0 R_386_RELATIVE - 0x0 # LLVM2-NEXT: } -# RUN: yaml2obj -docnum 2 %s | llvm-readobj -elf-output-style=GNU -relocations - | FileCheck --check-prefix=GNU2 %s +# RUN: yaml2obj -docnum 2 %s | llvm-readelf -relocations - | FileCheck --check-prefix=GNU2 %s # GNU2: Relocation section '.rel.dyn' at offset 0xfc contains 10 entries: # GNU2: 00001008 00000101 R_386_32 00000000 sym1 # GNU2-NEXT: 00001010 00000203 R_386_GOT32 00000000 sym2 @@ -97,7 +97,7 @@ Symbols: Binding: STB_GLOBAL ... -# RUN: yaml2obj -docnum 3 %s | llvm-readobj -elf-output-style=LLVM -relocations - | FileCheck --check-prefix=LLVM3 %s +# RUN: yaml2obj -docnum 3 %s | llvm-readobj --relocations - | FileCheck --check-prefix=LLVM3 %s # # LLVM3: Section (1) .rela.dyn { # LLVM3-NEXT: 0x1100 R_X86_64_RELATIVE - 0x0 @@ -108,7 +108,7 @@ Symbols: # LLVM3-NEXT: 0x1218 R_X86_64_64 sym2 0x8 # LLVM3-NEXT: } -# RUN: yaml2obj -docnum 3 %s | llvm-readobj -elf-output-style=GNU -relocations - | FileCheck --check-prefix=GNU3 %s +# RUN: yaml2obj -docnum 3 %s | llvm-readelf -relocations - | FileCheck --check-prefix=GNU3 %s # GNU3: Relocation section '.rela.dyn' at offset 0x180 contains 6 entries: # GNU3: 0000000000001100 0000000000000008 R_X86_64_RELATIVE 0 # GNU3-NEXT: 0000000000001180 0000000000000008 R_X86_64_RELATIVE 8 diff --git a/llvm/test/tools/llvm-readobj/elf-relr-relocs.test b/llvm/test/tools/llvm-readobj/elf-relr-relocs.test index 230faff628a..da1b6abe52c 100644 --- a/llvm/test/tools/llvm-readobj/elf-relr-relocs.test +++ b/llvm/test/tools/llvm-readobj/elf-relr-relocs.test @@ -2,7 +2,7 @@ # llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu Inputs/elf-relr-relocs1.s -o - | obj2yaml | grep Content: # RUN: yaml2obj -docnum 1 %s \ -# RUN: | llvm-readobj -elf-output-style=LLVM -relocations -raw-relr - \ +# RUN: | llvm-readobj --relocations --raw-relr - \ # RUN: | FileCheck --check-prefix=RAW-LLVM1 %s # RAW-LLVM1: Section (1) .relr.dyn { # RAW-LLVM1-NEXT: 0x10D60 @@ -13,7 +13,7 @@ # RAW-LLVM1-NEXT: } # RUN: yaml2obj -docnum 1 %s \ -# RUN: | llvm-readobj -elf-output-style=LLVM -relocations - \ +# RUN: | llvm-readobj --relocations - \ # RUN: | FileCheck --check-prefix=LLVM1 %s # LLVM1: Section (1) .relr.dyn { # LLVM1-NEXT: 0x10D60 R_X86_64_RELATIVE - 0x0 @@ -40,7 +40,7 @@ # LLVM1-NEXT: } # RUN: yaml2obj -docnum 1 %s \ -# RUN: | llvm-readobj -elf-output-style=GNU -relocations -raw-relr - \ +# RUN: | llvm-readelf -relocations -raw-relr - \ # RUN: | FileCheck --check-prefix=RAW-GNU1 %s # RAW-GNU1: Relocation section '.relr.dyn' at offset 0x180 contains 5 entries: # RAW-GNU1: 0000000000010d60 @@ -50,7 +50,7 @@ # RAW-GNU1-NEXT: 000a700550400009 # RUN: yaml2obj -docnum 1 %s \ -# RUN: | llvm-readobj -elf-output-style=GNU -relocations - \ +# RUN: | llvm-readelf -relocations - \ # RUN: | FileCheck --check-prefix=GNU1 %s # GNU1: Relocation section '.relr.dyn' at offset 0x180 contains 21 entries: # GNU1: 0000000000010d60 0000000000000008 R_X86_64_RELATIVE @@ -94,7 +94,7 @@ Sections: ... # RUN: yaml2obj -docnum 2 %s \ -# RUN: | llvm-readobj -elf-output-style=LLVM -relocations -raw-relr - \ +# RUN: | llvm-readobj --relocations --raw-relr - \ # RUN: | FileCheck --check-prefix=RAW-LLVM2 %s # RAW-LLVM2: Section (1) .relr.dyn { # RAW-LLVM2-NEXT: 0x10D60 @@ -105,7 +105,7 @@ Sections: # RAW-LLVM2-NEXT: } # RUN: yaml2obj -docnum 2 %s \ -# RUN: | llvm-readobj -elf-output-style=LLVM -relocations - \ +# RUN: | llvm-readobj --relocations - \ # RUN: | FileCheck --check-prefix=LLVM2 %s # LLVM2: Section (1) .relr.dyn { # LLVM2-NEXT: 0x10D60 R_386_RELATIVE - 0x0 @@ -125,7 +125,7 @@ Sections: # LLVM2-NEXT: } # RUN: yaml2obj -docnum 2 %s \ -# RUN: | llvm-readobj -elf-output-style=GNU -relocations -raw-relr - \ +# RUN: | llvm-readelf -relocations -raw-relr - \ # RUN: | FileCheck --check-prefix=RAW-GNU2 %s # RAW-GNU2: Relocation section '.relr.dyn' at offset 0xfc contains 5 entries: # RAW-GNU2: 00010d60 @@ -135,7 +135,7 @@ Sections: # RAW-GNU2-NEXT: 50400009 # RUN: yaml2obj -docnum 2 %s \ -# RUN: | llvm-readobj -elf-output-style=GNU -relocations - \ +# RUN: | llvm-readelf -relocations - \ # RUN: | FileCheck --check-prefix=GNU2 %s # GNU2: Relocation section '.relr.dyn' at offset 0xfc contains 14 entries: # GNU2: 00010d60 00000008 R_386_RELATIVE diff --git a/llvm/test/tools/llvm-readobj/elf-sec-compressed.test b/llvm/test/tools/llvm-readobj/elf-sec-compressed.test index baf0c687a91..5045c539289 100644 --- a/llvm/test/tools/llvm-readobj/elf-sec-compressed.test +++ b/llvm/test/tools/llvm-readobj/elf-sec-compressed.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -sections \ +RUN: llvm-readobj --sections \ RUN: %p/Inputs/compression.zlib.style.elf-x86-64 | FileCheck %s CHECK: Section { diff --git a/llvm/test/tools/llvm-readobj/elf-sec-flags.test b/llvm/test/tools/llvm-readobj/elf-sec-flags.test index 8a977109238..8507975918d 100644 --- a/llvm/test/tools/llvm-readobj/elf-sec-flags.test +++ b/llvm/test/tools/llvm-readobj/elf-sec-flags.test @@ -1,7 +1,7 @@ # Check that llvm-readobj shows arch specific ELF section flags. # RUN: yaml2obj -docnum 1 %s > %t-hex.o -# RUN: llvm-readobj -s %t-hex.o | FileCheck -check-prefix=HEX %s +# RUN: llvm-readobj -S %t-hex.o | FileCheck -check-prefix=HEX %s # HEX: Flags [ (0x10000000) # HEX-NEXT: SHF_HEX_GPREL (0x10000000) @@ -22,7 +22,7 @@ Sections: Size: 4 # RUN: yaml2obj -docnum 2 %s > %t-mips.o -# RUN: llvm-readobj -s %t-mips.o | FileCheck -check-prefix=MIPS %s +# RUN: llvm-readobj -S %t-mips.o | FileCheck -check-prefix=MIPS %s # MIPS: Flags [ (0x38000000) # MIPS-NEXT: SHF_MIPS_GPREL (0x10000000) @@ -45,7 +45,7 @@ Sections: Size: 4 # RUN: yaml2obj -docnum 3 %s > %t-x86_64.o -# RUN: llvm-readobj -s %t-x86_64.o | FileCheck -check-prefix=X86_64 %s +# RUN: llvm-readobj -S %t-x86_64.o | FileCheck -check-prefix=X86_64 %s # X86_64: Flags [ (0x10000000) # X86_64-NEXT: SHF_X86_64_LARGE (0x10000000) diff --git a/llvm/test/tools/llvm-readobj/gnu-note-size.test b/llvm/test/tools/llvm-readobj/gnu-note-size.test index 4a160d13a5c..ea01d5b7814 100644 --- a/llvm/test/tools/llvm-readobj/gnu-note-size.test +++ b/llvm/test/tools/llvm-readobj/gnu-note-size.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-readobj -elf-output-style GNU --notes %t | FileCheck %s --check-prefix=GNU -# RUN: llvm-readobj -elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM +# RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU +# RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM # GNU: Owner Data size Description # GNU-NEXT: GNU 0x00000004 NT_GNU_ABI_TAG (ABI version tag) diff --git a/llvm/test/tools/llvm-readobj/gnu-notes.test b/llvm/test/tools/llvm-readobj/gnu-notes.test index ab7dcdeee90..7f4b4f61e14 100644 --- a/llvm/test/tools/llvm-readobj/gnu-notes.test +++ b/llvm/test/tools/llvm-readobj/gnu-notes.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t.so -# RUN: llvm-readobj -elf-output-style GNU --notes %t.so | FileCheck %s --check-prefix=GNU -# RUN: llvm-readobj -elf-output-style LLVM --notes %t.so | FileCheck %s --check-prefix=LLVM +# RUN: llvm-readelf --notes %t.so | FileCheck %s --check-prefix=GNU +# RUN: llvm-readobj --elf-output-style LLVM --notes %t.so | FileCheck %s --check-prefix=LLVM # GNU: Displaying notes found at file offset 0x00000340 with length 0x00000020: # GNU-NEXT: Owner Data size Description diff --git a/llvm/test/tools/llvm-readobj/gnu-phdrs.test b/llvm/test/tools/llvm-readobj/gnu-phdrs.test index f6840e5039c..6db6d546d68 100644 --- a/llvm/test/tools/llvm-readobj/gnu-phdrs.test +++ b/llvm/test/tools/llvm-readobj/gnu-phdrs.test @@ -10,9 +10,9 @@ # compiled as clang++ source.cpp # and clang++ -m32 source.cpp -RUN: llvm-readobj -program-headers %p/Inputs/phdrs-elf.exe-i386 --elf-output-style=GNU \ +RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-i386 --elf-output-style=GNU \ RUN: | FileCheck %s -check-prefix ELF32 -RUN: llvm-readobj -program-headers %p/Inputs/phdrs-elf.exe-x86_64 --elf-output-style=GNU \ +RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-x86_64 --elf-output-style=GNU \ RUN: | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING RUN: llvm-readelf -program-headers %p/Inputs/phdrs-elf.exe-x86_64 \ RUN: | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING diff --git a/llvm/test/tools/llvm-readobj/gnu-sections.test b/llvm/test/tools/llvm-readobj/gnu-sections.test index f5b504fa66f..a61f767fe14 100644 --- a/llvm/test/tools/llvm-readobj/gnu-sections.test +++ b/llvm/test/tools/llvm-readobj/gnu-sections.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -s %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \ +RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \ RUN: | FileCheck %s -check-prefix ELF32 RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \ RUN: | FileCheck %s -check-prefix ELF64 diff --git a/llvm/test/tools/llvm-readobj/macho-needed-libs.test b/llvm/test/tools/llvm-readobj/macho-needed-libs.test index 22e6948e758..d199327cadb 100644 --- a/llvm/test/tools/llvm-readobj/macho-needed-libs.test +++ b/llvm/test/tools/llvm-readobj/macho-needed-libs.test @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t.o -# RUN: llvm-readobj -needed-libs %t.o | FileCheck %s +# RUN: llvm-readobj --needed-libs %t.o | FileCheck %s # CHECK: NeededLibraries [ # CHECK-NEXT: /usr/lib/libSystem.B.dylib diff --git a/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test b/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test index 2138bb70ad3..b13bd455b17 100644 --- a/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test +++ b/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test @@ -1,13 +1,13 @@ RUN: llvm-readobj -h %p/Inputs/macho-universal.x86_64.i386 \ RUN: | FileCheck %s -check-prefix MULTIHEADER -RUN: llvm-readobj -sections %p/Inputs/macho-universal.x86_64.i386 \ +RUN: llvm-readobj --sections %p/Inputs/macho-universal.x86_64.i386 \ RUN: | FileCheck %s -check-prefix MULTISECTIONS RUN: llvm-readobj -h %p/Inputs/macho-universal-archive.x86_64.i386 \ RUN: | FileCheck %s -check-prefix MULTIHEADER-ARCHIVE -RUN: llvm-readobj -sections %p/Inputs/macho-universal-archive.x86_64.i386 \ +RUN: llvm-readobj --sections %p/Inputs/macho-universal-archive.x86_64.i386 \ RUN: | FileCheck %s -check-prefix MULTISECTIONS-ARCHIVE MULTIHEADER: Format: Mach-O 64-bit x86-64 diff --git a/llvm/test/tools/llvm-readobj/many-sections.s b/llvm/test/tools/llvm-readobj/many-sections.s index 053dbbf9fb7..bf3e7b22675 100644 --- a/llvm/test/tools/llvm-readobj/many-sections.s +++ b/llvm/test/tools/llvm-readobj/many-sections.s @@ -11,13 +11,13 @@ ## space, but its e_shnum, e_shstrndx, sh_size and sh_link fields are set ## according to the above description, so that we can test the dumper. -# RUN: llvm-readobj -file-headers -sections -elf-output-style GNU \ +# RUN: llvm-readobj --file-headers -S --elf-output-style GNU \ # RUN: %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=GNU1 # GNU1: Number of section headers: 0 (5) # GNU1: Section header string table index: 65535 (3) # GNU1: There are 5 section headers, starting at offset 0xb8 -# RUN: llvm-readobj -file-headers -elf-output-style LLVM \ +# RUN: llvm-readobj --file-headers --elf-output-style LLVM \ # RUN: %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=LLVM1 # LLVM1: SectionHeaderCount: 0 (5) # LLVM1: StringTableSectionIndex: 65535 (3) @@ -26,12 +26,12 @@ ## e_shoff field set to zero, but not e_shstrndx, to show that ## this corrupt case is handled correctly. -# RUN: llvm-readobj -file-headers -elf-output-style GNU \ +# RUN: llvm-readobj --file-headers --elf-output-style GNU \ # RUN: %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=GNU2 # GNU2: Number of section headers: 0 # GNU2: Section header string table index: 65535 (corrupt: out of range) -# RUN: llvm-readobj -file-headers -elf-output-style LLVM \ +# RUN: llvm-readobj --file-headers --elf-output-style LLVM \ # RUN: %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=LLVM2 # LLVM2: SectionHeaderCount: 0 # LLVM2: StringTableSectionIndex: 65535 (corrupt: out of range) diff --git a/llvm/test/tools/llvm-readobj/mips-abiflags.test b/llvm/test/tools/llvm-readobj/mips-abiflags.test index b4c769be207..c06d147397e 100644 --- a/llvm/test/tools/llvm-readobj/mips-abiflags.test +++ b/llvm/test/tools/llvm-readobj/mips-abiflags.test @@ -1,6 +1,6 @@ -RUN: llvm-readobj -mips-abi-flags %p/Inputs/abiflags.obj.elf-mipsel | \ +RUN: llvm-readobj --mips-abi-flags %p/Inputs/abiflags.obj.elf-mipsel | \ RUN: FileCheck -check-prefix=EL64 %s -RUN: llvm-readobj -mips-abi-flags %p/Inputs/abiflags.obj.elf-mips | \ +RUN: llvm-readobj --mips-abi-flags %p/Inputs/abiflags.obj.elf-mips | \ RUN: FileCheck -check-prefix=BE32 %s EL64: MIPS ABI Flags { diff --git a/llvm/test/tools/llvm-readobj/mips-got-overlapped.test b/llvm/test/tools/llvm-readobj/mips-got-overlapped.test index ae4ae953295..85c4fe2d67c 100644 --- a/llvm/test/tools/llvm-readobj/mips-got-overlapped.test +++ b/llvm/test/tools/llvm-readobj/mips-got-overlapped.test @@ -1,9 +1,9 @@ -# Check that llvm-readobj -mips-plt-got correctly shows .got section +# Check that llvm-readobj --mips-plt-got correctly shows .got section # content if there are some other zero-sized sections with the same # address as the .got. got-over.exe.elf-mips has zero-sized .data # section at the same offset .got section. -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-over.exe.elf-mips | FileCheck %s +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-over.exe.elf-mips | FileCheck %s GOT-OBJ: Cannot find PLTGOT dynamic table tag. diff --git a/llvm/test/tools/llvm-readobj/mips-got.test b/llvm/test/tools/llvm-readobj/mips-got.test index ca7edc2fbf1..c9311421bf5 100644 --- a/llvm/test/tools/llvm-readobj/mips-got.test +++ b/llvm/test/tools/llvm-readobj/mips-got.test @@ -1,32 +1,32 @@ -RUN: not llvm-readobj -mips-plt-got %p/Inputs/relocs.obj.elf-mips 2>&1 | \ +RUN: not llvm-readobj --mips-plt-got %p/Inputs/relocs.obj.elf-mips 2>&1 | \ RUN: FileCheck %s -check-prefix GOT-OBJ -RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-exe.mips | \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-exe.mips | \ RUN: FileCheck %s -check-prefix GOT-EXE -RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-so.mips | \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-so.mips | \ RUN: FileCheck %s -check-prefix GOT-SO -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-tls.so.elf-mips64el | \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el | \ RUN: FileCheck %s -check-prefix GOT-TLS -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-empty.exe.mipsel | \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-empty.exe.mipsel | \ RUN: FileCheck %s -check-prefix GOT-EMPTY -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-static.exe.mips | \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips | \ RUN: FileCheck %s -check-prefix GOT-STATIC -RUN: not llvm-readobj -mips-plt-got %p/Inputs/relocs.obj.elf-mips \ +RUN: not llvm-readobj --mips-plt-got %p/Inputs/relocs.obj.elf-mips \ RUN: --elf-output-style=GNU 2>&1 | \ RUN: FileCheck %s -check-prefix GNU-GOT-OBJ -RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-exe.mips \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-exe.mips \ RUN: --elf-output-style=GNU | \ RUN: FileCheck %s -check-prefix GNU-GOT-EXE -RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-so.mips \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-so.mips \ RUN: --elf-output-style=GNU | \ RUN: FileCheck %s -check-prefix GNU-GOT-SO -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-tls.so.elf-mips64el \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el \ RUN: --elf-output-style=GNU | \ RUN: FileCheck %s -check-prefix GNU-GOT-TLS -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-empty.exe.mipsel \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-empty.exe.mipsel \ RUN: --elf-output-style=GNU | \ RUN: FileCheck %s -check-prefix GNU-GOT-EMPTY -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-static.exe.mips \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips \ RUN: --elf-output-style=GNU | \ RUN: FileCheck %s -check-prefix GNU-GOT-STATIC diff --git a/llvm/test/tools/llvm-readobj/mips-options-sec.test b/llvm/test/tools/llvm-readobj/mips-options-sec.test index 0fe8aad3dfa..64b3f0e9179 100644 --- a/llvm/test/tools/llvm-readobj/mips-options-sec.test +++ b/llvm/test/tools/llvm-readobj/mips-options-sec.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -mips-options %p/Inputs/options.obj.elf-mipsel | FileCheck %s +RUN: llvm-readobj --mips-options %p/Inputs/options.obj.elf-mipsel | FileCheck %s CHECK: MIPS Options { CHECK-NEXT: ODK_REGINFO { diff --git a/llvm/test/tools/llvm-readobj/mips-options.test b/llvm/test/tools/llvm-readobj/mips-options.test index 7a2959dd032..d44b3c0096a 100644 --- a/llvm/test/tools/llvm-readobj/mips-options.test +++ b/llvm/test/tools/llvm-readobj/mips-options.test @@ -1,6 +1,6 @@ # Check DT_MIPS_OPTIONS .dynamic section tag reading -RUN: llvm-readobj -dynamic-table %p/Inputs/mips-options.elf-mips64el | \ +RUN: llvm-readobj --dynamic-table %p/Inputs/mips-options.elf-mips64el | \ RUN: FileCheck %s CHECK: DynamicSection [ (14 entries) diff --git a/llvm/test/tools/llvm-readobj/mips-plt.test b/llvm/test/tools/llvm-readobj/mips-plt.test index f41940c9cf3..21670b0fb57 100644 --- a/llvm/test/tools/llvm-readobj/mips-plt.test +++ b/llvm/test/tools/llvm-readobj/mips-plt.test @@ -1,5 +1,5 @@ -RUN: llvm-readobj -mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel | FileCheck %s -RUN: llvm-readobj -mips-plt-got --elf-output-style=GNU \ +RUN: llvm-readobj --mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel | FileCheck %s +RUN: llvm-readobj --mips-plt-got --elf-output-style=GNU \ RUN: %p/Inputs/got-plt.exe.elf-mipsel \ RUN: | FileCheck --check-prefix=GNU %s diff --git a/llvm/test/tools/llvm-readobj/mips-reginfo.test b/llvm/test/tools/llvm-readobj/mips-reginfo.test index d983d0a6344..7571d4c56bf 100644 --- a/llvm/test/tools/llvm-readobj/mips-reginfo.test +++ b/llvm/test/tools/llvm-readobj/mips-reginfo.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -mips-reginfo %p/Inputs/reginfo.obj.elf-mipsel | FileCheck %s +RUN: llvm-readobj --mips-reginfo %p/Inputs/reginfo.obj.elf-mipsel | FileCheck %s CHECK: MIPS RegInfo { CHECK-NEXT: GP: 0x7FEF diff --git a/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test b/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test index adde78784d6..05e541120a6 100644 --- a/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test +++ b/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test @@ -1,6 +1,6 @@ # Check DT_MIPS_RLD_MAP_REL .dynamic section tag reading -RUN: llvm-readobj -dynamic-table %p/Inputs/mips-rld-map-rel.elf-mipsel | \ +RUN: llvm-readobj --dynamic-table %p/Inputs/mips-rld-map-rel.elf-mipsel | \ RUN: FileCheck %s CHECK: DynamicSection [ (16 entries) diff --git a/llvm/test/tools/llvm-readobj/mips-st-other.test b/llvm/test/tools/llvm-readobj/mips-st-other.test index 1f9de58ca89..c164004c141 100644 --- a/llvm/test/tools/llvm-readobj/mips-st-other.test +++ b/llvm/test/tools/llvm-readobj/mips-st-other.test @@ -1,6 +1,6 @@ -RUN: llvm-readobj -symbols %p/Inputs/st-other.obj.elf-mips \ +RUN: llvm-readobj --symbols %p/Inputs/st-other.obj.elf-mips \ RUN: | FileCheck -check-prefix=MREG %s -RUN: llvm-readobj -symbols %p/Inputs/st-other.obj.elf-mips16 \ +RUN: llvm-readobj --symbols %p/Inputs/st-other.obj.elf-mips16 \ RUN: | FileCheck -check-prefix=M16 %s MREG: Name: foo diff --git a/llvm/test/tools/llvm-readobj/note-gnu-property.s b/llvm/test/tools/llvm-readobj/note-gnu-property.s index 598c754d126..931dce6ba8f 100644 --- a/llvm/test/tools/llvm-readobj/note-gnu-property.s +++ b/llvm/test/tools/llvm-readobj/note-gnu-property.s @@ -1,7 +1,7 @@ // REQUIRES: x86-registered-target // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t -// RUN: llvm-readobj -elf-output-style GNU --notes %t | FileCheck %s --check-prefix=GNU -// RUN: llvm-readobj -elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM +// RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU +// RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM // GNU: Displaying notes found at file offset 0x00000040 with length 0x000000f8: // GNU-NEXT: Owner Data size Description diff --git a/llvm/test/tools/llvm-readobj/note-gnu-property2.s b/llvm/test/tools/llvm-readobj/note-gnu-property2.s index 473e0a24a7e..899f6cdbd75 100644 --- a/llvm/test/tools/llvm-readobj/note-gnu-property2.s +++ b/llvm/test/tools/llvm-readobj/note-gnu-property2.s @@ -1,7 +1,7 @@ // REQUIRES: x86-registered-target // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t -// RUN: llvm-readobj -elf-output-style GNU --notes %t | FileCheck %s --check-prefix=GNU -// RUN: llvm-readobj -elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM +// RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU +// RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM // GNU: Displaying notes found at file offset 0x00000040 with length 0x00000014: // GNU-NEXT: Owner Data size Description diff --git a/llvm/test/tools/llvm-readobj/peplus.test b/llvm/test/tools/llvm-readobj/peplus.test index 3619cd792d5..ff21d91372b 100644 --- a/llvm/test/tools/llvm-readobj/peplus.test +++ b/llvm/test/tools/llvm-readobj/peplus.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -file-headers %p/Inputs/nop.exe.coff-x86-64 | FileCheck %s +RUN: llvm-readobj --file-headers %p/Inputs/nop.exe.coff-x86-64 | FileCheck %s CHECK: Format: COFF-x86-64 CHECK: Arch: x86_64 diff --git a/llvm/test/tools/llvm-readobj/ppc64-glink.test b/llvm/test/tools/llvm-readobj/ppc64-glink.test index 9602a5af8ed..ac361784e06 100644 --- a/llvm/test/tools/llvm-readobj/ppc64-glink.test +++ b/llvm/test/tools/llvm-readobj/ppc64-glink.test @@ -1,6 +1,6 @@ # Check DT_PPC64_GLINK dynamic tag. -RUN: llvm-readobj -dynamic-table %p/Inputs/ppc64.exe | FileCheck %s +RUN: llvm-readobj --dynamic-table %p/Inputs/ppc64.exe | FileCheck %s CHECK: Format: ELF64-ppc64 CHECK: Arch: powerpc64le diff --git a/llvm/test/tools/llvm-readobj/program-headers.test b/llvm/test/tools/llvm-readobj/program-headers.test index e507442029b..960248eb0fa 100644 --- a/llvm/test/tools/llvm-readobj/program-headers.test +++ b/llvm/test/tools/llvm-readobj/program-headers.test @@ -1,10 +1,12 @@ -RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.elf-i386 \ +RUN: llvm-readobj --program-headers %p/../../Object/Inputs/program-headers.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-I386 -RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.elf-x86-64 \ +RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.elf-i386 \ +RUN: | FileCheck %s -check-prefix ELF-I386 +RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF-X86-64 -RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.mips \ +RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.mips \ RUN: | FileCheck %s -check-prefix ELF-MIPS -RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.mips64 \ +RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.mips64 \ RUN: | FileCheck %s -check-prefix ELF-MIPS64 ## openbsd-phdrs.elf-x86-64 was generated using GNU ld (GNU Binutils for Ubuntu) 2.26.1. @@ -18,7 +20,7 @@ RUN: | FileCheck %s -check-prefix ELF-MIPS64 ## 0x65a3dbe7 is the value of PT_OPENBSD_WXNEEDED, ## 0x65a41be6 is the value of PT_OPENBSD_BOOTDATA ## SECTIONS { . = SIZEOF_HEADERS; .all : { *(.*) } : text } -RUN: llvm-readobj -program-headers %p/../../Object/Inputs/openbsd-phdrs.elf-x86-64 \ +RUN: llvm-readobj -l %p/../../Object/Inputs/openbsd-phdrs.elf-x86-64 \ RUN: | FileCheck %s -check-prefix OPENBSD-X86-64 ELF-I386: ProgramHeaders [ diff --git a/llvm/test/tools/llvm-readobj/readelf-s-alias.test b/llvm/test/tools/llvm-readobj/readelf-s-alias.test index e34f81ec6c2..b50d0e2442a 100644 --- a/llvm/test/tools/llvm-readobj/readelf-s-alias.test +++ b/llvm/test/tools/llvm-readobj/readelf-s-alias.test @@ -1,5 +1,5 @@ # In llvm-readobj, -s is an alias for --sections. -RUN: llvm-readobj -s %p/Inputs/trivial.obj.elf-i386 \ +RUN: llvm-readobj -S %p/Inputs/trivial.obj.elf-i386 \ RUN: | FileCheck %s -check-prefix SEC RUN: llvm-readobj --sections %p/Inputs/trivial.obj.elf-i386 \ RUN: | FileCheck %s -check-prefix SEC diff --git a/llvm/test/tools/llvm-readobj/reloc-types.test b/llvm/test/tools/llvm-readobj/reloc-types.test index abdd0e36530..1d5210f36d4 100644 --- a/llvm/test/tools/llvm-readobj/reloc-types.test +++ b/llvm/test/tools/llvm-readobj/reloc-types.test @@ -3,19 +3,19 @@ // Todo: ELF-PPC, ELF-HEXAGON -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-i386 | FileCheck %s -check-prefix ELF-32 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-x86_64 | FileCheck %s -check-prefix ELF-64 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-aarch64 | FileCheck %s -check-prefix ELF-AARCH64 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-arm | FileCheck %s -check-prefix ELF-ARM -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-lanai | FileCheck %s -check-prefix ELF-LANAI -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-mips | FileCheck %s -check-prefix ELF-MIPS -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-mips64el | FileCheck %s -check-prefix ELF-MIPS64EL -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-ppc64 | FileCheck %s -check-prefix ELF-PPC64 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.coff-i386 | FileCheck %s -check-prefix COFF-32 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.coff-x86_64 | FileCheck %s -check-prefix COFF-64 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.macho-arm | FileCheck %s -check-prefix MACHO-ARM -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.macho-i386 | FileCheck %s -check-prefix MACHO-32 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.macho-x86_64 | FileCheck %s -check-prefix MACHO-64 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-i386 | FileCheck %s -check-prefix ELF-32 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-x86_64 | FileCheck %s -check-prefix ELF-64 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-aarch64 | FileCheck %s -check-prefix ELF-AARCH64 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-arm | FileCheck %s -check-prefix ELF-ARM +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-lanai | FileCheck %s -check-prefix ELF-LANAI +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-mips | FileCheck %s -check-prefix ELF-MIPS +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-mips64el | FileCheck %s -check-prefix ELF-MIPS64EL +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-ppc64 | FileCheck %s -check-prefix ELF-PPC64 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.coff-i386 | FileCheck %s -check-prefix COFF-32 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.coff-x86_64 | FileCheck %s -check-prefix COFF-64 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.macho-arm | FileCheck %s -check-prefix MACHO-ARM +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.macho-i386 | FileCheck %s -check-prefix MACHO-32 +RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.macho-x86_64 | FileCheck %s -check-prefix MACHO-64 ELF-32: Type: R_386_NONE (0) diff --git a/llvm/test/tools/llvm-readobj/relocations.test b/llvm/test/tools/llvm-readobj/relocations.test index 9ca79e3c78d..a459981edf1 100644 --- a/llvm/test/tools/llvm-readobj/relocations.test +++ b/llvm/test/tools/llvm-readobj/relocations.test @@ -14,7 +14,7 @@ RUN: llvm-readobj -r --expand-relocs %p/Inputs/trivial.obj.macho-ppc \ RUN: | FileCheck %s -check-prefix MACHO-PPC RUN: llvm-readobj -r --expand-relocs %p/Inputs/trivial.obj.macho-ppc64 \ RUN: | FileCheck %s -check-prefix MACHO-PPC64 -RUN: llvm-readobj -r -expand-relocs %p/Inputs/trivial.obj.macho-arm \ +RUN: llvm-readobj -r --expand-relocs %p/Inputs/trivial.obj.macho-arm \ RUN: | FileCheck %s -check-prefix MACHO-ARM RUN: llvm-readobj -r --expand-relocs %p/Inputs/trivial.obj.wasm \ RUN: | FileCheck %s -check-prefix WASM diff --git a/llvm/test/tools/llvm-readobj/rpath.test b/llvm/test/tools/llvm-readobj/rpath.test index 600938ee938..c615adaa7a7 100644 --- a/llvm/test/tools/llvm-readobj/rpath.test +++ b/llvm/test/tools/llvm-readobj/rpath.test @@ -1,4 +1,4 @@ -RUN: llvm-readobj -dynamic-table %p/Inputs/rpath.exe.elf-x86_64 \ +RUN: llvm-readobj --dynamic-table %p/Inputs/rpath.exe.elf-x86_64 \ RUN: | FileCheck %s CHECK: 0x000000000000000F RPATH /usr/local/lib diff --git a/llvm/test/tools/llvm-readobj/sections-ext.test b/llvm/test/tools/llvm-readobj/sections-ext.test index e9849a67a31..2691c221112 100644 --- a/llvm/test/tools/llvm-readobj/sections-ext.test +++ b/llvm/test/tools/llvm-readobj/sections-ext.test @@ -1,30 +1,30 @@ -RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.coff-i386 \ +RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF -RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.elf-i386 \ +RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF -RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.macho-i386 \ +RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.macho-i386 \ RUN: | FileCheck %s -check-prefix MACHO-I386 -RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.macho-x86-64 \ +RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.macho-x86-64 \ RUN: | FileCheck %s -check-prefix MACHO-X86-64 -RUN: llvm-readobj --expand-relocs -s -st -sr -sd %p/Inputs/trivial.obj.macho-ppc \ +RUN: llvm-readobj --expand-relocs -S --st --sr --sd %p/Inputs/trivial.obj.macho-ppc \ RUN: | FileCheck %s -check-prefix MACHO-PPC -RUN: llvm-readobj --expand-relocs -s -st -sr -sd %p/Inputs/trivial.obj.macho-ppc64 \ +RUN: llvm-readobj --expand-relocs -S --st --sr --sd %p/Inputs/trivial.obj.macho-ppc64 \ RUN: | FileCheck %s -check-prefix MACHO-PPC64 -RUN: llvm-readobj -expand-relocs -s -st -sr -sd %p/Inputs/trivial.obj.macho-arm \ +RUN: llvm-readobj --expand-relocs -S --st --sr --sd %p/Inputs/trivial.obj.macho-arm \ RUN: | FileCheck %s -check-prefix MACHO-ARM # Check the two-letter aliases above (-st, -sr, -sd) are equivalent to their # full flag names. -RUN: llvm-readobj -s -st %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-alias -RUN: llvm-readobj -s --section-symbols %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-no-alias +RUN: llvm-readobj -S --st %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-alias +RUN: llvm-readobj -S --section-symbols %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-no-alias RUN: diff %t.readobj-st-alias %t.readobj-st-no-alias -RUN: llvm-readobj -s -sr %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-alias -RUN: llvm-readobj -s --section-relocations %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-no-alias +RUN: llvm-readobj -S --sr %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-alias +RUN: llvm-readobj -S --section-relocations %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-no-alias RUN: diff %t.readobj-sr-alias %t.readobj-sr-no-alias -RUN: llvm-readobj -s -sd %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-alias -RUN: llvm-readobj -s --section-data %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-no-alias +RUN: llvm-readobj -S --sd %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-alias +RUN: llvm-readobj -S --section-data %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-no-alias RUN: diff %t.readobj-sd-alias %t.readobj-sd-no-alias COFF: Sections [ diff --git a/llvm/test/tools/llvm-readobj/sections.test b/llvm/test/tools/llvm-readobj/sections.test index a66e663d0de..5eab22be1a3 100644 --- a/llvm/test/tools/llvm-readobj/sections.test +++ b/llvm/test/tools/llvm-readobj/sections.test @@ -21,7 +21,7 @@ RUN: | FileCheck %s -check-prefix WASM RUN: llvm-readobj --sections %p/Inputs/trivial.obj.elf-i386 > %t.sections RUN: llvm-readobj -S %p/Inputs/trivial.obj.elf-i386 > %t.uppers RUN: cmp %t.sections %t.uppers -RUN: llvm-readobj -s %p/Inputs/trivial.obj.elf-i386 > %t.lowers +RUN: llvm-readobj -S %p/Inputs/trivial.obj.elf-i386 > %t.lowers RUN: cmp %t.sections %t.lowers COFF: Sections [ diff --git a/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test b/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test index 879afe27efb..17d05163346 100644 --- a/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test +++ b/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test @@ -1,5 +1,5 @@ -RUN: llvm-readobj -unwind %p/Inputs/arm64-win1.obj | FileCheck %s -check-prefix=UNWIND1 -RUN: llvm-readobj -unwind %p/Inputs/arm64-win2.obj | FileCheck %s -check-prefix=UNWIND2 +RUN: llvm-readobj --unwind %p/Inputs/arm64-win1.obj | FileCheck %s -check-prefix=UNWIND1 +RUN: llvm-readobj --unwind %p/Inputs/arm64-win2.obj | FileCheck %s -check-prefix=UNWIND2 UNWIND1: ExceptionData { UNWIND1-NEXT: FunctionLength: 340 diff --git a/llvm/test/tools/llvm-readobj/unwind.test b/llvm/test/tools/llvm-readobj/unwind.test index 72c591048c8..8c6b13f584c 100644 --- a/llvm/test/tools/llvm-readobj/unwind.test +++ b/llvm/test/tools/llvm-readobj/unwind.test @@ -1,5 +1,5 @@ RUN: yaml2obj %p/Inputs/dwarf-exprs.exe-x86-64.yaml > %t.exe -RUN: llvm-readobj -unwind %t.exe | FileCheck %s +RUN: llvm-readobj --unwind %t.exe | FileCheck %s CHECK: EH_FRAME Header [ CHECK-NEXT: Address: 0x4013c0 diff --git a/llvm/test/tools/yaml2obj/coff-arm64.yaml b/llvm/test/tools/yaml2obj/coff-arm64.yaml index d734e300c04..5bb9939f1fc 100644 --- a/llvm/test/tools/yaml2obj/coff-arm64.yaml +++ b/llvm/test/tools/yaml2obj/coff-arm64.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -file-headers %t | FileCheck %s +# RUN: llvm-readobj --file-headers %t | FileCheck %s # RUN: obj2yaml %t | FileCheck %s --check-prefix=ROUNDTRIP # CHECK: OptionalHeaderSize: 240 diff --git a/llvm/test/tools/yaml2obj/coff-symbol-index.yaml b/llvm/test/tools/yaml2obj/coff-symbol-index.yaml index 592ecb38b1d..7973b2558c5 100644 --- a/llvm/test/tools/yaml2obj/coff-symbol-index.yaml +++ b/llvm/test/tools/yaml2obj/coff-symbol-index.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -relocations %t | FileCheck %s --check-prefix=RELOCS +# RUN: llvm-readobj -r %t | FileCheck %s --check-prefix=RELOCS # RUN: obj2yaml %t | FileCheck %s --check-prefix=YAML # RELOCS: Relocations [ diff --git a/llvm/test/tools/yaml2obj/dynamic-section.yaml b/llvm/test/tools/yaml2obj/dynamic-section.yaml index 39da5c1f6f0..2480810d33b 100644 --- a/llvm/test/tools/yaml2obj/dynamic-section.yaml +++ b/llvm/test/tools/yaml2obj/dynamic-section.yaml @@ -1,6 +1,6 @@ # Ensures that dynamic section has sh_entsize correctly set # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=SECTION +# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=SECTION !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/dynamic-symbols.yaml b/llvm/test/tools/yaml2obj/dynamic-symbols.yaml index c4abc648880..47527a3a7ac 100644 --- a/llvm/test/tools/yaml2obj/dynamic-symbols.yaml +++ b/llvm/test/tools/yaml2obj/dynamic-symbols.yaml @@ -1,6 +1,6 @@ # Ensures that implicitly added sections can be ordered within Sections. # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=SECTION +# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=SECTION # RUN: llvm-nm --dynamic %t | FileCheck %s --check-prefix=SYMBOL !ELF diff --git a/llvm/test/tools/yaml2obj/dynsym-dynstr-addr.yaml b/llvm/test/tools/yaml2obj/dynsym-dynstr-addr.yaml index e256fdc00e0..194c5e5deb3 100644 --- a/llvm/test/tools/yaml2obj/dynsym-dynstr-addr.yaml +++ b/llvm/test/tools/yaml2obj/dynsym-dynstr-addr.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s ## Check yaml2obj does not ignore the address of the ## explicitly listed .dynstr and .dynsym sections. diff --git a/llvm/test/tools/yaml2obj/elf-abiversion.yaml b/llvm/test/tools/yaml2obj/elf-abiversion.yaml index 0f43e69828f..0aab621d257 100644 --- a/llvm/test/tools/yaml2obj/elf-abiversion.yaml +++ b/llvm/test/tools/yaml2obj/elf-abiversion.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -file-headers %t | FileCheck %s --check-prefix=FROMYAML +# RUN: llvm-readobj --file-headers %t | FileCheck %s --check-prefix=FROMYAML # RUN: obj2yaml %t | FileCheck %s --check-prefix=TOYAML ## Check we are able to parse/emit the ABI version with yaml2obj/obj2yaml. diff --git a/llvm/test/tools/yaml2obj/elf-comdat-broken-info.yaml b/llvm/test/tools/yaml2obj/elf-comdat-broken-info.yaml index 4528d35798a..78b2f4b1c5a 100644 --- a/llvm/test/tools/yaml2obj/elf-comdat-broken-info.yaml +++ b/llvm/test/tools/yaml2obj/elf-comdat-broken-info.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s --- !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/elf-comdat-broken.yaml b/llvm/test/tools/yaml2obj/elf-comdat-broken.yaml index 5ed7a56c9a6..87ff6fe66c0 100644 --- a/llvm/test/tools/yaml2obj/elf-comdat-broken.yaml +++ b/llvm/test/tools/yaml2obj/elf-comdat-broken.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections -elf-section-groups %t | FileCheck %s +# RUN: llvm-readobj --sections --elf-section-groups %t | FileCheck %s --- !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/elf-ent-size.yaml b/llvm/test/tools/yaml2obj/elf-ent-size.yaml index bb26b046722..06b989945db 100644 --- a/llvm/test/tools/yaml2obj/elf-ent-size.yaml +++ b/llvm/test/tools/yaml2obj/elf-ent-size.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/elf-gnu-unique-symbols.yaml b/llvm/test/tools/yaml2obj/elf-gnu-unique-symbols.yaml index 06c504e65b3..e045b52c202 100644 --- a/llvm/test/tools/yaml2obj/elf-gnu-unique-symbols.yaml +++ b/llvm/test/tools/yaml2obj/elf-gnu-unique-symbols.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -symbols %t | FileCheck %s +# RUN: llvm-readobj --symbols %t | FileCheck %s ## Check yaml2obj is able to create the STB_GNU_UNIQUE symbol. diff --git a/llvm/test/tools/yaml2obj/elf-symtab-shinfo.yaml b/llvm/test/tools/yaml2obj/elf-symtab-shinfo.yaml index 982c5d4efeb..50c0b6c9c55 100644 --- a/llvm/test/tools/yaml2obj/elf-symtab-shinfo.yaml +++ b/llvm/test/tools/yaml2obj/elf-symtab-shinfo.yaml @@ -1,6 +1,6 @@ ## Check we are able to set sh_info field for SHT_SYMTAB sections. # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s # CHECK: Name: .symtab # CHECK-NEXT: Type: SHT_SYMTAB diff --git a/llvm/test/tools/yaml2obj/elf-symtab-shtype.yaml b/llvm/test/tools/yaml2obj/elf-symtab-shtype.yaml index 143c0255b0e..558ec8c6da4 100644 --- a/llvm/test/tools/yaml2obj/elf-symtab-shtype.yaml +++ b/llvm/test/tools/yaml2obj/elf-symtab-shtype.yaml @@ -1,6 +1,6 @@ ## Check we dont crash when .symtab has type different from SHT_SYMTAB. # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s ## TODO: the output is still SHT_SYMTAB because we do not yet ## support changing it. diff --git a/llvm/test/tools/yaml2obj/invalid-symboless-relocation.yaml b/llvm/test/tools/yaml2obj/invalid-symboless-relocation.yaml index 538f64c9ccc..716778e16f8 100644 --- a/llvm/test/tools/yaml2obj/invalid-symboless-relocation.yaml +++ b/llvm/test/tools/yaml2obj/invalid-symboless-relocation.yaml @@ -1,7 +1,7 @@ # This test succeeds but produces an invalid relocation. This test # documents this behavoir. # RUN: yaml2obj %s > %t -# RUN: llvm-readobj -relocations %t | FileCheck %s +# RUN: llvm-readobj -r %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/local-symbols.yaml b/llvm/test/tools/yaml2obj/local-symbols.yaml index 8cd5b0191f3..fa82a90923d 100644 --- a/llvm/test/tools/yaml2obj/local-symbols.yaml +++ b/llvm/test/tools/yaml2obj/local-symbols.yaml @@ -3,7 +3,7 @@ # the symbol table index for the first non-local symbol. # RUN: yaml2obj -docnum=1 %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=ONE +# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=ONE # ONE: Name: .symtab # ONE: Info: 2 @@ -19,7 +19,7 @@ Symbols: Binding: STB_GLOBAL # RUN: yaml2obj -docnum=2 %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=TWO +# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=TWO # TWO: Name: .symtab # TWO: Info: 3 diff --git a/llvm/test/tools/yaml2obj/program-header-align.yaml b/llvm/test/tools/yaml2obj/program-header-align.yaml index de51f5dc070..88b5d2722e0 100644 --- a/llvm/test/tools/yaml2obj/program-header-align.yaml +++ b/llvm/test/tools/yaml2obj/program-header-align.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -program-headers %t | FileCheck %s +# RUN: llvm-readobj -l %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/program-header-nobits.yaml b/llvm/test/tools/yaml2obj/program-header-nobits.yaml index 4664753a4b1..81fdb937228 100644 --- a/llvm/test/tools/yaml2obj/program-header-nobits.yaml +++ b/llvm/test/tools/yaml2obj/program-header-nobits.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -program-headers %t | FileCheck %s +# RUN: llvm-readobj -l %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/program-header.yaml b/llvm/test/tools/yaml2obj/program-header.yaml index f07e393f512..045ea6deee8 100644 --- a/llvm/test/tools/yaml2obj/program-header.yaml +++ b/llvm/test/tools/yaml2obj/program-header.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -program-headers %t | FileCheck %s +# RUN: llvm-readobj -l %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/reloc-sec-info.yaml b/llvm/test/tools/yaml2obj/reloc-sec-info.yaml index ebde2fa6fd8..9e7901833cf 100644 --- a/llvm/test/tools/yaml2obj/reloc-sec-info.yaml +++ b/llvm/test/tools/yaml2obj/reloc-sec-info.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s # CHECK: Name: .rela.text # CHECK-NEXT: Type: SHT_RELA diff --git a/llvm/test/tools/yaml2obj/section-link.yaml b/llvm/test/tools/yaml2obj/section-link.yaml index 3045d36910d..556e8dd6fec 100644 --- a/llvm/test/tools/yaml2obj/section-link.yaml +++ b/llvm/test/tools/yaml2obj/section-link.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s # CHECK: Name: .text # CHECK-NEXT: Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/section-ordering.yaml b/llvm/test/tools/yaml2obj/section-ordering.yaml index 885b28a2c09..5595f9379e9 100644 --- a/llvm/test/tools/yaml2obj/section-ordering.yaml +++ b/llvm/test/tools/yaml2obj/section-ordering.yaml @@ -1,6 +1,6 @@ # Ensures that implicitly added sections can be ordered within Sections. # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/yaml2obj/unnamed-section.yaml b/llvm/test/tools/yaml2obj/unnamed-section.yaml index 538e2870e0b..e0d664e06d4 100644 --- a/llvm/test/tools/yaml2obj/unnamed-section.yaml +++ b/llvm/test/tools/yaml2obj/unnamed-section.yaml @@ -1,6 +1,6 @@ # Ensure yaml2obj doesn't crash on unnamed sections # RUN: yaml2obj %s -o %t -# RUN: llvm-readobj -sections %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck %s !ELF FileHeader: diff --git a/llvm/tools/llvm-readobj/llvm-readobj.cpp b/llvm/tools/llvm-readobj/llvm-readobj.cpp index 7ccc67bfb31..d4feda4cc64 100644 --- a/llvm/tools/llvm-readobj/llvm-readobj.cpp +++ b/llvm/tools/llvm-readobj/llvm-readobj.cpp @@ -49,7 +49,7 @@ namespace opts { cl::desc("<input object files>"), cl::ZeroOrMore); - // -all, -a + // --all, -a cl::opt<bool> All("all", cl::desc("Equivalent to setting: --file-headers, --program-headers, " @@ -66,7 +66,7 @@ namespace opts { cl::alias HeadersShort("e", cl::desc("Alias for --headers"), cl::aliasopt(Headers)); - // -wide, -W + // --wide, -W cl::opt<bool> WideOutput("wide", cl::desc("Ignored for compatibility with GNU readelf"), cl::Hidden); @@ -74,7 +74,7 @@ namespace opts { cl::desc("Alias for --wide"), cl::aliasopt(WideOutput)); - // -file-headers, -file-header, -h + // --file-headers, --file-header, -h cl::opt<bool> FileHeaders("file-headers", cl::desc("Display file headers ")); cl::alias FileHeadersShort("h", cl::desc("Alias for --file-headers"), @@ -83,7 +83,7 @@ namespace opts { cl::desc("Alias for --file-headers"), cl::aliasopt(FileHeaders)); - // -section-headers, -sections, -S + // --section-headers, --sections, -S // Also -s in llvm-readobj mode. cl::opt<bool> SectionHeaders("section-headers", cl::desc("Display all section headers.")); @@ -93,27 +93,27 @@ namespace opts { cl::desc("Alias for --section-headers"), cl::aliasopt(SectionHeaders), cl::NotHidden); - // -section-relocations - // Also -sr in llvm-readobj mode. + // --section-relocations + // Also --sr in llvm-readobj mode. cl::opt<bool> SectionRelocations("section-relocations", cl::desc("Display relocations for each section shown.")); - // -section-symbols - // Also -st in llvm-readobj mode. + // --section-symbols + // Also --st in llvm-readobj mode. cl::opt<bool> SectionSymbols("section-symbols", cl::desc("Display symbols for each section shown.")); - // -section-data - // Also -sd in llvm-readobj mode. + // --section-data + // Also --sd in llvm-readobj mode. cl::opt<bool> SectionData("section-data", cl::desc("Display section data for each section shown.")); - // -section-mapping + // --section-mapping cl::opt<cl::boolOrDefault> SectionMapping("section-mapping", cl::desc("Display the section to segment mapping.")); - // -relocations, -relocs, -r + // --relocations, --relocs, -r cl::opt<bool> Relocations("relocations", cl::desc("Display the relocation entries in the file")); cl::alias RelocationsShort("r", cl::desc("Alias for --relocations"), @@ -121,15 +121,15 @@ namespace opts { cl::alias RelocationsGNU("relocs", cl::desc("Alias for --relocations"), cl::aliasopt(Relocations)); - // -notes, -n + // --notes, -n cl::opt<bool> Notes("notes", cl::desc("Display the ELF notes in the file")); cl::alias NotesShort("n", cl::desc("Alias for --notes"), cl::aliasopt(Notes)); - // -dyn-relocations + // --dyn-relocations cl::opt<bool> DynRelocs("dyn-relocations", cl::desc("Display the dynamic relocation entries in the file")); - // -symbols + // --symbols // Also -s in llvm-readelf mode, or -t in llvm-readobj mode. cl::opt<bool> Symbols("symbols", @@ -138,26 +138,26 @@ namespace opts { cl::alias SymbolsGNU("syms", cl::desc("Alias for --symbols"), cl::aliasopt(Symbols)); - // -dyn-symbols, -dyn-syms - // Also -dt in llvm-readobj mode. + // --dyn-symbols, --dyn-syms + // Also --dt in llvm-readobj mode. cl::opt<bool> DynamicSymbols("dyn-symbols", cl::desc("Display the dynamic symbol table")); cl::alias DynSymsGNU("dyn-syms", cl::desc("Alias for --dyn-symbols"), cl::aliasopt(DynamicSymbols)); - // -hash-symbols + // --hash-symbols cl::opt<bool> HashSymbols( "hash-symbols", cl::desc("Display the dynamic symbols derived from the hash section")); - // -unwind, -u + // --unwind, -u cl::opt<bool> UnwindInfo("unwind", cl::desc("Display unwind information")); cl::alias UnwindInfoShort("u", cl::desc("Alias for --unwind"), cl::aliasopt(UnwindInfo)); - // -dynamic-table, -dynamic, -d + // --dynamic-table, --dynamic, -d cl::opt<bool> DynamicTable("dynamic-table", cl::desc("Display the ELF .dynamic section table")); cl::alias DynamicTableShort("d", cl::desc("Alias for --dynamic-table"), @@ -165,11 +165,11 @@ namespace opts { cl::alias DynamicTableAlias("dynamic", cl::desc("Alias for --dynamic-table"), cl::aliasopt(DynamicTable)); - // -needed-libs + // --needed-libs cl::opt<bool> NeededLibraries("needed-libs", cl::desc("Display the needed libraries")); - // -program-headers, -segments, -l + // --program-headers, --segments, -l cl::opt<bool> ProgramHeaders("program-headers", cl::desc("Display ELF program headers")); cl::alias ProgramHeadersShort("l", cl::desc("Alias for --program-headers"), @@ -177,161 +177,161 @@ namespace opts { cl::alias SegmentsAlias("segments", cl::desc("Alias for --program-headers"), cl::aliasopt(ProgramHeaders)); - // -string-dump, -p + // --string-dump, -p cl::list<std::string> StringDump("string-dump", cl::desc("<number|name>"), cl::ZeroOrMore); cl::alias StringDumpShort("p", cl::desc("Alias for --string-dump"), cl::aliasopt(StringDump), cl::Prefix); - // -hex-dump, -x + // --hex-dump, -x cl::list<std::string> HexDump("hex-dump", cl::desc("<number|name>"), cl::ZeroOrMore); cl::alias HexDumpShort("x", cl::desc("Alias for --hex-dump"), cl::aliasopt(HexDump), cl::Prefix); - // -demangle, -C + // --demangle, -C cl::opt<bool> Demangle("demangle", cl::desc("Demangle symbol names in output")); cl::alias DemangleShort("C", cl::desc("Alias for --demangle"), cl::aliasopt(Demangle), cl::NotHidden); - // -hash-table + // --hash-table cl::opt<bool> HashTable("hash-table", cl::desc("Display ELF hash table")); - // -gnu-hash-table + // --gnu-hash-table cl::opt<bool> GnuHashTable("gnu-hash-table", cl::desc("Display ELF .gnu.hash section")); - // -expand-relocs + // --expand-relocs cl::opt<bool> ExpandRelocs("expand-relocs", cl::desc("Expand each shown relocation to multiple lines")); - // -raw-relr + // --raw-relr cl::opt<bool> RawRelr("raw-relr", cl::desc("Do not decode relocations in SHT_RELR section, display raw contents")); - // -codeview + // --codeview cl::opt<bool> CodeView("codeview", cl::desc("Display CodeView debug information")); - // -codeview-merged-types + // --codeview-merged-types cl::opt<bool> CodeViewMergedTypes("codeview-merged-types", cl::desc("Display the merged CodeView type stream")); - // -codeview-ghash + // --codeview-ghash cl::opt<bool> CodeViewEnableGHash( "codeview-ghash", cl::desc( "Enable global hashing for CodeView type stream de-duplication")); - // -codeview-subsection-bytes + // --codeview-subsection-bytes cl::opt<bool> CodeViewSubsectionBytes( "codeview-subsection-bytes", cl::desc("Dump raw contents of codeview debug sections and records")); - // -arm-attributes + // --arm-attributes cl::opt<bool> ARMAttributes("arm-attributes", cl::desc("Display the ARM attributes section")); - // -mips-plt-got + // --mips-plt-got cl::opt<bool> MipsPLTGOT("mips-plt-got", cl::desc("Display the MIPS GOT and PLT GOT sections")); - // -mips-abi-flags + // --mips-abi-flags cl::opt<bool> MipsABIFlags("mips-abi-flags", cl::desc("Display the MIPS.abiflags section")); - // -mips-reginfo + // --mips-reginfo cl::opt<bool> MipsReginfo("mips-reginfo", cl::desc("Display the MIPS .reginfo section")); - // -mips-options + // --mips-options cl::opt<bool> MipsOptions("mips-options", cl::desc("Display the MIPS .MIPS.options section")); - // -coff-imports + // --coff-imports cl::opt<bool> COFFImports("coff-imports", cl::desc("Display the PE/COFF import table")); - // -coff-exports + // --coff-exports cl::opt<bool> COFFExports("coff-exports", cl::desc("Display the PE/COFF export table")); - // -coff-directives + // --coff-directives cl::opt<bool> COFFDirectives("coff-directives", cl::desc("Display the PE/COFF .drectve section")); - // -coff-basereloc + // --coff-basereloc cl::opt<bool> COFFBaseRelocs("coff-basereloc", cl::desc("Display the PE/COFF .reloc section")); - // -coff-debug-directory + // --coff-debug-directory cl::opt<bool> COFFDebugDirectory("coff-debug-directory", cl::desc("Display the PE/COFF debug directory")); - // -coff-resources + // --coff-resources cl::opt<bool> COFFResources("coff-resources", cl::desc("Display the PE/COFF .rsrc section")); - // -coff-load-config + // --coff-load-config cl::opt<bool> COFFLoadConfig("coff-load-config", cl::desc("Display the PE/COFF load config")); - // -elf-linker-options + // --elf-linker-options cl::opt<bool> ELFLinkerOptions("elf-linker-options", cl::desc("Display the ELF .linker-options section")); - // -macho-data-in-code + // --macho-data-in-code cl::opt<bool> MachODataInCode("macho-data-in-code", cl::desc("Display MachO Data in Code command")); - // -macho-indirect-symbols + // --macho-indirect-symbols cl::opt<bool> MachOIndirectSymbols("macho-indirect-symbols", cl::desc("Display MachO indirect symbols")); - // -macho-linker-options + // --macho-linker-options cl::opt<bool> MachOLinkerOptions("macho-linker-options", cl::desc("Display MachO linker options")); - // -macho-segment + // --macho-segment cl::opt<bool> MachOSegment("macho-segment", cl::desc("Display MachO Segment command")); - // -macho-version-min + // --macho-version-min cl::opt<bool> MachOVersionMin("macho-version-min", cl::desc("Display MachO version min command")); - // -macho-dysymtab + // --macho-dysymtab cl::opt<bool> MachODysymtab("macho-dysymtab", cl::desc("Display MachO Dysymtab command")); - // -stackmap + // --stackmap cl::opt<bool> PrintStackMap("stackmap", cl::desc("Display contents of stackmap section")); - // -version-info, -V + // --version-info, -V cl::opt<bool> VersionInfo("version-info", cl::desc("Display ELF version sections (if present)")); cl::alias VersionInfoShort("V", cl::desc("Alias for -version-info"), cl::aliasopt(VersionInfo)); - // -elf-section-groups, -section-groups, -g + // --elf-section-groups, --section-groups, -g cl::opt<bool> SectionGroups("elf-section-groups", cl::desc("Display ELF section group contents")); cl::alias SectionGroupsAlias("section-groups", @@ -340,7 +340,7 @@ namespace opts { cl::alias SectionGroupsShort("g", cl::desc("Alias for -elf-sections-groups"), cl::aliasopt(SectionGroups)); - // -elf-hash-histogram, -histogram, -I + // --elf-hash-histogram, --histogram, -I cl::opt<bool> HashHistogram( "elf-hash-histogram", cl::desc("Display bucket list histogram for hash sections")); @@ -350,7 +350,7 @@ namespace opts { cl::desc("Alias for --elf-hash-histogram"), cl::aliasopt(HashHistogram)); - // -elf-cg-profile + // --elf-cg-profile cl::opt<bool> CGProfile("elf-cg-profile", cl::desc("Display callgraph profile section")); // -addrsig |
