From 60a8a504f16dbbc5f2a6887ecb668ef4cb834949 Mon Sep 17 00:00:00 2001 From: Jordan Rupprecht Date: Tue, 11 Feb 2020 11:55:40 -0800 Subject: [PATCH] [llvm-objdump] Print file format in lowercase to match GNU output. Summary: GNU objdump prints the file format in lowercase, e.g. `elf64-x86-64`. llvm-objdump prints `ELF64-x86-64` right now, even though piping that into llvm-objcopy refuses that as a valid arch to use. As an example of a problem this causes, see: https://github.com/ClangBuiltLinux/linux/issues/779 Reviewers: MaskRay, jhenderson, alexshap Reviewed By: MaskRay Subscribers: tpimh, sbc100, grimar, jvesely, nhaehnle, kerbowa, cfe-commits, llvm-commits Tags: #clang, #llvm Differential Revision: https://reviews.llvm.org/D74433 --- clang/test/Modules/pch_container.m | 6 +++--- lld/test/COFF/savetemps.ll | 2 +- llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll | 2 +- llvm/test/CodeGen/ARM/Windows/trivial-gnu-object.ll | 2 +- llvm/test/CodeGen/BPF/reloc-btf-2.ll | 2 +- llvm/test/CodeGen/BPF/reloc-btf.ll | 2 +- llvm/test/CodeGen/BPF/reloc.ll | 2 +- llvm/test/Object/AMDGPU/objdump.s | 2 +- .../X86/objdump-disassembly-inline-relocations.test | 12 ++++++------ llvm/test/Object/X86/objdump-label.test | 2 +- llvm/test/Object/X86/objdump-trivial-object.test | 8 ++++---- llvm/test/Object/dynamic-reloc.test | 2 +- llvm/test/Object/objdump-symbol-table.test | 2 +- .../tools/llvm-objdump/X86/disassemble-section-name.s | 2 +- .../X86/elf-disassemble-symbol-labels-exec.test | 2 +- .../tools/llvm-objdump/X86/elf-dynamic-relocs.test | 2 +- llvm/test/tools/llvm-objdump/X86/output-ordering.test | 2 +- .../llvm-objdump/X86/warn-missing-disasm-func.test | 4 ++-- llvm/test/tools/llvm-objdump/all-headers.test | 6 +++--- llvm/test/tools/llvm-objdump/archive-headers.test | 18 +++++++++--------- llvm/test/tools/llvm-objdump/file-headers-coff.test | 2 +- llvm/test/tools/llvm-objdump/file-headers-elf.test | 4 ++-- llvm/test/tools/llvm-objdump/non-archive-object.test | 2 +- .../tools/llvm-objdump/relocations-in-nonreloc.test | 2 +- llvm/tools/llvm-objdump/llvm-objdump.cpp | 2 +- 25 files changed, 47 insertions(+), 47 deletions(-) diff --git a/clang/test/Modules/pch_container.m b/clang/test/Modules/pch_container.m index 77cd5f3..ed13baf 100644 --- a/clang/test/Modules/pch_container.m +++ b/clang/test/Modules/pch_container.m @@ -8,11 +8,11 @@ // RUN: llvm-objdump --section-headers %t-MachO/DependsOnModule.pcm %t-ELF/DependsOnModule.pcm %t-COFF/DependsOnModule.pcm | FileCheck %s -// CHECK: file format Mach-O 64-bit x86-64 +// CHECK: file format mach-o 64-bit x86-64 // CHECK: __clangast {{[0-9a-f]+}} {{[0-9a-f]+}} DATA -// CHECK: file format ELF64-x86-64 +// CHECK: file format elf64-x86-64 // CHECK: __clangast {{[0-9a-f]+}} {{[0-9a-f]+}} DATA -// CHECK: file format COFF-x86-64 +// CHECK: file format coff-x86-64 // CHECK: clangast {{[0-9a-f]+}} {{[0-9a-f]+}} // RUN: not llvm-objdump --section-headers %t-raw/DependsOnModule.pcm diff --git a/lld/test/COFF/savetemps.ll b/lld/test/COFF/savetemps.ll index e755ba9..46a4958 100644 --- a/lld/test/COFF/savetemps.ll +++ b/lld/test/COFF/savetemps.ll @@ -19,7 +19,7 @@ ; RUN: FileCheck --check-prefix=CHECK-OBJDUMP %s ; CHECK: define i32 @main() -; CHECK-OBJDUMP: file format COFF +; CHECK-OBJDUMP: file format coff target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" diff --git a/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll b/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll index 1254365..58691f8 100644 --- a/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll +++ b/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll @@ -11,7 +11,7 @@ define void @foo() nounwind { ; Similarly make sure ELF output works and is vaguely sane: aarch64 target ; machine with correct section & symbol names. -; CHECK-ELF: file format ELF64-aarch64 +; CHECK-ELF: file format elf64-aarch64 ; CHECK-ELF: Disassembly of section .text ; CHECK-ELF-LABEL: foo: diff --git a/llvm/test/CodeGen/ARM/Windows/trivial-gnu-object.ll b/llvm/test/CodeGen/ARM/Windows/trivial-gnu-object.ll index a242f39..2d55f21 100644 --- a/llvm/test/CodeGen/ARM/Windows/trivial-gnu-object.ll +++ b/llvm/test/CodeGen/ARM/Windows/trivial-gnu-object.ll @@ -2,7 +2,7 @@ ; RUN: llc -mtriple=thumbv7-windows-gnu -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s define void @foo() { -; CHECK: file format COFF-ARM +; CHECK: file format coff-arm ; CHECK-LABEL: foo: ; CHECK: bx lr diff --git a/llvm/test/CodeGen/BPF/reloc-btf-2.ll b/llvm/test/CodeGen/BPF/reloc-btf-2.ll index 2afeb24..68f0008 100644 --- a/llvm/test/CodeGen/BPF/reloc-btf-2.ll +++ b/llvm/test/CodeGen/BPF/reloc-btf-2.ll @@ -21,7 +21,7 @@ define dso_local i32 @test() local_unnamed_addr #0 !dbg !14 { ret i32 %3, !dbg !24 } -; CHECK-RELOC: file format ELF64-BPF +; CHECK-RELOC: file format elf64-bpf ; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF]: ; CHECK-RELOC: R_BPF_NONE .bss ; CHECK-RELOC: R_BPF_NONE g diff --git a/llvm/test/CodeGen/BPF/reloc-btf.ll b/llvm/test/CodeGen/BPF/reloc-btf.ll index 484ef33..c6f34fb 100644 --- a/llvm/test/CodeGen/BPF/reloc-btf.ll +++ b/llvm/test/CodeGen/BPF/reloc-btf.ll @@ -6,7 +6,7 @@ entry: ret i32 0, !dbg !11 } -; CHECK-RELOC: file format ELF64-BPF +; CHECK-RELOC: file format elf64-bpf ; CHECK-RELOC: RELOCATION RECORDS FOR [.debug_info]: ; CHECK-RELOC: R_BPF_64_32 .debug_abbrev ; CHECK-RELOC: R_BPF_64_64 .text diff --git a/llvm/test/CodeGen/BPF/reloc.ll b/llvm/test/CodeGen/BPF/reloc.ll index d39131a..e00dfdb 100644 --- a/llvm/test/CodeGen/BPF/reloc.ll +++ b/llvm/test/CodeGen/BPF/reloc.ll @@ -32,7 +32,7 @@ define i32 @bpf_prog1(%struct.bpf_context* nocapture %ctx) #0 section "events/ne ;