Index: test/CodeGen/AArch64/arm64-simplest-elf.ll
===================================================================
--- test/CodeGen/AArch64/arm64-simplest-elf.ll
+++ test/CodeGen/AArch64/arm64-simplest-elf.ll
@@ -1,5 +1,5 @@
; RUN: llc -mtriple=arm64-linux-gnu < %s | FileCheck %s
-; RUN: llc -mtriple=arm64-linux-gnu -filetype=obj < %s | llvm-objdump - -r -d --triple=arm64-linux-gnu | FileCheck --check-prefix=CHECK-ELF %s
+; RUN: llc -mtriple=arm64-linux-gnu -filetype=obj < %s | llvm-objdump - -r -bare -d --triple=arm64-linux-gnu | FileCheck --check-prefix=CHECK-ELF %s
define void @foo() nounwind {
ret void
Index: test/CodeGen/AArch64/bitfield-insert-0.ll
===================================================================
--- test/CodeGen/AArch64/bitfield-insert-0.ll
+++ test/CodeGen/AArch64/bitfield-insert-0.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=aarch64-linux-gnu -filetype=obj -o - %s | llvm-objdump -disassemble - | FileCheck %s
+; RUN: llc -mtriple=aarch64-linux-gnu -filetype=obj -o - %s | llvm-objdump -bare -d - | FileCheck %s
; The encoding of lsb -> immr in the CGed bitfield instructions was wrong at one
; point, in the edge case where lsb = 0. Just make sure.
Index: test/CodeGen/AArch64/inlineasm-ldr-pseudo.ll
===================================================================
--- test/CodeGen/AArch64/inlineasm-ldr-pseudo.ll
+++ test/CodeGen/AArch64/inlineasm-ldr-pseudo.ll
@@ -2,7 +2,7 @@
; assembly, the current code path will bypass the parser and just write the
; raw text out to the Streamer. We need to actually parse the inlineasm to
; demonstrate the bug. Going the asm->obj route does not show the issue.
-; RUN: llc -mtriple=aarch64 < %s -filetype=obj | llvm-objdump -arch=aarch64 -d - | FileCheck %s
+; RUN: llc -mtriple=aarch64 < %s -filetype=obj | llvm-objdump -bare -arch=aarch64 -d - | FileCheck %s
; CHECK-LABEL: foo:
; CHECK: a0 79 95 d2 movz x0, #0xabcd
Index: test/CodeGen/ARM/Windows/chkstk-movw-movt-isel.ll
===================================================================
--- test/CodeGen/ARM/Windows/chkstk-movw-movt-isel.ll
+++ test/CodeGen/ARM/Windows/chkstk-movw-movt-isel.ll
@@ -1,5 +1,5 @@
; RUN: llc -mtriple thumbv7--windows-itanium -code-model large -filetype obj -o - %s \
-; RUN: | llvm-objdump -no-show-raw-insn -d - | FileCheck %s
+; RUN: | llvm-objdump -no-show-raw-insn -bare -d - | FileCheck %s
; ModuleID = 'reduced.c'
target datalayout = "e-m:e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:64-v128:64:128-a:0:32-n32-S64"
Index: test/CodeGen/ARM/inlineasm-ldr-pseudo.ll
===================================================================
--- test/CodeGen/ARM/inlineasm-ldr-pseudo.ll
+++ test/CodeGen/ARM/inlineasm-ldr-pseudo.ll
@@ -3,8 +3,8 @@
; assembly, the current code path will bypass the parser and just write the
; raw text out to the Streamer. We need to actually parse the inlineasm to
; demonstrate the bug. Going the asm->obj route does not show the issue.
-; RUN: llc -mtriple=arm-none-linux < %s -filetype=obj | llvm-objdump -d - | FileCheck %s
-; RUN: llc -mtriple=arm-apple-darwin < %s -filetype=obj | llvm-objdump -d - | FileCheck %s
+; RUN: llc -mtriple=arm-none-linux < %s -filetype=obj | llvm-objdump -bare -d - | FileCheck %s
+; RUN: llc -mtriple=arm-apple-darwin < %s -filetype=obj | llvm-objdump -bare -d - | FileCheck %s
; CHECK-LABEL: foo:
; CHECK: 0: 00 00 9f e5 ldr r0, [pc]
; CHECK: 4: 0e f0 a0 e1 mov pc, lr
Index: test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-arm.ll
===================================================================
--- test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-arm.ll
+++ test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-arm.ll
@@ -1,4 +1,4 @@
-;RUN: llc -mtriple=armv7-linux-gnueabi < %s | llvm-mc -triple=armv7-linux-gnueabi -filetype=obj | llvm-objdump -triple=armv7 -d - | FileCheck %s
+;RUN: llc -mtriple=armv7-linux-gnueabi < %s | llvm-mc -triple=armv7-linux-gnueabi -filetype=obj | llvm-objdump -triple=armv7 -bare -d - | FileCheck %s
;RUN: llc -mtriple=armv7-linux-gnueabi < %s | FileCheck %s -check-prefix=ASM
;RUN: llc -mtriple=armv7-apple-darwin < %s | FileCheck %s -check-prefix=ASM
Index: test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-thumb.ll
===================================================================
--- test/CodeGen/ARM/inlineasm-switch-mode-oneway-from-thumb.ll
+++ 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 -triple=thumbv7 -bare -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
Index: test/CodeGen/ARM/inlineasm-switch-mode.ll
===================================================================
--- test/CodeGen/ARM/inlineasm-switch-mode.ll
+++ 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 -triple=armv7 -bare -d %t | FileCheck %s --check-prefix=ARM
+;RUN: llvm-objdump -triple=thumbv7 -bare -d %t | FileCheck %s --check-prefix=THUMB
define hidden i32 @bah(i8* %start) #0 align 2 {
%1 = ptrtoint i8* %start to i32
Index: test/CodeGen/ARM/struct_byval_arm_t1_t2.ll
===================================================================
--- test/CodeGen/ARM/struct_byval_arm_t1_t2.ll
+++ 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 -triple armv7-none-linux-gnueabi -bare -d - | 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 -bare -d - | 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 -bare -d - | 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 -triple thumbv5-none-linux-gnueabi -bare -d - > %t
;RUN: cat %t | FileCheck %s --check-prefix=THUMB1
;RUN: cat %t | FileCheck %s --check-prefix=T1POST
Index: test/CodeGen/ARM/trap.ll
===================================================================
--- test/CodeGen/ARM/trap.ll
+++ test/CodeGen/ARM/trap.ll
@@ -2,22 +2,22 @@
; RUN: llc < %s -mtriple=arm-apple-darwin -trap-func=_trap | FileCheck %s -check-prefix=FUNC
; RUN: llc < %s -mtriple=arm-apple-darwin -trap-func=_trap -O0 | FileCheck %s -check-prefix=FUNC
; RUN: llc -mtriple=armv7-unknown-nacl -filetype=obj %s -o - \
-; RUN: | llvm-objdump -disassemble -triple armv7-unknown-nacl - \
+; RUN: | llvm-objdump -bare -d -triple armv7-unknown-nacl - \
; RUN: | FileCheck %s -check-prefix=ENCODING-NACL
; RUN: llc -mtriple=armv7-unknown-nacl -filetype=obj %s -o - \
-; RUN: | llvm-objdump -disassemble -triple armv7 -mattr=+nacl-trap - \
+; RUN: | llvm-objdump -bare -d -triple armv7 -mattr=+nacl-trap - \
; RUN: | FileCheck %s -check-prefix=ENCODING-NACL
; RUN: llc -mtriple=armv7 -mattr=+nacl-trap -filetype=obj %s -o - \
-; RUN: | llvm-objdump -disassemble -triple armv7 -mattr=+nacl-trap - \
+; RUN: | llvm-objdump -bare -d -triple armv7 -mattr=+nacl-trap - \
; RUN: | FileCheck %s -check-prefix=ENCODING-NACL
; RUN: llc -verify-machineinstrs -fast-isel -mtriple=armv7-unknown-nacl -filetype=obj %s -o - \
-; RUN: | llvm-objdump -disassemble -triple armv7-unknown-nacl - \
+; RUN: | llvm-objdump -bare -d -triple armv7-unknown-nacl - \
; RUN: | FileCheck %s -check-prefix=ENCODING-NACL
; RUN: llc -mtriple=armv7 -filetype=obj %s -o - \
-; RUN: | llvm-objdump -disassemble -triple armv7 - \
+; RUN: | llvm-objdump -bare -d -triple armv7 - \
; RUN: | FileCheck %s -check-prefix=ENCODING-ALL
; RUN: llc -verify-machineinstrs -fast-isel -mtriple=armv7 -filetype=obj %s -o - \
-; RUN: | llvm-objdump -disassemble -triple armv7 - \
+; RUN: | llvm-objdump -bare -d -triple armv7 - \
; RUN: | FileCheck %s -check-prefix=ENCODING-ALL
; rdar://7961298
; rdar://9249183
Index: test/CodeGen/Thumb/iabs.ll
===================================================================
--- test/CodeGen/Thumb/iabs.ll
+++ test/CodeGen/Thumb/iabs.ll
@@ -1,5 +1,5 @@
; RUN: llc < %s -mtriple=thumb-unknown-unknown -filetype=obj -o %t.o
-; RUN: llvm-objdump -disassemble -arch=thumb %t.o | FileCheck %s
+; RUN: llvm-objdump -bare -d -arch=thumb %t.o | FileCheck %s
define i32 @test(i32 %a) {
%tmp1neg = sub i32 0, %a
Index: test/CodeGen/X86/2014-08-29-CompactUnwind.ll
===================================================================
--- test/CodeGen/X86/2014-08-29-CompactUnwind.ll
+++ test/CodeGen/X86/2014-08-29-CompactUnwind.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -disable-fp-elim -mtriple x86_64-apple-darwin11 -mcpu corei7 -filetype=obj -o - | llvm-objdump -d -unwind-info -s - | FileCheck %s
+; RUN: llc < %s -disable-fp-elim -mtriple x86_64-apple-darwin11 -mcpu corei7 -filetype=obj -o - | llvm-objdump -bare -d -unwind-info -s - | FileCheck %s
; Regression test for http://llvm.org/bugs/show_bug.cgi?id=20800.
; ModuleID = 'asan_report.ii'
Index: test/LTO/attrs.ll
===================================================================
--- test/LTO/attrs.ll
+++ test/LTO/attrs.ll
@@ -1,6 +1,6 @@
; RUN: llvm-as < %s >%t1
; RUN: llvm-lto -exported-symbol=test_x86_aesni_aeskeygenassist -mattr=+aes -o %t2 %t1
-; RUN: llvm-objdump -d %t2 | FileCheck -check-prefix=WITH_AES %s
+; RUN: llvm-objdump -bare -d %t2 | FileCheck -check-prefix=WITH_AES %s
; RUN: not llvm-lto -exported-symbol=test_x86_aesni_aeskeygenassist -mattr=-aes -o %t3 %t1 2>&1 | FileCheck -check-prefix=WITHOUT_AES %s
target triple = "x86_64-unknown-linux-gnu"
Index: test/MC/AArch64/elf-objdump.s
===================================================================
--- test/MC/AArch64/elf-objdump.s
+++ test/MC/AArch64/elf-objdump.s
@@ -1,5 +1,5 @@
// 64 bit little endian
-// RUN: llvm-mc -filetype=obj -triple aarch64-none-linux-gnu %s -o - | llvm-objdump -d -
+// RUN: llvm-mc -filetype=obj -triple aarch64-none-linux-gnu %s -o - | llvm-objdump -bare -d -
// We just want to see if llvm-objdump works at all.
// CHECK: .text
Index: test/MC/AArch64/optional-hash.s
===================================================================
--- test/MC/AArch64/optional-hash.s
+++ test/MC/AArch64/optional-hash.s
@@ -1,6 +1,6 @@
// PR18929
// RUN: llvm-mc < %s -triple=aarch64-linux-gnueabi -mattr=+fp-armv8,+neon -filetype=obj -o - \
-// RUN: | llvm-objdump --disassemble -arch=arm64 -mattr=+fp-armv8,+neon - | FileCheck %s
+// RUN: | llvm-objdump -bare -d -arch=arm64 -mattr=+fp-armv8,+neon - | FileCheck %s
.text
// CHECK: cmp w0, #123
Index: test/MC/ARM/AlignedBundling/group-bundle-arm.s
===================================================================
--- test/MC/ARM/AlignedBundling/group-bundle-arm.s
+++ test/MC/ARM/AlignedBundling/group-bundle-arm.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple armv7-linux-gnueabi %s -o - \
-# RUN: | llvm-objdump -no-show-raw-insn -triple armv7 -disassemble - | FileCheck %s
+# RUN: | llvm-objdump -no-show-raw-insn -triple armv7 -bare -d - | FileCheck %s
# On ARM each instruction is 4 bytes long so padding for individual
# instructions should not be inserted. However, for bundle-locked groups
Index: test/MC/ARM/AlignedBundling/pad-align-to-bundle-end.s
===================================================================
--- test/MC/ARM/AlignedBundling/pad-align-to-bundle-end.s
+++ test/MC/ARM/AlignedBundling/pad-align-to-bundle-end.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple armv7-linux-gnueabi %s -o - \
-# RUN: | llvm-objdump -no-show-raw-insn -triple armv7 -disassemble - | FileCheck %s
+# RUN: | llvm-objdump -no-show-raw-insn -triple armv7 -bare -d - | FileCheck %s
.syntax unified
.text
Index: test/MC/ARM/Windows/mov32t-range.s
===================================================================
--- test/MC/ARM/Windows/mov32t-range.s
+++ test/MC/ARM/Windows/mov32t-range.s
@@ -2,7 +2,7 @@
@ RUN: | llvm-readobj -r - | FileCheck -check-prefix CHECK-RELOCATIONS %s
@ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN: | llvm-objdump -d - | FileCheck -check-prefix CHECK-ENCODING %s
+@ RUN: | llvm-objdump -bare -d - | FileCheck -check-prefix CHECK-ENCODING %s
.syntax unified
.thumb
Index: test/MC/ARM/align_arm_2_thumb.s
===================================================================
--- test/MC/ARM/align_arm_2_thumb.s
+++ test/MC/ARM/align_arm_2_thumb.s
@@ -1,8 +1,8 @@
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %s
-@ RUN: llvm-objdump -triple thumbv7-none-linux -d %t.o | FileCheck --check-prefix=ARM_2_THUMB %s
+@ RUN: llvm-objdump -triple thumbv7-none-linux -bare -d %t.o | FileCheck --check-prefix=ARM_2_THUMB %s
@ RUN: llvm-mc -triple armv7-apple-darwin -filetype=obj -o %t_darwin.o %s
-@ RUN: llvm-objdump -triple thumbv7-apple-darwin -d %t_darwin.o | FileCheck --check-prefix=ARM_2_THUMB %s
+@ RUN: llvm-objdump -triple thumbv7-apple-darwin -bare -d %t_darwin.o | FileCheck --check-prefix=ARM_2_THUMB %s
.syntax unified
.code 16
Index: test/MC/ARM/align_thumb_2_arm.s
===================================================================
--- test/MC/ARM/align_thumb_2_arm.s
+++ test/MC/ARM/align_thumb_2_arm.s
@@ -1,8 +1,8 @@
@ RUN: llvm-mc -triple thumbv7-none-linux -filetype=obj -o %t.o %s
-@ RUN: llvm-objdump -triple armv7-none-linux -d %t.o | FileCheck --check-prefix=THUMB_2_ARM %s
+@ RUN: llvm-objdump -triple armv7-none-linux -bare -d %t.o | FileCheck --check-prefix=THUMB_2_ARM %s
@ RUN: llvm-mc -triple thumbv7-apple-darwin -filetype=obj -o %t_darwin.o %s
-@ RUN: llvm-objdump -triple armv7-apple-darwin -d %t_darwin.o | FileCheck --check-prefix=THUMB_2_ARM %s
+@ RUN: llvm-objdump -triple armv7-apple-darwin -bare -d %t_darwin.o | FileCheck --check-prefix=THUMB_2_ARM %s
.syntax unified
.code 32
Index: test/MC/ARM/cmp-immediate-fixup.s
===================================================================
--- test/MC/ARM/cmp-immediate-fixup.s
+++ test/MC/ARM/cmp-immediate-fixup.s
@@ -1,6 +1,6 @@
@ PR18931
@ RUN: llvm-mc < %s -triple=arm-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-objdump --disassemble -arch=arm - | FileCheck %s
+@ RUN: | llvm-objdump -bare -d -arch=arm - | FileCheck %s
.text
@ CHECK: cmp r2, #1
Index: test/MC/ARM/cmp-immediate-fixup2.s
===================================================================
--- test/MC/ARM/cmp-immediate-fixup2.s
+++ test/MC/ARM/cmp-immediate-fixup2.s
@@ -1,6 +1,6 @@
@ PR18931
@ RUN: llvm-mc < %s -triple=arm-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-objdump --disassemble -arch=arm - | FileCheck %s
+@ RUN: | llvm-objdump -bare -d -arch=arm - | FileCheck %s
.text
@ CHECK: cmp r2, #0
Index: test/MC/ARM/coff-relocations.s
===================================================================
--- test/MC/ARM/coff-relocations.s
+++ test/MC/ARM/coff-relocations.s
@@ -2,7 +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 -d - | FileCheck %s -check-prefix CHECK-ENCODING
+@ RUN: | llvm-objdump -bare -d - | FileCheck %s -check-prefix CHECK-ENCODING
.syntax unified
.text
Index: test/MC/ARM/fixup-cpu-mode.s
===================================================================
--- test/MC/ARM/fixup-cpu-mode.s
+++ test/MC/ARM/fixup-cpu-mode.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple thumbv7-linux-gnu %s -o %t
-// RUN: llvm-objdump -triple thumbv7-linux-gnu -d %t | FileCheck %s
+// RUN: llvm-objdump -triple thumbv7-linux-gnu -bare -d %t | FileCheck %s
//PR18303
.code 16
Index: test/MC/ARM/thumb2-cbn-to-next-inst.s
===================================================================
--- test/MC/ARM/thumb2-cbn-to-next-inst.s
+++ 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 -triple thumbv7-apple-darwin -bare -d %t.o | FileCheck %s
.thumb
start:
Index: test/MC/ELF/relax-all-flag.s
===================================================================
--- test/MC/ELF/relax-all-flag.s
+++ test/MC/ELF/relax-all-flag.s
@@ -4,10 +4,10 @@
// expect to see a different instruction.
// RUN: llvm-mc -filetype=obj -mc-relax-all -triple x86_64-pc-linux-gnu %s -o - \
-// RUN: | llvm-objdump -disassemble - | FileCheck -check-prefix=RELAXALL %s
+// RUN: | llvm-objdump -bare -d - | FileCheck -check-prefix=RELAXALL %s
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-// RUN: | llvm-objdump -disassemble - | FileCheck %s
+// RUN: | llvm-objdump -bare -d - | FileCheck %s
.text
foo:
Index: test/MC/MachO/ARM/llvm-objdump-macho-stripped.s
===================================================================
--- test/MC/MachO/ARM/llvm-objdump-macho-stripped.s
+++ test/MC/MachO/ARM/llvm-objdump-macho-stripped.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple=thumbv7-apple-ios -filetype=obj -o - < %s | llvm-objdump -d -macho -triple=thumbv7-apple-ios - | FileCheck %s
+@ RUN: llvm-mc -triple=thumbv7-apple-ios -filetype=obj -o - < %s | llvm-objdump -bare -d -macho -triple=thumbv7-apple-ios - | FileCheck %s
nop
# CHECK: 0: 00 bf nop
# We are checking that disassembly happens when there are no symbols.
Index: test/MC/MachO/ARM/llvm-objdump-macho.s
===================================================================
--- test/MC/MachO/ARM/llvm-objdump-macho.s
+++ test/MC/MachO/ARM/llvm-objdump-macho.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple=thumbv7-apple-ios -filetype=obj -o - < %s | llvm-objdump -d -macho -triple=thumbv7-apple-ios - | FileCheck %s
+@ RUN: llvm-mc -triple=thumbv7-apple-ios -filetype=obj -o - < %s | llvm-objdump -bare -d -macho -triple=thumbv7-apple-ios - | FileCheck %s
.thumb
.thumb_func _fib
_fib:
Index: test/MC/Mips/cpload.s
===================================================================
--- test/MC/Mips/cpload.s
+++ test/MC/Mips/cpload.s
@@ -1,11 +1,11 @@
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 | FileCheck %s -check-prefix=ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o -| \
-# RUN: llvm-objdump -d -r -arch=mips - | \
+# RUN: llvm-objdump -bare -d -r -arch=mips - | \
# RUN: FileCheck %s -check-prefix=OBJ
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -filetype=obj -o -| \
-# RUN: llvm-objdump -d -r -arch=mips - | \
+# RUN: llvm-objdump -bare -d -r -arch=mips - | \
# RUN: FileCheck %s -check-prefix=OBJ64
# ASM: .text
Index: test/MC/Mips/cpsetup.s
===================================================================
--- test/MC/Mips/cpsetup.s
+++ test/MC/Mips/cpsetup.s
@@ -1,19 +1,19 @@
# RUN: llvm-mc -triple mips64-unknown-unknown -mattr=-n64,+o32 -filetype=obj -o - %s | \
-# RUN: llvm-objdump -d -r -arch=mips64 - | \
+# RUN: llvm-objdump -bare -d -r -arch=mips64 - | \
# RUN: FileCheck -check-prefix=O32 %s
# RUN: llvm-mc -triple mips64-unknown-unknown -mattr=-n64,+o32 %s | \
# RUN: FileCheck -check-prefix=ASM %s
# RUN: llvm-mc -triple mips64-unknown-unknown -mattr=-n64,+n32 -filetype=obj -o - %s | \
-# RUN: llvm-objdump -d -r -arch=mips64 - | \
+# RUN: llvm-objdump -bare -d -r -arch=mips64 - | \
# RUN: FileCheck -check-prefix=NXX -check-prefix=N32 %s
# RUN: llvm-mc -triple mips64-unknown-unknown -mattr=-n64,+n32 %s | \
# RUN: FileCheck -check-prefix=ASM %s
# RUN: llvm-mc -triple mips64-unknown-unknown %s -filetype=obj -o - | \
-# RUN: llvm-objdump -d -r -arch=mips64 - | \
+# RUN: llvm-objdump -bare -d -r -arch=mips64 - | \
# RUN: FileCheck -check-prefix=NXX -check-prefix=N64 %s
# RUN: llvm-mc -triple mips64-unknown-unknown %s | \
Index: test/MC/Mips/elf-objdump.s
===================================================================
--- test/MC/Mips/elf-objdump.s
+++ test/MC/Mips/elf-objdump.s
@@ -1,11 +1,11 @@
// 32 bit big endian
-// RUN: llvm-mc -filetype=obj -triple mips-unknown-linux %s -o - | llvm-objdump -d -triple mips-unknown-linux - | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple mips-unknown-linux %s -o - | llvm-objdump -bare -d -triple mips-unknown-linux - | FileCheck %s
// 32 bit little endian
-// RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux %s -o - | llvm-objdump -d -triple mips-unknown-linux - | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux %s -o - | llvm-objdump -bare -d -triple mips-unknown-linux - | FileCheck %s
// 64 bit big endian
-// RUN: llvm-mc -filetype=obj -arch=mips64 -triple mips64-unknown-linux %s -o - | llvm-objdump -d -triple mips-unknown-linux - | FileCheck %s
+// RUN: llvm-mc -filetype=obj -arch=mips64 -triple mips64-unknown-linux %s -o - | llvm-objdump -bare -d -triple mips-unknown-linux - | FileCheck %s
// 64 bit little endian
-// RUN: llvm-mc -filetype=obj -arch=mips64el -triple mips64el-unknown-linux %s -o - | llvm-objdump -d -triple mips-unknown-linux - | FileCheck %s
+// RUN: llvm-mc -filetype=obj -arch=mips64el -triple mips64el-unknown-linux %s -o - | llvm-objdump -bare -d -triple mips-unknown-linux - | FileCheck %s
// We just want to see if llvm-objdump works at all.
// CHECK: .text
Index: test/MC/Mips/higher-highest-addressing.s
===================================================================
--- test/MC/Mips/higher-highest-addressing.s
+++ 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 -bare -d -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
Index: test/MC/Mips/hilo-addressing.s
===================================================================
--- test/MC/Mips/hilo-addressing.s
+++ 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 -bare -d - | 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
Index: test/MC/Mips/micromips-el-fixup-data.s
===================================================================
--- test/MC/Mips/micromips-el-fixup-data.s
+++ 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 %t.o -triple mipsel -mattr=+micromips -bare -d | FileCheck %s
# Check that fixup data is written in the microMIPS specific little endian
# byte order.
Index: test/MC/Mips/mips64extins.ll
===================================================================
--- test/MC/Mips/mips64extins.ll
+++ test/MC/Mips/mips64extins.ll
@@ -1,5 +1,5 @@
; RUN: llc -march=mips64el -filetype=obj -mcpu=mips64r2 -mattr=n64 %s -o - \
-; RUN: | llvm-objdump -disassemble -triple mips64el -mattr +mips64r2 - \
+; RUN: | llvm-objdump -bare -d -triple mips64el -mattr +mips64r2 - \
; RUN: | FileCheck %s
define i64 @dext(i64 %i) nounwind readnone {
Index: test/MC/Mips/mips64shift.ll
===================================================================
--- test/MC/Mips/mips64shift.ll
+++ 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 -bare -d -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 -bare -d -triple mips64el - | FileCheck %s
define i64 @f3(i64 %a0) nounwind readnone {
entry:
Index: test/MC/Mips/mips_gprel16.s
===================================================================
--- test/MC/Mips/mips_gprel16.s
+++ 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 -bare -d -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 -bare -d -mattr +mips32r2 - \
// RUN: | FileCheck %s
.text
Index: test/MC/Mips/nacl-mask.s
===================================================================
--- test/MC/Mips/nacl-mask.s
+++ 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 -triple mipsel -bare -d -no-show-raw-insn - \
# RUN: | FileCheck %s
# This test tests that address-masking sandboxing is added when given assembly
Index: test/MC/Mips/sext_64_32.ll
===================================================================
--- test/MC/Mips/sext_64_32.ll
+++ test/MC/Mips/sext_64_32.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=mips64el -filetype=obj -mcpu=mips64r2 %s -o - | llvm-objdump -disassemble -triple mips64el - | FileCheck %s
+; RUN: llc -march=mips64el -filetype=obj -mcpu=mips64r2 %s -o - | llvm-objdump -bare -d -triple mips64el - | FileCheck %s
; Sign extend from 32 to 64 was creating nonsense opcodes
Index: test/MC/X86/AlignedBundling/autogen-inst-offset-align-to-end.s
===================================================================
--- test/MC/X86/AlignedBundling/autogen-inst-offset-align-to-end.s
+++ test/MC/X86/AlignedBundling/autogen-inst-offset-align-to-end.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -triple i386 -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -triple i386 -bare -d -no-show-raw-insn - | FileCheck %s
# !!! This test is auto-generated from utils/testgen/mc-bundling-x86-gen.py !!!
# It tests that bundle-aligned grouping works correctly in MC. Read the
Index: test/MC/X86/AlignedBundling/autogen-inst-offset-padding.s
===================================================================
--- test/MC/X86/AlignedBundling/autogen-inst-offset-padding.s
+++ test/MC/X86/AlignedBundling/autogen-inst-offset-padding.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -triple i386 -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -triple i386 -bare -d -no-show-raw-insn - | FileCheck %s
# !!! This test is auto-generated from utils/testgen/mc-bundling-x86-gen.py !!!
# It tests that bundle-aligned grouping works correctly in MC. Read the
Index: test/MC/X86/AlignedBundling/different-sections.s
===================================================================
--- test/MC/X86/AlignedBundling/different-sections.s
+++ test/MC/X86/AlignedBundling/different-sections.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
# Test two different executable sections with bundling.
Index: test/MC/X86/AlignedBundling/long-nop-pad.s
===================================================================
--- test/MC/X86/AlignedBundling/long-nop-pad.s
+++ test/MC/X86/AlignedBundling/long-nop-pad.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
# Test that long nops are generated for padding where possible.
Index: test/MC/X86/AlignedBundling/pad-align-to-bundle-end.s
===================================================================
--- test/MC/X86/AlignedBundling/pad-align-to-bundle-end.s
+++ test/MC/X86/AlignedBundling/pad-align-to-bundle-end.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
# Test some variations of padding to the end of a bundle.
Index: test/MC/X86/AlignedBundling/pad-bundle-groups.s
===================================================================
--- test/MC/X86/AlignedBundling/pad-bundle-groups.s
+++ test/MC/X86/AlignedBundling/pad-bundle-groups.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
# Test some variations of padding for bundle-locked groups.
Index: test/MC/X86/AlignedBundling/relax-at-bundle-end.s
===================================================================
--- test/MC/X86/AlignedBundling/relax-at-bundle-end.s
+++ test/MC/X86/AlignedBundling/relax-at-bundle-end.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
# Test that an instruction near a bundle end gets properly padded
# after it is relaxed.
Index: test/MC/X86/AlignedBundling/relax-in-bundle-group.s
===================================================================
--- test/MC/X86/AlignedBundling/relax-in-bundle-group.s
+++ test/MC/X86/AlignedBundling/relax-in-bundle-group.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -disassemble - | FileCheck %s
+# RUN: | llvm-objdump -bare -d - | FileCheck %s
# Test that instructions inside bundle-locked groups are relaxed even if their
# fixup is short enough not to warrant relaxation on its own.
Index: test/MC/X86/AlignedBundling/single-inst-bundling.s
===================================================================
--- test/MC/X86/AlignedBundling/single-inst-bundling.s
+++ test/MC/X86/AlignedBundling/single-inst-bundling.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-objdump -disassemble -no-show-raw-insn - | FileCheck %s
+# RUN: | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
# Test simple NOP insertion for single instructions.
Index: test/MC/X86/fixup-cpu-mode.s
===================================================================
--- test/MC/X86/fixup-cpu-mode.s
+++ 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 -d %t | FileCheck %s
+// RUN: llvm-objdump -bare -d %t | FileCheck %s
//PR18303
.global edata
Index: test/MC/X86/relax-insn.s
===================================================================
--- test/MC/X86/relax-insn.s
+++ test/MC/X86/relax-insn.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
+// RUN: llvm-objdump -bare -d %t | FileCheck %s
.global foo
pushw $foo // CHECK: pushw
Index: test/MC/X86/stackmap-nops.ll
===================================================================
--- test/MC/X86/stackmap-nops.ll
+++ test/MC/X86/stackmap-nops.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim -filetype=obj %s -o - | llvm-objdump -d - | FileCheck %s
-; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim -filetype=asm %s -o - | llvm-mc -triple=x86_64-apple-darwin -mcpu=corei7 -filetype=obj - | llvm-objdump -d - | FileCheck %s
+; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim -filetype=obj %s -o - | llvm-objdump -bare -d - | FileCheck %s
+; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim -filetype=asm %s -o - | llvm-mc -triple=x86_64-apple-darwin -mcpu=corei7 -filetype=obj - | llvm-objdump -bare -d - | FileCheck %s
define void @nop_test() {
entry:
Index: test/MC/X86/x86_long_nop.s
===================================================================
--- test/MC/X86/x86_long_nop.s
+++ test/MC/X86/x86_long_nop.s
@@ -1,8 +1,8 @@
-# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu %s | llvm-objdump -d -no-show-raw-insn - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s | llvm-objdump -d -no-show-raw-insn - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-apple-darwin10.0 %s | llvm-objdump -d -no-show-raw-insn - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-apple-darwin8 %s | llvm-objdump -d -no-show-raw-insn - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=slm %s | llvm-objdump -d -no-show-raw-insn - | FileCheck --check-prefix=SLM %s
+# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu %s | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-apple-darwin10.0 %s | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-apple-darwin8 %s | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=slm %s | llvm-objdump -bare -d -no-show-raw-insn - | FileCheck --check-prefix=SLM %s
# Ensure alignment directives also emit sequences of 15-byte NOPs on processors
# capable of using long NOPs.
Index: test/MC/X86/x86_nop.s
===================================================================
--- test/MC/X86/x86_nop.s
+++ test/MC/X86/x86_nop.s
@@ -1,20 +1,20 @@
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=generic %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i386 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i486 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i586 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=pentium %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=pentium-mmx %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=geode %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i686 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=k6 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=k6-2 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=k6-3 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=winchip-c6 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=winchip2 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=c3 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=c3-2 %s | llvm-objdump -d - | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=core2 %s | llvm-objdump -d - | FileCheck --check-prefix=NOPL %s
-# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=slm %s | llvm-objdump -d - | FileCheck --check-prefix=NOPL %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=generic %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i386 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i486 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i586 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=pentium %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=pentium-mmx %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=geode %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=i686 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=k6 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=k6-2 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=k6-3 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=winchip-c6 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=winchip2 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=c3 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=c3-2 %s | llvm-objdump -bare -d - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=core2 %s | llvm-objdump -bare -d - | FileCheck --check-prefix=NOPL %s
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux -mcpu=slm %s | llvm-objdump -bare -d - | FileCheck --check-prefix=NOPL %s
inc %eax
Index: test/Object/ARM/macho-data-in-code.test
===================================================================
--- test/Object/ARM/macho-data-in-code.test
+++ test/Object/ARM/macho-data-in-code.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -triple thumbv7-apple-iOS -disassemble %p/../Inputs/macho-data-in-code.macho-thumbv7 -macho | FileCheck %s
+RUN: llvm-objdump -triple thumbv7-apple-iOS -bare -d %p/../Inputs/macho-data-in-code.macho-thumbv7 -macho | FileCheck %s
CHECK: 12: 80 bd pop {r7, pc}
Index: test/Object/ARM/objdump-thumb.test
===================================================================
--- test/Object/ARM/objdump-thumb.test
+++ test/Object/ARM/objdump-thumb.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -d -macho -triple=thumbv7-apple-ios \
+RUN: llvm-objdump -bare -d -macho -triple=thumbv7-apple-ios \
RUN: %p/../Inputs/macho-text.thumb | FileCheck %s
CHECK: 0: 00 bf nop
Index: test/Object/Mips/feature.test
===================================================================
--- test/Object/Mips/feature.test
+++ test/Object/Mips/feature.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -disassemble -triple mips64el -mattr +mips64r2 %p/../Inputs/dext-test.elf-mips64r2 \
+RUN: llvm-objdump -bare -d -triple mips64el -mattr +mips64r2 %p/../Inputs/dext-test.elf-mips64r2 \
RUN: | FileCheck %s
CHECK: Disassembly of section .text:
Index: test/Object/X86/macho-text-sections.test
===================================================================
--- test/Object/X86/macho-text-sections.test
+++ test/Object/X86/macho-text-sections.test
@@ -1,3 +1,3 @@
-RUN: llvm-objdump -disassemble %p/../Inputs/macho-text-sections.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump -bare -d %p/../Inputs/macho-text-sections.macho-x86_64 | FileCheck %s
CHECK: Disassembly of section __notext,__notext
Index: test/Object/X86/objdump-disassembly-inline-relocations.test
===================================================================
--- test/Object/X86/objdump-disassembly-inline-relocations.test
+++ test/Object/X86/objdump-disassembly-inline-relocations.test
@@ -1,14 +1,14 @@
-RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.coff-i386 \
+RUN: llvm-objdump -bare -d -r %p/../Inputs/trivial-object-test.coff-i386 \
RUN: | FileCheck %s -check-prefix COFF-i386
-RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.coff-x86-64 \
+RUN: llvm-objdump -bare -d -r %p/../Inputs/trivial-object-test.coff-x86-64 \
RUN: | FileCheck %s -check-prefix COFF-x86-64
-RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.macho-i386 \
+RUN: llvm-objdump -bare -d -r %p/../Inputs/trivial-object-test.macho-i386 \
RUN: | FileCheck %s -check-prefix MACHO-i386
-RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.macho-x86-64 \
+RUN: llvm-objdump -bare -d -r %p/../Inputs/trivial-object-test.macho-x86-64 \
RUN: | FileCheck %s -check-prefix MACHO-x86-64
-RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.elf-i386 \
+RUN: llvm-objdump -bare -d -r %p/../Inputs/trivial-object-test.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF-i386
-RUN: llvm-objdump -d -r %p/../Inputs/trivial-object-test.elf-x86-64 \
+RUN: llvm-objdump -bare -d -r %p/../Inputs/trivial-object-test.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF-x86-64
COFF-i386: file format COFF-i386
Index: test/Object/X86/objdump-label.test
===================================================================
--- test/Object/X86/objdump-label.test
+++ test/Object/X86/objdump-label.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -d %p/../Inputs/trivial-label-test.elf-x86-64 \
+RUN: llvm-objdump -bare -d %p/../Inputs/trivial-label-test.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF-x86-64
ELF-x86-64: file format ELF64-x86-64
Index: test/Object/X86/objdump-trivial-object.test
===================================================================
--- test/Object/X86/objdump-trivial-object.test
+++ test/Object/X86/objdump-trivial-object.test
@@ -1,10 +1,10 @@
-RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.coff-i386 \
+RUN: llvm-objdump -bare -d %p/../Inputs/trivial-object-test.coff-i386 \
RUN: | FileCheck %s -check-prefix COFF-i386
-RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.coff-x86-64 \
+RUN: llvm-objdump -bare -d %p/../Inputs/trivial-object-test.coff-x86-64 \
RUN: | FileCheck %s -check-prefix COFF-x86-64
-RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.elf-i386 \
+RUN: llvm-objdump -bare -d %p/../Inputs/trivial-object-test.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF-i386
-RUN: llvm-objdump -d %p/../Inputs/trivial-object-test.elf-x86-64 \
+RUN: llvm-objdump -bare -d %p/../Inputs/trivial-object-test.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF-x86-64
COFF-i386: file format COFF-i386
Index: test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test
===================================================================
--- test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test
+++ test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv7-apple-darwin -filetype=obj | llvm-objdump -m -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7-apple-darwin -filetype=obj | llvm-objdump -m -bare -d - | FileCheck %s
.thumb
.thumb_func _t
Index: test/tools/llvm-objdump/ARM/macho-mattr-arm.test
===================================================================
--- test/tools/llvm-objdump/ARM/macho-mattr-arm.test
+++ test/tools/llvm-objdump/ARM/macho-mattr-arm.test
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv8-apple-darwin10 -mattr=+fp-armv8 -filetype=obj -o - | llvm-objdump -d -m -mattr=+fp-armv8 - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv8-apple-darwin10 -mattr=+fp-armv8 -filetype=obj -o - | llvm-objdump -bare -d -m -mattr=+fp-armv8 - | FileCheck %s
vcvtt.f64.f16 d3, s1
Index: test/tools/llvm-objdump/ARM/macho-mcpu-arm.test
===================================================================
--- test/tools/llvm-objdump/ARM/macho-mcpu-arm.test
+++ test/tools/llvm-objdump/ARM/macho-mcpu-arm.test
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple thumbv7-apple-darwin -mcpu=cortex-a7 -filetype=obj | llvm-objdump -triple thumbv7-apple-darwin10 -m -d -mcpu=cortex-a7 - | FileCheck %s
+@ RUN: llvm-mc < %s -triple thumbv7-apple-darwin -mcpu=cortex-a7 -filetype=obj | llvm-objdump -triple thumbv7-apple-darwin10 -m -bare -d -mcpu=cortex-a7 - | FileCheck %s
.thumb
.thumb_func _t
Index: test/tools/llvm-objdump/X86/disassembly-show-raw.test
===================================================================
--- test/tools/llvm-objdump/X86/disassembly-show-raw.test
+++ test/tools/llvm-objdump/X86/disassembly-show-raw.test
@@ -1,6 +1,6 @@
-// RUN: llvm-objdump -d %p/Inputs/trivial.obj.elf-i386 \
+// RUN: llvm-objdump -bare -d %p/Inputs/trivial.obj.elf-i386 \
// RUN: | FileCheck %s -check-prefix=WITHRAW
-// RUN: llvm-objdump -d -no-show-raw-insn %p/Inputs/trivial.obj.elf-i386 \
+// RUN: llvm-objdump -bare -d -no-show-raw-insn %p/Inputs/trivial.obj.elf-i386 \
// RUN: | FileCheck %s -check-prefix=NORAW
// Expect to find the raw incoding when run with raw output (default), but not
Index: test/tools/llvm-objdump/X86/out-of-section-sym.test
===================================================================
--- test/tools/llvm-objdump/X86/out-of-section-sym.test
+++ test/tools/llvm-objdump/X86/out-of-section-sym.test
@@ -1,6 +1,6 @@
// Check that llvm-objdump does not attempt to disassemble symbols outside
// of section boundaries.
-// RUN: llvm-objdump -d -t %p/Inputs/out-of-section-sym.elf-i386 | FileCheck %s
+// RUN: llvm-objdump -bare -d -t %p/Inputs/out-of-section-sym.elf-i386 | FileCheck %s
CHECK: Disassembly of section .text:
CHECK-NEXT: _start:
Index: tools/llvm-objdump/llvm-objdump.cpp
===================================================================
--- tools/llvm-objdump/llvm-objdump.cpp
+++ tools/llvm-objdump/llvm-objdump.cpp
@@ -63,6 +63,9 @@
InputFilenames(cl::Positional, cl::desc(""),cl::ZeroOrMore);
static cl::opt
+BareOutput("bare", cl::desc("Do not symbolize disassembly"));
+
+static cl::opt
Disassemble("disassemble",
cl::desc("Display assembler mnemonics for the machine instructions"));
static cl::alias