[llvm-objdump] Printing hex instead of dec by default

Differential Revision: http://reviews.llvm.org/D18770 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265817 91177308-0d34-0410-b5e6-96231b3b80d8
zoren · Apr 8, 2016 · c49723b · c49723b
1 parent 62e3955
commit c49723b
Show file tree

Hide file tree

Showing 61 changed files with 106 additions and 104 deletions.
diff --git a/test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-thumb.ll b/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 -triple=thumbv7 -d - | FileCheck %s
+;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 | FileCheck %s -check-prefix=ASM
 ;RUN:  llc -mtriple=thumbv7-apple-darwin < %s | FileCheck %s -check-prefix=ASM
 

diff --git a/test/CodeGen/ARM/inlineasm-switch-mode.ll b/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 -triple=armv7   -d %t | FileCheck %s --check-prefix=ARM
-;RUN: llvm-objdump -triple=thumbv7 -d %t | FileCheck %s --check-prefix=THUMB
+;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
 
 define hidden i32 @bah(i8* %start) #0 align 2 {
   %1 = ptrtoint i8* %start to i32

diff --git a/test/CodeGen/ARM/struct_byval_arm_t1_t2.ll b/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 -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
+;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
 ;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 -triple thumbv5-none-linux-gnueabi -disassemble - > %t
+;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: cat %t | FileCheck %s --check-prefix=THUMB1
 ;RUN: cat %t | FileCheck %s --check-prefix=T1POST
 

diff --git a/test/CodeGen/ARM/thumb1-varalloc.ll b/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 -triple=thumbv6-apple-darwin -d %t | FileCheck %s
+; RUN: llvm-objdump --print-imm-hex=false -triple=thumbv6-apple-darwin -d %t | FileCheck %s
 
 @__bar = external hidden global i8*
 @__baz = external hidden global i8*

diff --git a/test/CodeGen/Hexagon/cmp.ll b/test/CodeGen/Hexagon/cmp.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=hexagon --filetype=obj < %s  -o - | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=hexagon --filetype=obj < %s  -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 ; Function Attrs: nounwind
 define i32 @cmpeq(i32 %i) #0 {

diff --git a/test/CodeGen/Hexagon/relax.ll b/test/CodeGen/Hexagon/relax.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=hexagon -filetype=obj < %s | llvm-objdump -d -r - | FileCheck %s
+; RUN: llc -march=hexagon -filetype=obj < %s | llvm-objdump --print-imm-hex=false -d -r - | FileCheck %s
 
 declare void @bar()
 

diff --git a/test/CodeGen/Mips/micromips-atomic1.ll b/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 -no-show-raw-insn -arch mipsel -mcpu=mips32r2 -mattr=micromips -d - \
+; RUN:   | llvm-objdump --print-imm-hex=false -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/test/CodeGen/Thumb/large-stack.ll b/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 -triple=thumbv6-apple-ios -d %t | FileCheck %s --check-prefix=CHECK --check-prefix=IOS
+; RUN: llvm-objdump --print-imm-hex=false -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 -triple=thumbv6-none-eabi -d %t | FileCheck %s --check-prefix=CHECK --check-prefix=EABI
+; RUN: llvm-objdump --print-imm-hex=false -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/test/MC/ARM/coff-relocations.s b/test/MC/ARM/coff-relocations.s
@@ -2,7 +2,8 @@
 @ RUN:   | llvm-readobj -r - | FileCheck %s -check-prefix CHECK-RELOCATION
 
 @ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN:   | llvm-objdump -d - | FileCheck %s -check-prefix CHECK-ENCODING
+@ RUN:   | llvm-objdump --print-imm-hex=false -d - | FileCheck %s \
+@ RUN: -check-prefix CHECK-ENCODING
 
 	.syntax unified
 	.text

diff --git a/test/MC/ARM/thumb1-relax-bcc.s b/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 -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s
+@ RUN:    llvm-objdump --print-imm-hex=false -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s
 
         .global func1
 _func1:

diff --git a/test/MC/ARM/thumb1-relax-br.s b/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 -d -r -triple thumbv7m-none-macho %t | FileCheck --check-prefix=CHECK-MACHO %s
+@ RUN:    llvm-objdump --print-imm-hex=false -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 -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s
+@ RUN:    llvm-objdump --print-imm-hex=false -d -r -triple thumbv7m-none-eabi %t | FileCheck --check-prefix=CHECK-ELF %s
 
         .global func1
 _func1:

diff --git a/test/MC/ARM/thumb2-cbn-to-next-inst.s b/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 -triple thumbv7-apple-darwin -d %t.o | FileCheck %s
+@ RUN: llvm-objdump --print-imm-hex=false -triple thumbv7-apple-darwin -d %t.o | FileCheck %s
 
 .thumb
 start:

diff --git a/test/MC/ELF/relax-arith.s b/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 -d - | FileCheck  %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck  %s
 
 // Test that we correctly relax these instructions into versions that use
 // 16 or 32 bit immediate values.

diff --git a/test/MC/ELF/relax-arith2.s b/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 -d - | FileCheck  %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck  %s
 
 // Test that we avoid relaxing these instructions and instead generate versions
 // that use 8-bit immediate values.

diff --git a/test/MC/ELF/relax-arith3.s b/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 -d - | FileCheck  %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -d - | FileCheck  %s
 
 // Test that we correctly relax these instructions into versions that use
 // 16 or 32 bit immediate values.

diff --git a/test/MC/ELF/relax-arith4.s b/test/MC/ELF/relax-arith4.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-objdump -d - | FileCheck  %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-objdump --print-imm-hex=false -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/test/MC/Hexagon/asmMap.s b/test/MC/Hexagon/asmMap.s
@@ -1,4 +1,4 @@
-#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s
+#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 # Make sure that the assembler mapped instructions are being handled correctly.
 

diff --git a/test/MC/Hexagon/duplex-registers.s b/test/MC/Hexagon/duplex-registers.s
@@ -1,4 +1,4 @@
-#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s
+#RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 .text
 {

diff --git a/test/MC/Hexagon/fixups.s b/test/MC/Hexagon/fixups.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -arch=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s
+# RUN: llvm-mc -arch=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
   .text
 # CHECK-LABEL: 0:

diff --git a/test/MC/Hexagon/iconst.s b/test/MC/Hexagon/iconst.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d -r - | FileCheck %s
+# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d -r - | FileCheck %s
 
 a:
 # CHECK: r0 = add(r0, #0)

diff --git a/test/MC/Hexagon/inst_cmp_eqi.ll b/test/MC/Hexagon/inst_cmp_eqi.ll
@@ -1,5 +1,5 @@
 ;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \
-;; RUN: | llvm-objdump -d - | FileCheck %s
+;; RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 define i1 @foo (i32 %a)
 {

diff --git a/test/MC/Hexagon/inst_cmp_gti.ll b/test/MC/Hexagon/inst_cmp_gti.ll
@@ -1,5 +1,5 @@
 ;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \
-;; RUN: | llvm-objdump -d - | FileCheck %s
+;; RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 define i1 @foo (i32 %a)
 {

diff --git a/test/MC/Hexagon/inst_cmp_ugti.ll b/test/MC/Hexagon/inst_cmp_ugti.ll
@@ -1,5 +1,5 @@
 ;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \
-;; RUN: | llvm-objdump -d - | FileCheck %s
+;; RUN: | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 define i1 @foo (i32 %a)
 {

diff --git a/test/MC/Hexagon/relaxed_newvalue.s b/test/MC/Hexagon/relaxed_newvalue.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s
+# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 # Make sure relaxation doesn't hinder newvalue calculation
 
 #CHECK: r18 = add(r2, #-6)

diff --git a/test/MC/Hexagon/two_ext.s b/test/MC/Hexagon/two_ext.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump -d - | FileCheck %s
+# RUN: llvm-mc -triple=hexagon -filetype=obj %s | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 # verify two extenders generated during relaxation
 {

diff --git a/test/MC/Hexagon/v60-vmem.s b/test/MC/Hexagon/v60-vmem.s
@@ -1,5 +1,5 @@
 #RUN: llvm-mc -triple=hexagon -mcpu=hexagonv60 -filetype=obj %s | \
-#RUN: llvm-objdump -triple=hexagon -mcpu=hexagonv60 -d - | \
+#RUN: llvm-objdump --print-imm-hex=false -triple=hexagon -mcpu=hexagonv60 -d - | \
 #RUN: FileCheck %s
 
 #CHECK: 292cc11b { vmem(r12++#1) = v27 }

diff --git a/test/MC/Mips/cprestore-noreorder.s b/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 -d -r -arch=mips - | \
+# RUN:  llvm-objdump --print-imm-hex=false -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/test/MC/Mips/cprestore-reorder.s b/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 -d -r -arch=mips - | \
+# RUN:  llvm-objdump --print-imm-hex=false -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/test/MC/Mips/cpsetup.s b/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 -d -r -arch=mips64 - | \
+# RUN:   llvm-objdump --print-imm-hex=false -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 -d -r -t -arch=mips64 - | \
+# RUN:   llvm-objdump --print-imm-hex=false -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 -d -r -t -arch=mips64 - | \
+# RUN:   llvm-objdump --print-imm-hex=false -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/test/MC/Mips/got-rel-expr.s b/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 -d -r - | FileCheck %s
+# RUN:   | llvm-objdump --print-imm-hex=false -d -r - | FileCheck %s
 
   .text
 foo:

diff --git a/test/MC/Mips/hex-immediates.s b/test/MC/Mips/hex-immediates.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj %s -triple=mips-unknown-linux \
-# RUN:   | llvm-objdump -d --print-imm-hex - | FileCheck %s
+# RUN:   | llvm-objdump -d - | FileCheck %s
 
 # CHECK: jal   0x20
 # CHECK: addiu $sp, $sp, -0x20

diff --git a/test/MC/Mips/higher-highest-addressing.s b/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 -disassemble -triple mips64el - | FileCheck %s
+# RUN:  | llvm-objdump --print-imm-hex=false -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/test/MC/Mips/hilo-addressing.s b/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 -disassemble - | FileCheck %s -check-prefix=CHECK-INSTR
+# RUN:  | llvm-objdump --print-imm-hex=false -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/test/MC/Mips/instr-analysis.s b/test/MC/Mips/instr-analysis.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o - \
-# RUN:   | llvm-objdump -d - | FileCheck %s
+# RUN:   | llvm-objdump --print-imm-hex=false -d - | FileCheck %s
 
 # CHECK:      foo:
 # CHECK-NEXT:        0:       0c 00 00 02     jal     8 <loc1>

diff --git a/test/MC/Mips/micromips-el-fixup-data.s b/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 %t.o -triple mipsel -mattr=+micromips -d | FileCheck %s
+# RUN: llvm-objdump --print-imm-hex=false %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/test/MC/Mips/mips64extins.ll b/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 -disassemble -triple mips64el -mattr +mips64r2 - \
+; RUN: | llvm-objdump --print-imm-hex=false -disassemble -triple mips64el -mattr +mips64r2 - \
 ; RUN: | FileCheck %s
 
 define i64 @dext(i64 %i) nounwind readnone {

diff --git a/test/MC/Mips/mips64shift.ll b/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 -disassemble -triple mips64el - | FileCheck %s 
+; RUN: | llvm-objdump --print-imm-hex=false -disassemble -triple mips64el - | FileCheck %s 
 
 ; RUN: llc -march=mips64el -filetype=obj -mcpu=mips64r2 %s -o - \
-; RUN: | llvm-objdump -disassemble -triple mips64el - | FileCheck %s 
+; RUN: | llvm-objdump --print-imm-hex=false -disassemble -triple mips64el - | FileCheck %s 
 
 define i64 @f3(i64 %a0) nounwind readnone {
 entry:

diff --git a/test/MC/Mips/mips_gprel16.s b/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 -disassemble -mattr +mips32r2 - \
+// RUN: | llvm-objdump --print-imm-hex=false -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 -disassemble -mattr +mips32r2 - \
+// RUN: | llvm-objdump --print-imm-hex=false -disassemble -mattr +mips32r2 - \
 // RUN: | FileCheck %s
 
 	.text

diff --git a/test/MC/Mips/nacl-mask.s b/test/MC/Mips/nacl-mask.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-nacl %s \
-# RUN:  | llvm-objdump -triple mipsel -disassemble -no-show-raw-insn - \
+# RUN:  | llvm-objdump --print-imm-hex=false -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/test/MC/X86/AlignedBundling/labeloffset.s b/test/MC/X86/AlignedBundling/labeloffset.s
@@ -1,9 +1,9 @@
 # RUN: llvm-mc -triple=i686-linux -filetype=obj %s -o - | \
-# RUN: llvm-objdump -disassemble -no-show-raw-insn -r - | FileCheck %s
+# RUN: llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn -r - | FileCheck %s
 # RUN: llvm-mc -triple=i686-nacl -filetype=obj %s -o - | \
-# RUN: llvm-objdump -disassemble -no-show-raw-insn -r - | FileCheck %s
+# RUN: llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn -r - | FileCheck %s
 # RUN: llvm-mc -triple=i686-nacl -filetype=obj -mc-relax-all %s -o - | \
-# RUN: llvm-objdump -disassemble -no-show-raw-insn -r - | FileCheck %s
+# RUN: llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn -r - | FileCheck %s
 
         .bundle_align_mode 5
         .text

diff --git a/test/MC/X86/AlignedBundling/misaligned-bundle-group.s b/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 -disassemble -no-show-raw-insn - \
+# RUN:   | llvm-objdump --print-imm-hex=false -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 -disassemble -no-show-raw-insn - \
+# RUN:   | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - \
 # RUN:   | FileCheck -check-prefix=CHECK -check-prefix=CHECK-RELAX %s
 
         .text

diff --git a/test/MC/X86/AlignedBundling/misaligned-bundle.s b/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 -disassemble -no-show-raw-insn - \
+# RUN:   | llvm-objdump --print-imm-hex=false -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 -disassemble -no-show-raw-insn - \
+# RUN:   | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - \
 # RUN:   | FileCheck -check-prefix=CHECK -check-prefix=CHECK-RELAX %s
 
         .text

diff --git a/test/MC/X86/AlignedBundling/rodata-section.s b/test/MC/X86/AlignedBundling/rodata-section.s
@@ -1,7 +1,7 @@
 # RUN: llvm-mc -triple=i686-nacl -filetype=obj %s -o - \
-# RUN:    | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN:    | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - | FileCheck %s
 # RUN: llvm-mc -triple=i686-nacl -filetype=obj -mc-relax-all %s -o - \
-# RUN:    | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN:    | llvm-objdump --print-imm-hex=false -disassemble -no-show-raw-insn - | FileCheck %s
 
   .bundle_align_mode 5
   .text