diff options
| author | Colin LeMahieu <colinl@codeaurora.org> | 2016-04-08 18:15:37 +0000 |
|---|---|---|
| committer | Colin LeMahieu <colinl@codeaurora.org> | 2016-04-08 18:15:37 +0000 |
| commit | efe37328831b7184548e038f067e3dd8313ec42f (patch) | |
| tree | f703c5532fdbcbdb5e4574ec57d973d34e98fe4c /llvm | |
| parent | 464f7dfd04b30ac550e3b5fbf836af716d6c3e06 (diff) | |
| download | bcm5719-llvm-efe37328831b7184548e038f067e3dd8313ec42f.tar.gz bcm5719-llvm-efe37328831b7184548e038f067e3dd8313ec42f.zip | |
Revert r265817
lld tests need to be addressed.
llvm-svn: 265822
Diffstat (limited to 'llvm')
62 files changed, 105 insertions, 107 deletions
diff --git a/llvm/test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-thumb.ll b/llvm/test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-thumb.ll index f4a95e73d97..b9bd4c24da0 100644 --- a/llvm/test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-thumb.ll +++ b/llvm/test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-thumb.ll @@ -1,4 +1,4 @@ -;RUN: llc -mtriple=thumbv7-linux-gnueabi < %s | llvm-mc -triple=thumbv7-linux-gnueabi -filetype=obj | llvm-objdump --print-imm-hex=false -triple=thumbv7 -d - | FileCheck %s +;RUN: llc -mtriple=thumbv7-linux-gnueabi < %s | llvm-mc -triple=thumbv7-linux-gnueabi -filetype=obj | llvm-objdump -triple=thumbv7 -d - | FileCheck %s ;RUN: llc -mtriple=thumbv7-linux-gnueabi < %s | FileCheck %s -check-prefix=ASM ;RUN: llc -mtriple=thumbv7-apple-darwin < %s | FileCheck %s -check-prefix=ASM diff --git a/llvm/test/CodeGen/ARM/inlineasm-switch-mode.ll b/llvm/test/CodeGen/ARM/inlineasm-switch-mode.ll index 2b5d3c2908c..6035612788d 100644 --- a/llvm/test/CodeGen/ARM/inlineasm-switch-mode.ll +++ b/llvm/test/CodeGen/ARM/inlineasm-switch-mode.ll @@ -1,7 +1,7 @@ ;RUN: llc -mtriple=thumbv7-linux-gnueabi < %s | llvm-mc -triple=thumbv7-linux-gnueabi -filetype=obj > %t ; Two pass decoding needed because llvm-objdump does not respect mapping symbols -;RUN: llvm-objdump --print-imm-hex=false -triple=armv7 -d %t | FileCheck %s --check-prefix=ARM -;RUN: llvm-objdump --print-imm-hex=false -triple=thumbv7 -d %t | FileCheck %s --check-prefix=THUMB +;RUN: llvm-objdump -triple=armv7 -d %t | FileCheck %s --check-prefix=ARM +;RUN: llvm-objdump -triple=thumbv7 -d %t | FileCheck %s --check-prefix=THUMB define hidden i32 @bah(i8* %start) #0 align 2 { %1 = ptrtoint i8* %start to i32 diff --git a/llvm/test/CodeGen/ARM/struct_byval_arm_t1_t2.ll b/llvm/test/CodeGen/ARM/struct_byval_arm_t1_t2.ll index 91d57a6c84f..0a9bc3c87f9 100644 --- a/llvm/test/CodeGen/ARM/struct_byval_arm_t1_t2.ll +++ b/llvm/test/CodeGen/ARM/struct_byval_arm_t1_t2.ll @@ -1,10 +1,10 @@ -;RUN: llc < %s -mtriple=armv7-none-linux-gnueabi -mattr=+neon -verify-machineinstrs -filetype=obj | llvm-objdump --print-imm-hex=false -triple armv7-none-linux-gnueabi -disassemble - | FileCheck %s --check-prefix=ARM -;RUN: llc < %s -mtriple=thumbv7-none-linux-gnueabi -mattr=+neon -verify-machineinstrs -filetype=obj | llvm-objdump --print-imm-hex=false -triple thumbv7-none-linux-gnueabi -disassemble - | FileCheck %s --check-prefix=THUMB2 -;RUN: llc < %s -mtriple=armv7-none-linux-gnueabi -mattr=-neon -verify-machineinstrs -filetype=obj | llvm-objdump --print-imm-hex=false -triple armv7-none-linux-gnueabi -disassemble - | FileCheck %s --check-prefix=NO_NEON +;RUN: llc < %s -mtriple=armv7-none-linux-gnueabi -mattr=+neon -verify-machineinstrs -filetype=obj | llvm-objdump -triple armv7-none-linux-gnueabi -disassemble - | FileCheck %s --check-prefix=ARM +;RUN: llc < %s -mtriple=thumbv7-none-linux-gnueabi -mattr=+neon -verify-machineinstrs -filetype=obj | llvm-objdump -triple thumbv7-none-linux-gnueabi -disassemble - | FileCheck %s --check-prefix=THUMB2 +;RUN: llc < %s -mtriple=armv7-none-linux-gnueabi -mattr=-neon -verify-machineinstrs -filetype=obj | llvm-objdump -triple armv7-none-linux-gnueabi -disassemble - | FileCheck %s --check-prefix=NO_NEON ;We want to have both positive and negative checks for thumb1. These checks ;are not easy to do in a single pass so we generate the output once to a ;temp file and run filecheck twice with different prefixes. -;RUN: llc < %s -mtriple=thumbv5-none-linux-gnueabi -verify-machineinstrs -filetype=obj | llvm-objdump --print-imm-hex=false -triple thumbv5-none-linux-gnueabi -disassemble - > %t +;RUN: llc < %s -mtriple=thumbv5-none-linux-gnueabi -verify-machineinstrs -filetype=obj | llvm-objdump -triple thumbv5-none-linux-gnueabi -disassemble - > %t ;RUN: cat %t | FileCheck %s --check-prefix=THUMB1 ;RUN: cat %t | FileCheck %s --check-prefix=T1POST diff --git a/llvm/test/CodeGen/ARM/thumb1-varalloc.ll b/llvm/test/CodeGen/ARM/thumb1-varalloc.ll index 41ef5107d63..0637be03d56 100644 --- a/llvm/test/CodeGen/ARM/thumb1-varalloc.ll +++ b/llvm/test/CodeGen/ARM/thumb1-varalloc.ll @@ -1,7 +1,7 @@ ; RUN: llc < %s -mtriple=thumbv6-apple-darwin | FileCheck %s ; RUN: llc < %s -mtriple=thumbv6-apple-darwin -regalloc=basic | FileCheck %s ; RUN: llc < %s -o %t -filetype=obj -mtriple=thumbv6-apple-darwin -; RUN: llvm-objdump --print-imm-hex=false -triple=thumbv6-apple-darwin -d %t | FileCheck %s +; RUN: llvm-objdump -triple=thumbv6-apple-darwin -d %t | FileCheck %s @__bar = external hidden global i8* @__baz = external hidden global i8* diff --git a/llvm/test/CodeGen/Hexagon/cmp.ll b/llvm/test/CodeGen/Hexagon/cmp.ll index 0f086199365..c274a787249 100644 --- a/llvm/test/CodeGen/Hexagon/cmp.ll +++ b/llvm/test/CodeGen/Hexagon/cmp.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=hexagon --filetype=obj < %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +; RUN: llc -march=hexagon --filetype=obj < %s -o - | llvm-objdump -d - | FileCheck %s ; Function Attrs: nounwind define i32 @cmpeq(i32 %i) #0 { diff --git a/llvm/test/CodeGen/Hexagon/relax.ll b/llvm/test/CodeGen/Hexagon/relax.ll index 7ef15fdedf3..9af45f3353c 100644 --- a/llvm/test/CodeGen/Hexagon/relax.ll +++ b/llvm/test/CodeGen/Hexagon/relax.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=hexagon -filetype=obj < %s | llvm-objdump --print-imm-hex=false -d -r - | FileCheck %s +; RUN: llc -march=hexagon -filetype=obj < %s | llvm-objdump -d -r - | FileCheck %s declare void @bar() diff --git a/llvm/test/CodeGen/Mips/micromips-atomic1.ll b/llvm/test/CodeGen/Mips/micromips-atomic1.ll index b484d53dd02..37c3d7682e4 100644 --- a/llvm/test/CodeGen/Mips/micromips-atomic1.ll +++ b/llvm/test/CodeGen/Mips/micromips-atomic1.ll @@ -1,5 +1,5 @@ ; RUN: llc -march=mipsel -filetype=obj --disable-machine-licm -mattr=micromips < %s -o - \ -; RUN: | llvm-objdump --print-imm-hex=false -no-show-raw-insn -arch mipsel -mcpu=mips32r2 -mattr=micromips -d - \ +; RUN: | llvm-objdump -no-show-raw-insn -arch mipsel -mcpu=mips32r2 -mattr=micromips -d - \ ; RUN: | FileCheck %s -check-prefix=MICROMIPS ; Use llvm-objdump to check wheter the encodings of microMIPS atomic instructions are correct. diff --git a/llvm/test/CodeGen/Thumb/large-stack.ll b/llvm/test/CodeGen/Thumb/large-stack.ll index a571603119a..c5d1044e9d6 100644 --- a/llvm/test/CodeGen/Thumb/large-stack.ll +++ b/llvm/test/CodeGen/Thumb/large-stack.ll @@ -1,9 +1,9 @@ ; RUN: llc < %s -mtriple=thumb-apple-ios | FileCheck %s --check-prefix=CHECK --check-prefix=IOS ; RUN: llc < %s -mtriple=thumb-none-eabi | FileCheck %s --check-prefix=CHECK --check-prefix=EABI ; RUN: llc < %s -o %t -filetype=obj -mtriple=thumbv6-apple-ios -; RUN: llvm-objdump --print-imm-hex=false -triple=thumbv6-apple-ios -d %t | FileCheck %s --check-prefix=CHECK --check-prefix=IOS +; RUN: llvm-objdump -triple=thumbv6-apple-ios -d %t | FileCheck %s --check-prefix=CHECK --check-prefix=IOS ; RUN: llc < %s -o %t -filetype=obj -mtriple=thumbv6-none-eabi -; RUN: llvm-objdump --print-imm-hex=false -triple=thumbv6-none-eabi -d %t | FileCheck %s --check-prefix=CHECK --check-prefix=EABI +; RUN: llvm-objdump -triple=thumbv6-none-eabi -d %t | FileCheck %s --check-prefix=CHECK --check-prefix=EABI ; Largest stack for which a single tADDspi/tSUBspi is enough define void @test1() { diff --git a/llvm/test/LTO/X86/set-merged.ll b/llvm/test/LTO/X86/set-merged.ll index aaafc5e912a..e6cc51fcfcf 100644 --- a/llvm/test/LTO/X86/set-merged.ll +++ b/llvm/test/LTO/X86/set-merged.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s >%t1 ; RUN: llvm-lto -exported-symbol=_main -set-merged-module -o %t2 %t1 -; RUN: llvm-objdump -d %t2 | FileCheck %s +; RUN: llvm-objdump --print-imm-hex=false -d %t2 | FileCheck %s target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.10.0" diff --git a/llvm/test/MC/ARM/coff-relocations.s b/llvm/test/MC/ARM/coff-relocations.s index a18f748f7cd..6ebae709f6c 100644 --- a/llvm/test/MC/ARM/coff-relocations.s +++ b/llvm/test/MC/ARM/coff-relocations.s @@ -2,8 +2,7 @@ @ RUN: | llvm-readobj -r - | FileCheck %s -check-prefix CHECK-RELOCATION @ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \ -@ RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s \ -@ RUN: -check-prefix CHECK-ENCODING +@ RUN: | llvm-objdump -d - | FileCheck %s -check-prefix CHECK-ENCODING .syntax unified .text diff --git a/llvm/test/MC/ARM/thumb1-relax-bcc.s b/llvm/test/MC/ARM/thumb1-relax-bcc.s index ecbb81bca54..02fde2e040e 100644 --- a/llvm/test/MC/ARM/thumb1-relax-bcc.s +++ b/llvm/test/MC/ARM/thumb1-relax-bcc.s @@ -1,7 +1,7 @@ @ RUN: not llvm-mc -triple thumbv6m-none-macho -filetype=obj -o /dev/null %s 2>&1 | FileCheck --check-prefix=CHECK-ERROR %s @ RUN: not llvm-mc -triple thumbv7m-none-macho -filetype=obj -o /dev/null %s 2>&1 | FileCheck --check-prefix=CHECK-ERROR %s @ RUN: llvm-mc -triple thumbv7m-none-eabi -filetype=obj -o %t %s -@ RUN: llvm-objdump --print-imm-hex=false -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s +@ RUN: llvm-objdump -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s .global func1 _func1: diff --git a/llvm/test/MC/ARM/thumb1-relax-br.s b/llvm/test/MC/ARM/thumb1-relax-br.s index 5b5da99d99b..92a82752738 100644 --- a/llvm/test/MC/ARM/thumb1-relax-br.s +++ b/llvm/test/MC/ARM/thumb1-relax-br.s @@ -1,8 +1,8 @@ @ RUN: not llvm-mc -triple thumbv6m-none-macho -filetype=obj -o /dev/null %s 2>&1 | FileCheck --check-prefix=CHECK-ERROR %s @ RUN: llvm-mc -triple thumbv7m-none-macho -filetype=obj -o %t %s -@ RUN: llvm-objdump --print-imm-hex=false -d -r -triple thumbv7m-none-macho %t | FileCheck --check-prefix=CHECK-MACHO %s +@ RUN: llvm-objdump -d -r -triple thumbv7m-none-macho %t | FileCheck --check-prefix=CHECK-MACHO %s @ RUN: llvm-mc -triple thumbv7m-none-eabi -filetype=obj -o %t %s -@ RUN: llvm-objdump --print-imm-hex=false -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s +@ RUN: llvm-objdump -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s .global func1 _func1: diff --git a/llvm/test/MC/ARM/thumb2-cbn-to-next-inst.s b/llvm/test/MC/ARM/thumb2-cbn-to-next-inst.s index 7cd8cbf667a..a7ad11b2450 100644 --- a/llvm/test/MC/ARM/thumb2-cbn-to-next-inst.s +++ b/llvm/test/MC/ARM/thumb2-cbn-to-next-inst.s @@ -1,5 +1,5 @@ @ RUN: llvm-mc -triple thumbv7-apple-darwin -filetype=obj -o %t.o %s -@ RUN: llvm-objdump --print-imm-hex=false -triple thumbv7-apple-darwin -d %t.o | FileCheck %s +@ RUN: llvm-objdump -triple thumbv7-apple-darwin -d %t.o | FileCheck %s .thumb start: diff --git a/llvm/test/MC/ELF/relax-arith.s b/llvm/test/MC/ELF/relax-arith.s index c384e074e54..56b7c399c44 100644 --- a/llvm/test/MC/ELF/relax-arith.s +++ b/llvm/test/MC/ELF/relax-arith.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump -d - | FileCheck %s // Test that we correctly relax these instructions into versions that use // 16 or 32 bit immediate values. diff --git a/llvm/test/MC/ELF/relax-arith2.s b/llvm/test/MC/ELF/relax-arith2.s index 6a376b83749..b05418482e3 100644 --- a/llvm/test/MC/ELF/relax-arith2.s +++ b/llvm/test/MC/ELF/relax-arith2.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump -d - | FileCheck %s // Test that we avoid relaxing these instructions and instead generate versions // that use 8-bit immediate values. diff --git a/llvm/test/MC/ELF/relax-arith3.s b/llvm/test/MC/ELF/relax-arith3.s index 992b864eb1d..3be8b0ee870 100644 --- a/llvm/test/MC/ELF/relax-arith3.s +++ b/llvm/test/MC/ELF/relax-arith3.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump -d - | FileCheck %s // Test that we correctly relax these instructions into versions that use // 16 or 32 bit immediate values. diff --git a/llvm/test/MC/ELF/relax-arith4.s b/llvm/test/MC/ELF/relax-arith4.s index 97c4a30d038..3fd3cadb76a 100644 --- a/llvm/test/MC/ELF/relax-arith4.s +++ b/llvm/test/MC/ELF/relax-arith4.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-objdump -d - | FileCheck %s // Test for proper instruction relaxation behavior for the push $imm // instruction forms. This is the 32-bit version of the push $imm tests from diff --git a/llvm/test/MC/Hexagon/asmMap.s b/llvm/test/MC/Hexagon/asmMap.s index f2b36054a75..81bb8f31f02 100644 --- a/llvm/test/MC/Hexagon/asmMap.s +++ b/llvm/test/MC/Hexagon/asmMap.s @@ -1,4 +1,4 @@ -#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s # Make sure that the assembler mapped instructions are being handled correctly. diff --git a/llvm/test/MC/Hexagon/duplex-registers.s b/llvm/test/MC/Hexagon/duplex-registers.s index 7d08ae1b983..f0cde7f9628 100644 --- a/llvm/test/MC/Hexagon/duplex-registers.s +++ b/llvm/test/MC/Hexagon/duplex-registers.s @@ -1,4 +1,4 @@ -#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s .text { diff --git a/llvm/test/MC/Hexagon/fixups.s b/llvm/test/MC/Hexagon/fixups.s index e2db261515a..059a18fa882 100644 --- a/llvm/test/MC/Hexagon/fixups.s +++ b/llvm/test/MC/Hexagon/fixups.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -arch=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +# RUN: llvm-mc -arch=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s .text # CHECK-LABEL: 0: diff --git a/llvm/test/MC/Hexagon/iconst.s b/llvm/test/MC/Hexagon/iconst.s index fac440c567f..277c4de8692 100644 --- a/llvm/test/MC/Hexagon/iconst.s +++ b/llvm/test/MC/Hexagon/iconst.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d -r - | FileCheck %s +# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d -r - | FileCheck %s a: # CHECK: r0 = add(r0, #0) diff --git a/llvm/test/MC/Hexagon/inst_cmp_eqi.ll b/llvm/test/MC/Hexagon/inst_cmp_eqi.ll index 91a3fc1c2f2..612dfdc8f23 100644 --- a/llvm/test/MC/Hexagon/inst_cmp_eqi.ll +++ b/llvm/test/MC/Hexagon/inst_cmp_eqi.ll @@ -1,5 +1,5 @@ ;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \ -;; RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +;; RUN: | llvm-objdump -d - | FileCheck %s define i1 @foo (i32 %a) { diff --git a/llvm/test/MC/Hexagon/inst_cmp_gti.ll b/llvm/test/MC/Hexagon/inst_cmp_gti.ll index 641b1891d75..f3c13a2fb96 100644 --- a/llvm/test/MC/Hexagon/inst_cmp_gti.ll +++ b/llvm/test/MC/Hexagon/inst_cmp_gti.ll @@ -1,5 +1,5 @@ ;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \ -;; RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +;; RUN: | llvm-objdump -d - | FileCheck %s define i1 @foo (i32 %a) { diff --git a/llvm/test/MC/Hexagon/inst_cmp_ugti.ll b/llvm/test/MC/Hexagon/inst_cmp_ugti.ll index f181af98dad..59db552b39f 100644 --- a/llvm/test/MC/Hexagon/inst_cmp_ugti.ll +++ b/llvm/test/MC/Hexagon/inst_cmp_ugti.ll @@ -1,5 +1,5 @@ ;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \ -;; RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +;; RUN: | llvm-objdump -d - | FileCheck %s define i1 @foo (i32 %a) { diff --git a/llvm/test/MC/Hexagon/relaxed_newvalue.s b/llvm/test/MC/Hexagon/relaxed_newvalue.s index 881150a3290..65fbd312e0a 100644 --- a/llvm/test/MC/Hexagon/relaxed_newvalue.s +++ b/llvm/test/MC/Hexagon/relaxed_newvalue.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s # Make sure relaxation doesn't hinder newvalue calculation #CHECK: r18 = add(r2, #-6) diff --git a/llvm/test/MC/Hexagon/two_ext.s b/llvm/test/MC/Hexagon/two_ext.s index d83c450d464..c55bcc8cd9f 100644 --- a/llvm/test/MC/Hexagon/two_ext.s +++ b/llvm/test/MC/Hexagon/two_ext.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s # verify two extenders generated during relaxation { diff --git a/llvm/test/MC/Hexagon/v60-vmem.s b/llvm/test/MC/Hexagon/v60-vmem.s index 84458aac04b..fe202251ec4 100644 --- a/llvm/test/MC/Hexagon/v60-vmem.s +++ b/llvm/test/MC/Hexagon/v60-vmem.s @@ -1,5 +1,5 @@ #RUN: llvm-mc -triple=hexagon -mcpu=hexagonv60 -filetype=obj %s | \ -#RUN: llvm-objdump --print-imm-hex=false -triple=hexagon -mcpu=hexagonv60 -d - | \ +#RUN: llvm-objdump -triple=hexagon -mcpu=hexagonv60 -d - | \ #RUN: FileCheck %s #CHECK: 292cc11b { vmem(r12++#1) = v27 } diff --git a/llvm/test/MC/Mips/cprestore-noreorder.s b/llvm/test/MC/Mips/cprestore-noreorder.s index e36943d5893..750c95a63f0 100644 --- a/llvm/test/MC/Mips/cprestore-noreorder.s +++ b/llvm/test/MC/Mips/cprestore-noreorder.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -relocation-model=pic -filetype=obj -o -| \ -# RUN: llvm-objdump --print-imm-hex=false -d -r -arch=mips - | \ +# RUN: llvm-objdump -d -r -arch=mips - | \ # RUN: FileCheck %s -check-prefix=CHECK-FOR-STORE # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+micromips -relocation-model=pic -show-encoding | \ diff --git a/llvm/test/MC/Mips/cprestore-reorder.s b/llvm/test/MC/Mips/cprestore-reorder.s index 7f02ef63ff0..e037701ede0 100644 --- a/llvm/test/MC/Mips/cprestore-reorder.s +++ b/llvm/test/MC/Mips/cprestore-reorder.s @@ -2,7 +2,7 @@ # RUN: FileCheck %s # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -relocation-model=pic -filetype=obj -o -| \ -# RUN: llvm-objdump --print-imm-hex=false -d -r -arch=mips - | \ +# RUN: llvm-objdump -d -r -arch=mips - | \ # RUN: FileCheck %s -check-prefix=CHECK-FOR-STORE # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+micromips -relocation-model=pic -show-encoding | \ diff --git a/llvm/test/MC/Mips/cpsetup.s b/llvm/test/MC/Mips/cpsetup.s index 2159624d46d..95d84d95d85 100644 --- a/llvm/test/MC/Mips/cpsetup.s +++ b/llvm/test/MC/Mips/cpsetup.s @@ -1,19 +1,19 @@ # RUN: llvm-mc -triple mips64-unknown-unknown -target-abi o32 -filetype=obj -o - %s | \ -# RUN: llvm-objdump --print-imm-hex=false -d -r -arch=mips64 - | \ +# RUN: llvm-objdump -d -r -arch=mips64 - | \ # RUN: FileCheck -check-prefix=ALL -check-prefix=O32 %s # RUN: llvm-mc -triple mips64-unknown-unknown -target-abi o32 %s | \ # RUN: FileCheck -check-prefix=ALL -check-prefix=ASM %s # RUN: llvm-mc -triple mips64-unknown-unknown -target-abi n32 -filetype=obj -o - %s | \ -# RUN: llvm-objdump --print-imm-hex=false -d -r -t -arch=mips64 - | \ +# RUN: llvm-objdump -d -r -t -arch=mips64 - | \ # RUN: FileCheck -check-prefix=ALL -check-prefix=NXX -check-prefix=N32 %s # RUN: llvm-mc -triple mips64-unknown-unknown -target-abi n32 %s | \ # RUN: FileCheck -check-prefix=ALL -check-prefix=ASM %s # RUN: llvm-mc -triple mips64-unknown-unknown %s -filetype=obj -o - | \ -# RUN: llvm-objdump --print-imm-hex=false -d -r -t -arch=mips64 - | \ +# RUN: llvm-objdump -d -r -t -arch=mips64 - | \ # RUN: FileCheck -check-prefix=ALL -check-prefix=NXX -check-prefix=N64 %s # RUN: llvm-mc -triple mips64-unknown-unknown %s | \ diff --git a/llvm/test/MC/Mips/got-rel-expr.s b/llvm/test/MC/Mips/got-rel-expr.s index dbb627e8e0b..01c364e5dc3 100644 --- a/llvm/test/MC/Mips/got-rel-expr.s +++ b/llvm/test/MC/Mips/got-rel-expr.s @@ -2,7 +2,7 @@ # as an argument of the %got relocation. # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s \ -# RUN: | llvm-objdump --print-imm-hex=false -d -r - | FileCheck %s +# RUN: | llvm-objdump -d -r - | FileCheck %s .text foo: diff --git a/llvm/test/MC/Mips/hex-immediates.s b/llvm/test/MC/Mips/hex-immediates.s index a3b8ed0138d..7bf6f71266e 100644 --- a/llvm/test/MC/Mips/hex-immediates.s +++ b/llvm/test/MC/Mips/hex-immediates.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj %s -triple=mips-unknown-linux \ -# RUN: | llvm-objdump -d - | FileCheck %s +# RUN: | llvm-objdump -d --print-imm-hex - | FileCheck %s # CHECK: jal 0x20 # CHECK: addiu $sp, $sp, -0x20 diff --git a/llvm/test/MC/Mips/higher-highest-addressing.s b/llvm/test/MC/Mips/higher-highest-addressing.s index 51b52a54f5e..2973a6400ae 100644 --- a/llvm/test/MC/Mips/higher-highest-addressing.s +++ b/llvm/test/MC/Mips/higher-highest-addressing.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple=mips64el-unknown-linux -mcpu=mips64r2 %s \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -triple mips64el - | FileCheck %s +# RUN: | llvm-objdump -disassemble -triple mips64el - | FileCheck %s # RUN: llvm-mc -filetype=obj -triple=mips64el-unknown-linux -mcpu=mips64r2 %s \ # RUN: | llvm-readobj -r | FileCheck %s -check-prefix=CHECK-REL diff --git a/llvm/test/MC/Mips/hilo-addressing.s b/llvm/test/MC/Mips/hilo-addressing.s index 575cf2c10d6..720c7e256bb 100644 --- a/llvm/test/MC/Mips/hilo-addressing.s +++ b/llvm/test/MC/Mips/hilo-addressing.s @@ -2,7 +2,7 @@ # RUN: | FileCheck %s -check-prefix=CHECK-ENC # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble - | FileCheck %s -check-prefix=CHECK-INSTR +# RUN: | llvm-objdump -disassemble - | FileCheck %s -check-prefix=CHECK-INSTR # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s \ # RUN: | llvm-readobj -r | FileCheck %s -check-prefix=CHECK-REL diff --git a/llvm/test/MC/Mips/instr-analysis.s b/llvm/test/MC/Mips/instr-analysis.s index e6b4b61bbae..58abfd0f472 100644 --- a/llvm/test/MC/Mips/instr-analysis.s +++ b/llvm/test/MC/Mips/instr-analysis.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s +# RUN: | llvm-objdump -d - | FileCheck %s # CHECK: foo: # CHECK-NEXT: 0: 0c 00 00 02 jal 8 <loc1> diff --git a/llvm/test/MC/Mips/micromips-el-fixup-data.s b/llvm/test/MC/Mips/micromips-el-fixup-data.s index 25b5b466002..47538356bf3 100644 --- a/llvm/test/MC/Mips/micromips-el-fixup-data.s +++ b/llvm/test/MC/Mips/micromips-el-fixup-data.s @@ -1,6 +1,6 @@ # RUN: llvm-mc %s -triple=mipsel-unknown-linux -mcpu=mips32r2 \ # RUN: -mattr=+micromips 2>&1 -filetype=obj > %t.o -# RUN: llvm-objdump --print-imm-hex=false %t.o -triple mipsel -mattr=+micromips -d | FileCheck %s +# RUN: llvm-objdump %t.o -triple mipsel -mattr=+micromips -d | FileCheck %s # Check that fixup data is written in the microMIPS specific little endian # byte order. diff --git a/llvm/test/MC/Mips/mips64extins.ll b/llvm/test/MC/Mips/mips64extins.ll index 28bec2b683f..4521bfb68ef 100644 --- a/llvm/test/MC/Mips/mips64extins.ll +++ b/llvm/test/MC/Mips/mips64extins.ll @@ -1,5 +1,5 @@ ; RUN: llc -march=mips64el -filetype=obj -mcpu=mips64r2 -target-abi=n64 %s -o - \ -; RUN: | llvm-objdump --print-imm-hex=false -disassemble -triple mips64el -mattr +mips64r2 - \ +; RUN: | llvm-objdump -disassemble -triple mips64el -mattr +mips64r2 - \ ; RUN: | FileCheck %s define i64 @dext(i64 %i) nounwind readnone { diff --git a/llvm/test/MC/Mips/mips64shift.ll b/llvm/test/MC/Mips/mips64shift.ll index 83a929d1b0d..99cac7b591f 100644 --- a/llvm/test/MC/Mips/mips64shift.ll +++ b/llvm/test/MC/Mips/mips64shift.ll @@ -1,8 +1,8 @@ ; RUN: llc -march=mips64el -filetype=obj -mcpu=mips64r2 -disable-mips-delay-filler %s -o - \ -; RUN: | llvm-objdump --print-imm-hex=false -disassemble -triple mips64el - | FileCheck %s +; RUN: | llvm-objdump -disassemble -triple mips64el - | FileCheck %s ; RUN: llc -march=mips64el -filetype=obj -mcpu=mips64r2 %s -o - \ -; RUN: | llvm-objdump --print-imm-hex=false -disassemble -triple mips64el - | FileCheck %s +; RUN: | llvm-objdump -disassemble -triple mips64el - | FileCheck %s define i64 @f3(i64 %a0) nounwind readnone { entry: diff --git a/llvm/test/MC/Mips/mips_gprel16.s b/llvm/test/MC/Mips/mips_gprel16.s index db60bdfdd30..9dd3fa3281c 100644 --- a/llvm/test/MC/Mips/mips_gprel16.s +++ b/llvm/test/MC/Mips/mips_gprel16.s @@ -4,10 +4,10 @@ // field. // RUN: llvm-mc -mcpu=mips32r2 -triple=mipsel-pc-linux -filetype=obj -relocation-model=static %s -o - \ -// RUN: | llvm-objdump --print-imm-hex=false -disassemble -mattr +mips32r2 - \ +// RUN: | llvm-objdump -disassemble -mattr +mips32r2 - \ // RUN: | FileCheck %s // RUN: llvm-mc -mcpu=mips32r2 -triple=mips-pc-linux -filetype=obj -relocation-model=static %s -o - \ -// RUN: | llvm-objdump --print-imm-hex=false -disassemble -mattr +mips32r2 - \ +// RUN: | llvm-objdump -disassemble -mattr +mips32r2 - \ // RUN: | FileCheck %s .text diff --git a/llvm/test/MC/Mips/nacl-mask.s b/llvm/test/MC/Mips/nacl-mask.s index 4f243cd4dff..c77646081f2 100644 --- a/llvm/test/MC/Mips/nacl-mask.s +++ b/llvm/test/MC/Mips/nacl-mask.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-nacl %s \ -# RUN: | llvm-objdump --print-imm-hex=false -triple mipsel -disassemble -no-show-raw-insn - \ +# RUN: | llvm-objdump -triple mipsel -disassemble -no-show-raw-insn - \ # RUN: | FileCheck %s # This test tests that address-masking sandboxing is added when given assembly diff --git a/llvm/test/MC/X86/AlignedBundling/labeloffset.s b/llvm/test/MC/X86/AlignedBundling/labeloffset.s index 00339823639..5b2efe07965 100644 --- a/llvm/test/MC/X86/AlignedBundling/labeloffset.s +++ b/llvm/test/MC/X86/AlignedBundling/labeloffset.s @@ -1,9 +1,9 @@ # RUN: llvm-mc -triple=i686-linux -filetype=obj %s -o - | \ -# RUN: llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn -r - | FileCheck %s +# RUN: llvm-objdump -disassemble -no-show-raw-insn -r - | FileCheck %s # RUN: llvm-mc -triple=i686-nacl -filetype=obj %s -o - | \ -# RUN: llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn -r - | FileCheck %s +# RUN: llvm-objdump -disassemble -no-show-raw-insn -r - | FileCheck %s # RUN: llvm-mc -triple=i686-nacl -filetype=obj -mc-relax-all %s -o - | \ -# RUN: llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn -r - | FileCheck %s +# RUN: llvm-objdump -disassemble -no-show-raw-insn -r - | FileCheck %s .bundle_align_mode 5 .text diff --git a/llvm/test/MC/X86/AlignedBundling/misaligned-bundle-group.s b/llvm/test/MC/X86/AlignedBundling/misaligned-bundle-group.s index 56ca3381101..04b3374716b 100644 --- a/llvm/test/MC/X86/AlignedBundling/misaligned-bundle-group.s +++ b/llvm/test/MC/X86/AlignedBundling/misaligned-bundle-group.s @@ -1,8 +1,8 @@ # RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - \ +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - \ # RUN: | FileCheck -check-prefix=CHECK -check-prefix=CHECK-OPT %s # RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -mc-relax-all %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - \ +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - \ # RUN: | FileCheck -check-prefix=CHECK -check-prefix=CHECK-RELAX %s .text diff --git a/llvm/test/MC/X86/AlignedBundling/misaligned-bundle.s b/llvm/test/MC/X86/AlignedBundling/misaligned-bundle.s index a67eedd79a0..08d61610990 100644 --- a/llvm/test/MC/X86/AlignedBundling/misaligned-bundle.s +++ b/llvm/test/MC/X86/AlignedBundling/misaligned-bundle.s @@ -1,8 +1,8 @@ # RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - \ +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - \ # RUN: | FileCheck -check-prefix=CHECK -check-prefix=CHECK-OPT %s # RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -mc-relax-all %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - \ +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - \ # RUN: | FileCheck -check-prefix=CHECK -check-prefix=CHECK-RELAX %s .text diff --git a/llvm/test/MC/X86/AlignedBundling/rodata-section.s b/llvm/test/MC/X86/AlignedBundling/rodata-section.s index 4e64b9ec532..21f2c735f8c 100644 --- a/llvm/test/MC/X86/AlignedBundling/rodata-section.s +++ b/llvm/test/MC/X86/AlignedBundling/rodata-section.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple=i686-nacl -filetype=obj %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - | FileCheck %s +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s # RUN: llvm-mc -triple=i686-nacl -filetype=obj -mc-relax-all %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - | FileCheck %s +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s .bundle_align_mode 5 .text diff --git a/llvm/test/MC/X86/AlignedBundling/single-inst-bundling.s b/llvm/test/MC/X86/AlignedBundling/single-inst-bundling.s index 5b6bce305b6..a7df2c96a8e 100644 --- a/llvm/test/MC/X86/AlignedBundling/single-inst-bundling.s +++ b/llvm/test/MC/X86/AlignedBundling/single-inst-bundling.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - | FileCheck -check-prefix=CHECK -check-prefix=CHECK-OPT %s +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck -check-prefix=CHECK -check-prefix=CHECK-OPT %s # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -mc-relax-all %s -o - \ -# RUN: | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - | FileCheck -check-prefix=CHECK -check-prefix=CHECK-RELAX %s +# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck -check-prefix=CHECK -check-prefix=CHECK-RELAX %s # Test simple NOP insertion for single instructions. diff --git a/llvm/test/MC/X86/fixup-cpu-mode.s b/llvm/test/MC/X86/fixup-cpu-mode.s index dcb687f3f5b..13e0d462156 100644 --- a/llvm/test/MC/X86/fixup-cpu-mode.s +++ b/llvm/test/MC/X86/fixup-cpu-mode.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t -// RUN: llvm-objdump --print-imm-hex=false -d %t | FileCheck %s +// RUN: llvm-objdump -d %t | FileCheck %s //PR18303 .global edata diff --git a/llvm/test/MC/X86/hex-immediates.s b/llvm/test/MC/X86/hex-immediates.s index cdbe10cbfa5..03f30423ae0 100644 --- a/llvm/test/MC/X86/hex-immediates.s +++ b/llvm/test/MC/X86/hex-immediates.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -filetype=obj %s -triple=x86_64-apple-darwin9 | llvm-objdump -d - | FileCheck %s +# RUN: llvm-mc -filetype=obj %s -triple=x86_64-apple-darwin9 | llvm-objdump -d --print-imm-hex - | FileCheck %s # CHECK: movabsq $0x7fffffffffffffff, %rcx movabsq $0x7fffffffffffffff, %rcx diff --git a/llvm/test/Object/Mips/feature.test b/llvm/test/Object/Mips/feature.test index 041d6594a6d..340301450a5 100644 --- a/llvm/test/Object/Mips/feature.test +++ b/llvm/test/Object/Mips/feature.test @@ -1,4 +1,4 @@ -RUN: llvm-objdump --print-imm-hex=false -disassemble -triple mips64el -mattr +mips64r2 %p/../Inputs/dext-test.elf-mips64r2 \ +RUN: llvm-objdump -disassemble -triple mips64el -mattr +mips64r2 %p/../Inputs/dext-test.elf-mips64r2 \ RUN: | FileCheck %s CHECK: Disassembly of section .text: diff --git a/llvm/test/Object/Mips/objdump-micro-mips.test b/llvm/test/Object/Mips/objdump-micro-mips.test index 2aa1ee5487f..0f28dc1a5f1 100644 --- a/llvm/test/Object/Mips/objdump-micro-mips.test +++ b/llvm/test/Object/Mips/objdump-micro-mips.test @@ -1,4 +1,4 @@ -RUN: llvm-objdump --print-imm-hex=false -d -mattr=micromips %p/../Inputs/micro-mips.elf-mipsel \ +RUN: llvm-objdump -d -mattr=micromips %p/../Inputs/micro-mips.elf-mipsel \ RUN: | FileCheck %s CHECK: foo: diff --git a/llvm/test/Object/X86/objdump-disassembly-inline-relocations.test b/llvm/test/Object/X86/objdump-disassembly-inline-relocations.test index cad92c062cb..3871bcbf0b5 100644 --- a/llvm/test/Object/X86/objdump-disassembly-inline-relocations.test +++ b/llvm/test/Object/X86/objdump-disassembly-inline-relocations.test @@ -1,14 +1,14 @@ -RUN: llvm-objdump --print-imm-hex=false -d -r %p/../Inputs/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump --print-imm-hex=false -d -r %p/../Inputs/trivial-object-test.coff-x86-64 \ +RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.coff-x86-64 \ RUN: | FileCheck %s -check-prefix COFF-x86-64 -RUN: llvm-objdump --print-imm-hex=false -d -r %p/../Inputs/trivial-object-test.macho-i386 \ +RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.macho-i386 \ RUN: | FileCheck %s -check-prefix MACHO-i386 -RUN: llvm-objdump --print-imm-hex=false -d -r %p/../Inputs/trivial-object-test.macho-x86-64 \ +RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.macho-x86-64 \ RUN: | FileCheck %s -check-prefix MACHO-x86-64 -RUN: llvm-objdump --print-imm-hex=false -d -r %p/../Inputs/trivial-object-test.elf-i386 \ +RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 -RUN: llvm-objdump --print-imm-hex=false -d -r %p/../Inputs/trivial-object-test.elf-x86-64 \ +RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF-x86-64 COFF-i386: file format COFF-i386 diff --git a/llvm/test/Object/X86/objdump-trivial-object.test b/llvm/test/Object/X86/objdump-trivial-object.test index e908576767a..8f9ea974d27 100644 --- a/llvm/test/Object/X86/objdump-trivial-object.test +++ b/llvm/test/Object/X86/objdump-trivial-object.test @@ -1,10 +1,10 @@ -RUN: llvm-objdump --print-imm-hex=false -d %p/../Inputs/trivial-object-test.coff-i386 \ +RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.coff-i386 \ RUN: | FileCheck %s -check-prefix COFF-i386 -RUN: llvm-objdump --print-imm-hex=false -d %p/../Inputs/trivial-object-test.coff-x86-64 \ +RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.coff-x86-64 \ RUN: | FileCheck %s -check-prefix COFF-x86-64 -RUN: llvm-objdump --print-imm-hex=false -d %p/../Inputs/trivial-object-test.elf-i386 \ +RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.elf-i386 \ RUN: | FileCheck %s -check-prefix ELF-i386 -RUN: llvm-objdump --print-imm-hex=false -d %p/../Inputs/trivial-object-test.elf-x86-64 \ +RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.elf-x86-64 \ RUN: | FileCheck %s -check-prefix ELF-x86-64 COFF-i386: file format COFF-i386 diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test index 888a904a3b5..311ff51fbac 100644 --- a/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test +++ b/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test @@ -1,7 +1,7 @@ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.obj.macho-aarch64 | FileCheck %s -check-prefix=OBJ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.exe.macho-aarch64 | FileCheck %s -check-prefix=EXE -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.obj.macho-aarch64 | FileCheck %s -check-prefix=ObjC-OBJ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.exe.macho-aarch64 | FileCheck %s -check-prefix=ObjC-EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-aarch64 | FileCheck %s -check-prefix=OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-aarch64 | FileCheck %s -check-prefix=EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.obj.macho-aarch64 | FileCheck %s -check-prefix=ObjC-OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.exe.macho-aarch64 | FileCheck %s -check-prefix=ObjC-EXE OBJ: 000000000000001c adrp x0, L_.str@PAGE OBJ: 0000000000000020 add x0, x0, L_.str@PAGEOFF diff --git a/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test index 9dc7ecc9ba0..eeeab526cf8 100644 --- a/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test +++ b/llvm/test/tools/llvm-objdump/ARM/macho-symbolized-disassembly.test @@ -1,5 +1,5 @@ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.obj.macho-arm | FileCheck %s -check-prefix=OBJ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.exe.macho-arm | FileCheck %s -check-prefix=EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-arm | FileCheck %s -check-prefix=OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-arm | FileCheck %s -check-prefix=EXE OBJ: 00000006 movw r3, :lower16:((54-14)-4) OBJ: 0000000a movt r3, :upper16:((54-14)-4) diff --git a/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test b/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test index c920bab1b8a..2f0b211815c 100644 --- a/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test +++ b/llvm/test/tools/llvm-objdump/X86/coff-disassemble-export.test @@ -1,4 +1,4 @@ -// RUN: llvm-objdump --print-imm-hex=false -d %p/Inputs/disassemble.dll.coff-i386 | \ +// RUN: llvm-objdump -d %p/Inputs/disassemble.dll.coff-i386 | \ // RUN: FileCheck %s // CHECK-LABEL: g: diff --git a/llvm/test/tools/llvm-objdump/X86/hex-displacement.test b/llvm/test/tools/llvm-objdump/X86/hex-displacement.test index e906c1c506a..dd2332e572f 100644 --- a/llvm/test/tools/llvm-objdump/X86/hex-displacement.test +++ b/llvm/test/tools/llvm-objdump/X86/hex-displacement.test @@ -1,6 +1,6 @@ # Check that target displacement has '0x' prefix # to accent hex format of the number. -# RUN: llvm-objdump --print-imm-hex=false -d %p/Inputs/hello.exe.macho-i386 | FileCheck %s +# RUN: llvm-objdump -d %p/Inputs/hello.exe.macho-i386 | FileCheck %s # CHECK: 1f47: e8 00 00 00 00 calll 0 <_main+0xC> diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test b/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test index 3cec27e48d0..df4618dc468 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test @@ -1,4 +1,4 @@ -# RUN: llvm-objdump -m -d %p/Inputs/hello.obj.macho-x86_64 -no-show-raw-insn -no-leading-addr | FileCheck %s +# RUN: llvm-objdump -m -d %p/Inputs/hello.obj.macho-x86_64 -no-show-raw-insn -print-imm-hex -no-leading-addr | FileCheck %s # CHECK: (__TEXT,__text) section # CHECK: _main: diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test b/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test index 71ba0230eb2..39d16ecba6f 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test @@ -1,4 +1,4 @@ -# RUN: llvm-objdump -m -d %p/Inputs/exeThread.macho-x86_64 -dis-symname start -no-show-raw-insn -full-leading-addr | FileCheck %s +# RUN: llvm-objdump -m -d %p/Inputs/exeThread.macho-x86_64 -dis-symname start -no-show-raw-insn -full-leading-addr -print-imm-hex | FileCheck %s # CHECK: (__TEXT,__text) section # CHECK: start: diff --git a/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test b/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test index ef55f75e7a7..27b7bb44152 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test @@ -1,4 +1,4 @@ -# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __FOO,__bar -full-leading-addr -no-show-raw-insn - | FileCheck %s +# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __FOO,__bar -full-leading-addr -print-imm-hex -no-show-raw-insn - | FileCheck %s .section __FOO, __bar _foo: diff --git a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test index a5af6190a54..6f49b456227 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test @@ -1,14 +1,14 @@ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=OBJ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=EXE -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.obj.macho-x86_64 | FileCheck %s -check-prefix=ObjC-OBJ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/ObjC.exe.macho-x86_64 | FileCheck %s -check-prefix=ObjC-EXE -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello_cpp.exe.macho-x86_64 | FileCheck %s -check-prefix=CXX-EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.obj.macho-x86_64 | FileCheck %s -check-prefix=ObjC-OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.exe.macho-x86_64 | FileCheck %s -check-prefix=ObjC-EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello_cpp.exe.macho-x86_64 | FileCheck %s -check-prefix=CXX-EXE -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.obj.macho-i386 | FileCheck %s -check-prefix=i386-OBJ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr %p/Inputs/hello.exe.macho-i386 | FileCheck %s -check-prefix=i386-EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-i386 | FileCheck %s -check-prefix=i386-OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-i386 | FileCheck %s -check-prefix=i386-EXE -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -no-symbolic-operands %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-OBJ -// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -no-symbolic-operands %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-EXE +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -no-symbolic-operands %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-OBJ +// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -no-symbolic-operands %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-EXE OBJ: 0000000000000008 leaq L_.str(%rip), %rax ## literal pool for: "Hello world\n" OBJ: 0000000000000026 callq _printf diff --git a/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test b/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test index c0a3d2ebe93..260e9aa341e 100644 --- a/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test +++ b/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test @@ -1,6 +1,6 @@ -RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -arch all \ +RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch all \ RUN: | FileCheck %s -check-prefix UEXE-all -RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -arch i386 \ +RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch i386 \ RUN: | FileCheck %s -check-prefix UArchive-i386 RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -universal-headers -m \ RUN: | FileCheck %s -check-prefix FAT diff --git a/llvm/test/tools/llvm-objdump/X86/malformed-machos.test b/llvm/test/tools/llvm-objdump/X86/malformed-machos.test index 3abf4f7227a..a47e43443c5 100644 --- a/llvm/test/tools/llvm-objdump/X86/malformed-machos.test +++ b/llvm/test/tools/llvm-objdump/X86/malformed-machos.test @@ -1,40 +1,40 @@ // These test checks that llvm-objdump will not crash with malformed Mach-O // files. So the check line is not all that important but the bug fixes to // make sure llvm-objdump is robust is what matters. -# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \ +# RUN: llvm-objdump -macho -objc-meta-data \ # RUN: %p/Inputs/malformed-machos/mem-crup-0001.macho \ # RUN: | FileCheck -check-prefix=m0001 %s # m0001: (method_t extends past the end of the section) -# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \ +# RUN: llvm-objdump -macho -objc-meta-data \ # RUN: %p/Inputs/malformed-machos/mem-crup-0006.macho \ # RUN: | FileCheck -check-prefix=m0006 %s # m0006: ivarLayout 0x8 -# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \ +# RUN: llvm-objdump -macho -objc-meta-data \ # RUN: %p/Inputs/malformed-machos/mem-crup-0006.macho \ # RUN: | FileCheck -check-prefix=m0010 %s # m0010: 00000000000010e0 0x10e8 _OBJC_CLASS_ -# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \ +# RUN: llvm-objdump -macho -objc-meta-data \ # RUN: %p/Inputs/malformed-machos/mem-crup-0040.macho \ # RUN: | FileCheck -check-prefix=m0040 %s # m0040: 00000000000010a0 0xf39 -[tiny_dylib init] -# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \ +# RUN: llvm-objdump -macho -objc-meta-data \ # RUN: %p/Inputs/malformed-machos/mem-crup-0080.macho \ # RUN: | FileCheck -check-prefix=m0080 %s # m0080: data 0xf960000 (struct class_ro_t *) -# RUN: llvm-objdump --print-imm-hex=false -macho -objc-meta-data \ +# RUN: llvm-objdump -macho -objc-meta-data \ # RUN: %p/Inputs/malformed-machos/mem-crup-0261.macho -# RUN: llvm-objdump --print-imm-hex=false -macho -disassemble \ +# RUN: llvm-objdump -macho -disassemble \ # RUN: %p/Inputs/malformed-machos/mem-crup-0337.macho \ # RUN: | FileCheck -check-prefix=m0337 %s diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index da2494d1b1c..6eab69c1b2e 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -177,8 +177,7 @@ PrivateHeadersShort("p", cl::desc("Alias for --private-headers"), cl::opt<bool> llvm::PrintImmHex("print-imm-hex", - cl::desc("Use hex format for immediate values"), - cl::init(true)); + cl::desc("Use hex format for immediate values")); cl::opt<bool> PrintFaultMaps("fault-map-section", cl::desc("Display contents of faultmap section")); |
