diff --git a/lld/test/ELF/basic-ppc.s b/lld/test/ELF/basic-ppc.s
--- a/lld/test/ELF/basic-ppc.s
+++ b/lld/test/ELF/basic-ppc.s
@@ -9,7 +9,7 @@
  li      3,1
  sc
 
-// CHECK: Format: ELF32-ppc
+// CHECK:      Format: elf32-powerpc
 // CHECK-NEXT: Arch: powerpc
 // CHECK-NEXT: AddressSize: 32bit
 // CHECK-NEXT: LoadName:
diff --git a/lld/test/ELF/basic-ppc64.s b/lld/test/ELF/basic-ppc64.s
--- a/lld/test/ELF/basic-ppc64.s
+++ b/lld/test/ELF/basic-ppc64.s
@@ -14,7 +14,7 @@
   li 3,55
   sc
 
-// CHECK:Format: ELF64-ppc64
+// CHECK:      Format: elf64-powerpc
 // LE-NEXT:    Arch: powerpc64le
 // BE-NEXT:    Arch: powerpc64{{$}}
 // CHECK-NEXT: AddressSize: 64bit
diff --git a/lld/test/ELF/format-binary.test b/lld/test/ELF/format-binary.test
--- a/lld/test/ELF/format-binary.test
+++ b/lld/test/ELF/format-binary.test
@@ -60,10 +60,10 @@
 # RUN: ld.lld -b binary %t.binary -T %t.script -o %t.out
 # RUN: llvm-readobj %t.out -sections -section-data -symbols | FileCheck -check-prefix=X86-64 %s
 
-# X86-64: Format: ELF64-x86-64
+# X86-64: Format: elf64-x86-64
 
 # RUN: echo 'OUTPUT_FORMAT("elf64-x86-64")' > %t.script
 # RUN: ld.lld -b binary %t.binary -T %t.script -o %t.out
 # RUN: llvm-readobj %t.out -sections -section-data -symbols | FileCheck -check-prefix=X86-64-in-quotes %s
 
-# X86-64-in-quotes: Format: ELF64-x86-64
+# X86-64-in-quotes: Format: elf64-x86-64
diff --git a/lld/test/ELF/gnu-hash-table.s b/lld/test/ELF/gnu-hash-table.s
--- a/lld/test/ELF/gnu-hash-table.s
+++ b/lld/test/ELF/gnu-hash-table.s
@@ -68,7 +68,7 @@
 # EMPTY-NEXT:   Values: []
 # EMPTY-NEXT: }
 
-# I386:      Format: ELF32-i386
+# I386:      Format: elf32-i386
 # I386:      Arch: i386
 # I386:      AddressSize: 32bit
 # I386:      Sections [
@@ -127,7 +127,7 @@
 # I386-NEXT:   Values: [0xB8860BA, 0xB887389]
 # I386-NEXT: }
 
-# X86_64:      Format: ELF64-x86-64
+# X86_64:      Format: elf64-x86-64
 # X86_64:      Arch: x86_64
 # X86_64:      AddressSize: 64bit
 # X86_64:      Sections [
@@ -187,7 +187,7 @@
 # X86_64-NEXT:   Values: [0xB8860BA, 0xB887389]
 # X86_64-NEXT: }
 
-# PPC64:      Format: ELF64-ppc64
+# PPC64:      Format: elf64-powerpc
 # PPC64:      Arch: powerpc64
 # PPC64:      AddressSize: 64bit
 # PPC64:      Sections [
diff --git a/lld/test/ELF/linkerscript/linker-script-in-search-path.s b/lld/test/ELF/linkerscript/linker-script-in-search-path.s
--- a/lld/test/ELF/linkerscript/linker-script-in-search-path.s
+++ b/lld/test/ELF/linkerscript/linker-script-in-search-path.s
@@ -7,7 +7,7 @@
 # RUN: echo 'OUTPUT("%t.out")' > %t.dir/script
 # RUN: ld.lld -T%t.dir/script %t.o
 # RUN: llvm-readobj %t.out | FileCheck %s
-# CHECK: Format: ELF64-x86-64
+# CHECK: Format: elf64-x86-64
 
 # If the linker script specified with -T is missing we should emit an error
 # RUN: not ld.lld -Tscript %t.o 2>&1 | FileCheck %s -check-prefix ERROR
diff --git a/lld/test/ELF/lto/lto-start.ll b/lld/test/ELF/lto/lto-start.ll
--- a/lld/test/ELF/lto/lto-start.ll
+++ b/lld/test/ELF/lto/lto-start.ll
@@ -3,7 +3,7 @@
 ; RUN: ld.lld %t.o -o %t2
 ; RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
-; CHECK:      Format: ELF64-x86-64
+; CHECK:      Format: elf64-x86-64
 ; CHECK-NEXT: Arch: x86_64
 ; CHECK-NEXT: AddressSize: 64bit
 
diff --git a/lld/test/ELF/lto/obj-path.ll b/lld/test/ELF/lto/obj-path.ll
--- a/lld/test/ELF/lto/obj-path.ll
+++ b/lld/test/ELF/lto/obj-path.ll
@@ -16,10 +16,10 @@
 ; CHECK-NEXT: T g
 
 ; NM1: T f
-; ELF1: Format: ELF64-x86-64
+; ELF1: Format: elf64-x86-64
 
 ; NM2: T g
-; ELF2: Format: ELF64-x86-64
+; ELF2: Format: elf64-x86-64
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/lld/test/ELF/lto/thinlto-debug-fission.ll b/lld/test/ELF/lto/thinlto-debug-fission.ll
--- a/lld/test/ELF/lto/thinlto-debug-fission.ll
+++ b/lld/test/ELF/lto/thinlto-debug-fission.ll
@@ -7,7 +7,7 @@
 ; RUN: ld.lld --plugin-opt=dwo_dir=%t.dir -shared %t1.o -o /dev/null
 ; RUN: llvm-readobj -h %t.dir/0.dwo | FileCheck %s
 
-; CHECK: Format: ELF64-x86-64
+; CHECK: Format: elf64-x86-64
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/lld/test/ELF/lto/thinlto-obj-path.ll b/lld/test/ELF/lto/thinlto-obj-path.ll
--- a/lld/test/ELF/lto/thinlto-obj-path.ll
+++ b/lld/test/ELF/lto/thinlto-obj-path.ll
@@ -14,7 +14,7 @@
 ; RUN: ld.lld -thinlto-index-only -lto-obj-path=%t4.o -shared %t1.o %t2.o -o /dev/null
 ; RUN: llvm-readobj -h %t4.o | FileCheck %s
 
-; CHECK: Format: ELF64-x86-64
+; CHECK: Format: elf64-x86-64
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/lld/test/ELF/relocatable-empty-archive.s b/lld/test/ELF/relocatable-empty-archive.s
--- a/lld/test/ELF/relocatable-empty-archive.s
+++ b/lld/test/ELF/relocatable-empty-archive.s
@@ -4,7 +4,7 @@
 # RUN: ld.lld -m elf_x86_64 %t.a -o %t -r
 # RUN: llvm-readobj --file-headers %t | FileCheck %s
 
-# CHECK: Format: ELF64-x86-64
+# CHECK: Format: elf64-x86-64
 # CHECK: Arch: x86_64
 # CHECK: AddressSize: 64bit
 # CHECK: Type: Relocatable
diff --git a/lld/test/ELF/relocatable.s b/lld/test/ELF/relocatable.s
--- a/lld/test/ELF/relocatable.s
+++ b/lld/test/ELF/relocatable.s
@@ -75,7 +75,7 @@
 # CHECKTEXT-NEXT: 40: c7 04 25 00 00 00 00 08 00 00 00 movl $8, 0
 # CHECKTEXT-NEXT: 4b: c7 04 25 00 00 00 00 09 00 00 00 movl $9, 0
 
-# CHECKEXE:       Format: ELF64-x86-64
+# CHECKEXE:       Format: elf64-x86-64
 # CHECKEXE-NEXT:  Arch: x86_64
 # CHECKEXE-NEXT:  AddressSize: 64bit
 # CHECKEXE-NEXT:  LoadName:
diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h
--- a/llvm/include/llvm/Object/ELFObjectFile.h
+++ b/llvm/include/llvm/Object/ELFObjectFile.h
@@ -1060,59 +1060,59 @@
   case ELF::ELFCLASS32:
     switch (EF.getHeader()->e_machine) {
     case ELF::EM_386:
-      return "ELF32-i386";
+      return "elf32-i386";
     case ELF::EM_IAMCU:
-      return "ELF32-iamcu";
+      return "elf32-iamcu";
     case ELF::EM_X86_64:
-      return "ELF32-x86-64";
+      return "elf32-x86-64";
     case ELF::EM_ARM:
-      return (IsLittleEndian ? "ELF32-arm-little" : "ELF32-arm-big");
+      return (IsLittleEndian ? "elf32-littlearm" : "elf32-bigarm");
     case ELF::EM_AVR:
-      return "ELF32-avr";
+      return "elf32-avr";
     case ELF::EM_HEXAGON:
-      return "ELF32-hexagon";
+      return "elf32-hexagon";
     case ELF::EM_LANAI:
-      return "ELF32-lanai";
+      return "elf32-lanai";
     case ELF::EM_MIPS:
-      return "ELF32-mips";
+      return "elf32-mips";
     case ELF::EM_MSP430:
-      return "ELF32-msp430";
+      return "elf32-msp430";
     case ELF::EM_PPC:
-      return "ELF32-ppc";
+      return "elf32-powerpc";
     case ELF::EM_RISCV:
-      return "ELF32-riscv";
+      return "elf32-littleriscv";
     case ELF::EM_SPARC:
     case ELF::EM_SPARC32PLUS:
-      return "ELF32-sparc";
+      return "elf32-sparc";
     case ELF::EM_AMDGPU:
-      return "ELF32-amdgpu";
+      return "elf32-amdgpu";
     default:
-      return "ELF32-unknown";
+      return "elf32-unknown";
     }
   case ELF::ELFCLASS64:
     switch (EF.getHeader()->e_machine) {
     case ELF::EM_386:
-      return "ELF64-i386";
+      return "elf64-i386";
     case ELF::EM_X86_64:
-      return "ELF64-x86-64";
+      return "elf64-x86-64";
     case ELF::EM_AARCH64:
-      return (IsLittleEndian ? "ELF64-aarch64-little" : "ELF64-aarch64-big");
+      return (IsLittleEndian ? "elf64-littleaarch64" : "elf64-bigaarch64");
     case ELF::EM_PPC64:
-      return "ELF64-ppc64";
+      return "elf64-powerpc";
     case ELF::EM_RISCV:
-      return "ELF64-riscv";
+      return "elf64-littleriscv";
     case ELF::EM_S390:
-      return "ELF64-s390";
+      return "elf64-s390";
     case ELF::EM_SPARCV9:
-      return "ELF64-sparc";
+      return "elf64-sparc";
     case ELF::EM_MIPS:
-      return "ELF64-mips";
+      return "elf64-mips";
     case ELF::EM_AMDGPU:
-      return "ELF64-amdgpu";
+      return "elf64-amdgpu";
     case ELF::EM_BPF:
-      return "ELF64-BPF";
+      return "elf64-bpf";
     default:
-      return "ELF64-unknown";
+      return "elf64-unknown";
     }
   default:
     // FIXME: Proper error handling.
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -554,7 +554,7 @@
     IsMipsO32ABI = AbiVariant & ELF::EF_MIPS_ABI_O32;
     IsMipsN32ABI = AbiVariant & ELF::EF_MIPS_ABI2;
   }
-  IsMipsN64ABI = Obj.getFileFormatName().equals("ELF64-mips");
+  IsMipsN64ABI = Obj.getFileFormatName().equals("elf64-mips");
 }
 
 // Return the .TOC. section and offset.
diff --git a/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll b/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll
--- a/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll
+++ b/llvm/test/CodeGen/AArch64/arm64-simplest-elf.ll
@@ -11,7 +11,7 @@
 
   ; 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-littleaarch64
 
 ; CHECK-ELF: Disassembly of section .text
 ; CHECK-ELF-LABEL: <foo>:
diff --git a/llvm/test/CodeGen/AMDGPU/elf.ll b/llvm/test/CodeGen/AMDGPU/elf.ll
--- a/llvm/test/CodeGen/AMDGPU/elf.ll
+++ b/llvm/test/CodeGen/AMDGPU/elf.ll
@@ -8,7 +8,7 @@
 ; Test that we don't try to produce a COFF file on windows
 ; RUN: llc < %s -mtriple=amdgcn-pc-mingw -verify-machineinstrs -filetype=obj | llvm-readobj -S --symbols --file-headers - | FileCheck --check-prefix=ELF %s
 
-; ELF: Format: ELF64-amdgpu
+; ELF: Format: elf64-amdgpu
 ; ELF: OS/ABI: SystemV (0x0)
 ; ELF: Machine: EM_AMDGPU (0xE0)
 ; ELF: Name: .AMDGPU.config
diff --git a/llvm/test/CodeGen/AMDGPU/elf.r600.ll b/llvm/test/CodeGen/AMDGPU/elf.r600.ll
--- a/llvm/test/CodeGen/AMDGPU/elf.r600.ll
+++ b/llvm/test/CodeGen/AMDGPU/elf.r600.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=r600 -mcpu=redwood -filetype=obj | llvm-readobj -S - | FileCheck --check-prefix=ELF %s
 ; RUN: llc < %s -march=r600 -mcpu=redwood -o - | FileCheck --check-prefix=CONFIG %s
 
-; ELF: Format: ELF32-amdgpu
+; ELF: Format: elf32-amdgpu
 ; ELF: Name: .AMDGPU.config
 
 ; CONFIG: .section .AMDGPU.config
diff --git a/llvm/test/DebugInfo/AArch64/big-endian-dump.ll b/llvm/test/DebugInfo/AArch64/big-endian-dump.ll
--- a/llvm/test/DebugInfo/AArch64/big-endian-dump.ll
+++ b/llvm/test/DebugInfo/AArch64/big-endian-dump.ll
@@ -1,6 +1,6 @@
 ; RUN: llc -O0 -filetype=obj -mtriple=aarch64_be-none-linux < %s | llvm-dwarfdump - | FileCheck %s
 
-; CHECK: file format ELF64-aarch64-big
+; CHECK: file format elf64-bigaarch64
 
 target datalayout = "E-m:e-i64:64-i128:128-n32:64-S128"
 
diff --git a/llvm/test/DebugInfo/AArch64/little-endian-dump.ll b/llvm/test/DebugInfo/AArch64/little-endian-dump.ll
--- a/llvm/test/DebugInfo/AArch64/little-endian-dump.ll
+++ b/llvm/test/DebugInfo/AArch64/little-endian-dump.ll
@@ -1,6 +1,6 @@
 ; RUN: llc -O0 -filetype=obj -mtriple=aarch64-none-linux < %s | llvm-dwarfdump - | FileCheck %s
 
-; CHECK: file format ELF64-aarch64-little
+; CHECK: file format elf64-littleaarch64
 
 target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128"
 
diff --git a/llvm/test/DebugInfo/ARM/big-endian-dump.ll b/llvm/test/DebugInfo/ARM/big-endian-dump.ll
--- a/llvm/test/DebugInfo/ARM/big-endian-dump.ll
+++ b/llvm/test/DebugInfo/ARM/big-endian-dump.ll
@@ -1,6 +1,6 @@
 ; RUN: llc -O0 -filetype=obj -mtriple=armeb-none-linux < %s | llvm-dwarfdump - | FileCheck %s
 
-; CHECK: file format ELF32-arm-big
+; CHECK: file format elf32-bigarm
 
 target datalayout = "E-m:e-p:32:32-i64:64-v128:64:128-n32-S64"
 
diff --git a/llvm/test/DebugInfo/ARM/little-endian-dump.ll b/llvm/test/DebugInfo/ARM/little-endian-dump.ll
--- a/llvm/test/DebugInfo/ARM/little-endian-dump.ll
+++ b/llvm/test/DebugInfo/ARM/little-endian-dump.ll
@@ -1,6 +1,6 @@
 ; RUN: llc -O0 -filetype=obj -mtriple=arm-none-linux < %s | llvm-dwarfdump - | FileCheck %s
 
-; CHECK: file format ELF32-arm-little
+; CHECK: file format elf32-littlearm
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-n32-S64"
 
diff --git a/llvm/test/DebugInfo/Sparc/gnu-window-save.ll b/llvm/test/DebugInfo/Sparc/gnu-window-save.ll
--- a/llvm/test/DebugInfo/Sparc/gnu-window-save.ll
+++ b/llvm/test/DebugInfo/Sparc/gnu-window-save.ll
@@ -4,7 +4,7 @@
 ; Check for DW_CFA_GNU_Window_save in debug_frame. Also, Ensure that relocations
 ; are performed correctly in debug_info.
 
-; SPARC64: file format ELF64-sparc
+; SPARC64: file format elf64-sparc
 
 ; SPARC64: .debug_info
 ; SPARC64:      DW_TAG_compile_unit
@@ -20,7 +20,7 @@
 ; SPARC64-NEXT: DW_CFA_register
 
 
-; SPARC32: file format ELF32-sparc
+; SPARC32: file format elf32-sparc
 
 ; SPARC32: .debug_info
 ; SPARC32:      DW_TAG_compile_unit
diff --git a/llvm/test/MC/ARM/dwarf-asm-no-code.s b/llvm/test/MC/ARM/dwarf-asm-no-code.s
--- a/llvm/test/MC/ARM/dwarf-asm-no-code.s
+++ b/llvm/test/MC/ARM/dwarf-asm-no-code.s
@@ -8,7 +8,7 @@
 a:
 .long 42
 
-// DWARF: ELF32-arm-little
+// DWARF: elf32-littlearm
 // DWARF-NOT: contents:
 // DWARF: .debug_line contents:
 
diff --git a/llvm/test/MC/AVR/dwarf-asm-no-code.s b/llvm/test/MC/AVR/dwarf-asm-no-code.s
--- a/llvm/test/MC/AVR/dwarf-asm-no-code.s
+++ b/llvm/test/MC/AVR/dwarf-asm-no-code.s
@@ -8,7 +8,7 @@
 a:
 .long 42
 
-// DWARF: ELF32-avr
+// DWARF: elf32-avr
 // DWARF-NOT: contents:
 // DWARF: .debug_line contents:
 
diff --git a/llvm/test/MC/AsmParser/non-english-characters.s b/llvm/test/MC/AsmParser/non-english-characters.s
--- a/llvm/test/MC/AsmParser/non-english-characters.s
+++ b/llvm/test/MC/AsmParser/non-english-characters.s
@@ -1,7 +1,7 @@
 # RUN: llvm-mc -triple i386-linux-gnu -filetype=obj -o %t \
 # RUN:   %S/Inputs/non-english-characters-comments.s
 # RUN: llvm-readobj %t | FileCheck %s
-# CHECK: Format: ELF32-i386
+# CHECK: Format: elf32-i386
 
 # RUN: not llvm-mc -triple i386-linux-gnu -filetype=obj -o %t \
 # RUN:   %S/Inputs/non-english-characters-section-name.s 2>&1 | \
diff --git a/llvm/test/MC/ELF/empty.s b/llvm/test/MC/ELF/empty.s
--- a/llvm/test/MC/ELF/empty.s
+++ b/llvm/test/MC/ELF/empty.s
@@ -5,8 +5,8 @@
 // Check that we can create ELF files for darwin/windows, even though
 // it is not the default file format.
 
-// DARWIN:       Format: ELF64-x86-64
-// WINDOWS:      Format: ELF64-x86-64
+// DARWIN:       Format: elf64-x86-64
+// WINDOWS:      Format: elf64-x86-64
 // DARWIN-NEXT:  Arch: x86_64
 // WINDOWS-NEXT: Arch: x86_64
 
diff --git a/llvm/test/MC/ELF/relocation-386.s b/llvm/test/MC/ELF/relocation-386.s
--- a/llvm/test/MC/ELF/relocation-386.s
+++ b/llvm/test/MC/ELF/relocation-386.s
@@ -4,8 +4,8 @@
 // Test that we produce the correct relocation types and that the relocations
 // correctly point to the section or the symbol.
 
-// IAMCU: Format: ELF32-iamcu
-// I386: Format: ELF32-i386
+// IAMCU: Format: elf32-iamcu
+// I386: Format: elf32-i386
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section {{.*}} .rel.text {
 // CHECK-NEXT:     0x2          R_386_GOTOFF     .Lfoo 0x0
diff --git a/llvm/test/MC/Hexagon/basic.ll b/llvm/test/MC/Hexagon/basic.ll
--- a/llvm/test/MC/Hexagon/basic.ll
+++ b/llvm/test/MC/Hexagon/basic.ll
@@ -1,7 +1,7 @@
 ;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \
 ;; RUN: | llvm-readobj -h -r | FileCheck -check-prefix=OBJ %s
 
-; OBJ: Format: ELF32-hexagon
+; OBJ: Format: elf32-hexagon
 ; OBJ: Arch: hexagon
 ; OBJ: AddressSize: 32bit
 ; OBJ: Machine: EM_HEXAGON (0xA4)
diff --git a/llvm/test/MC/RISCV/elf-header.s b/llvm/test/MC/RISCV/elf-header.s
--- a/llvm/test/MC/RISCV/elf-header.s
+++ b/llvm/test/MC/RISCV/elf-header.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc %s -filetype=obj -triple=riscv64 | llvm-readobj -h \
 # RUN:     | FileCheck -check-prefix=RV64 %s
 
-# RV32: Format: ELF32-riscv
+# RV32: Format: elf32-littleriscv
 # RV32: Arch: riscv32
 # RV32: AddressSize: 32bit
 # RV32: ElfHeader {
@@ -22,7 +22,7 @@
 # RV32:   ]
 # RV32: }
 
-# RV64: Format: ELF64-riscv
+# RV64: Format: elf64-littleriscv
 # RV64: Arch: riscv64
 # RV64: AddressSize: 64bit
 # RV64: ElfHeader {
diff --git a/llvm/test/MC/Sparc/sparc-relocations.s b/llvm/test/MC/Sparc/sparc-relocations.s
--- a/llvm/test/MC/Sparc/sparc-relocations.s
+++ b/llvm/test/MC/Sparc/sparc-relocations.s
@@ -1,7 +1,7 @@
 ! RUN: llvm-mc %s -arch=sparcv9 -show-encoding | FileCheck %s
 ! RUN: llvm-mc %s -arch=sparcv9 -filetype=obj | llvm-readobj -r | FileCheck %s --check-prefix=CHECK-OBJ
 
-        ! CHECK-OBJ: Format: ELF64-sparc
+        ! CHECK-OBJ: Format: elf64-sparc
         ! CHECK-OBJ: Relocations [
         ! CHECK-OBJ: 0x{{[0-9,A-F]+}} R_SPARC_WDISP30 foo
         ! CHECK-OBJ: 0x{{[0-9,A-F]+}} R_SPARC_LO10 sym
diff --git a/llvm/test/Object/AMDGPU/elf32-unknown.yaml b/llvm/test/Object/AMDGPU/elf32-unknown.yaml
--- a/llvm/test/Object/AMDGPU/elf32-unknown.yaml
+++ b/llvm/test/Object/AMDGPU/elf32-unknown.yaml
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: llvm-readobj -S --file-headers %t.o | FileCheck %s
 
-# CHECK: Format: ELF32-amdgpu
+# CHECK: Format: elf32-amdgpu
 
 --- !ELF
 FileHeader:
diff --git a/llvm/test/Object/AMDGPU/elf64-unknown.yaml b/llvm/test/Object/AMDGPU/elf64-unknown.yaml
--- a/llvm/test/Object/AMDGPU/elf64-unknown.yaml
+++ b/llvm/test/Object/AMDGPU/elf64-unknown.yaml
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: llvm-readobj -S --file-headers %t.o | FileCheck %s
 
-# CHECK: Format: ELF64-amdgpu
+# CHECK: Format: elf64-amdgpu
 
 --- !ELF
 FileHeader:
diff --git a/llvm/test/Object/invalid-alignment.test b/llvm/test/Object/invalid-alignment.test
--- a/llvm/test/Object/invalid-alignment.test
+++ b/llvm/test/Object/invalid-alignment.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: llvm-readobj -r %t.o 2>&1 | FileCheck %s
 
-# CHECK:      Format: ELF64-x86-64
+# CHECK:      Format: elf64-x86-64
 # CHECK-NEXT: Arch: x86_64
 # CHECK-NEXT: AddressSize: 64bit
 # CHECK-NEXT: LoadName:
diff --git a/llvm/test/ThinLTO/X86/empty-module.ll b/llvm/test/ThinLTO/X86/empty-module.ll
--- a/llvm/test/ThinLTO/X86/empty-module.ll
+++ b/llvm/test/ThinLTO/X86/empty-module.ll
@@ -5,7 +5,7 @@
 ; RUN: llvm-readobj -h %t2.0 | FileCheck %s
 ; RUN: llvm-nm %t2.0 2>&1 | count 0
 
-; CHECK: Format: ELF64-x86-64
+; CHECK: Format: elf64-x86-64
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/tools/gold/X86/thinlto.ll b/llvm/test/tools/gold/X86/thinlto.ll
--- a/llvm/test/tools/gold/X86/thinlto.ll
+++ b/llvm/test/tools/gold/X86/thinlto.ll
@@ -87,7 +87,7 @@
 
 ; NM: T f
 ; NM2: T {{f|g}}
-; FORMAT: Format: ELF64-x86-64
+; FORMAT: Format: elf64-x86-64
 
 ; The backend index for this module contains summaries from itself and
 ; Inputs/thinlto.ll, as it imports from the latter.
diff --git a/llvm/test/tools/llvm-objcopy/ELF/binary-output-target.test b/llvm/test/tools/llvm-objcopy/ELF/binary-output-target.test
--- a/llvm/test/tools/llvm-objcopy/ELF/binary-output-target.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/binary-output-target.test
@@ -31,16 +31,16 @@
 # RUN: llvm-readobj --file-headers %t.sparcel.o | FileCheck %s --check-prefixes=CHECK,LE,SPARCEL,32
 
 # CHECK: Format:
-# 32-SAME:      ELF32-
-# 64-SAME:      ELF64-
-# AARCH64-SAME: aarch64-little
-# ARM-SAME:     arm-little
+# 32-SAME:      elf32-
+# 64-SAME:      elf64-
+# AARCH64-SAME: littleaarch64
+# ARM-SAME:     littlearm
 # I386-SAME:    i386
 # MIPS-SAME:    mips{{$}}
 # RISCV32-SAME: riscv{{$}}
 # RISCV64-SAME: riscv{{$}}
-# PPC-SAME:     ppc{{$}}
-# PPC64le-SAME: ppc64
+# PPC-SAME:     powerpc{{$}}
+# PPC64le-SAME: powerpc{{$}}
 # SPARC-SAME:   sparc
 # SPARCEL-SAME: sparc
 # X86-64-SAME:  x86-64
diff --git a/llvm/test/tools/llvm-objcopy/ELF/cross-arch-headers.test b/llvm/test/tools/llvm-objcopy/ELF/cross-arch-headers.test
--- a/llvm/test/tools/llvm-objcopy/ELF/cross-arch-headers.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/cross-arch-headers.test
@@ -133,16 +133,16 @@
     Binding:  STB_GLOBAL
 
 # CHECK: Format:
-# 32-SAME:      ELF32-
-# 64-SAME:      ELF64-
+# 32-SAME:      elf32-
+# 64-SAME:      elf64-
 # I386-SAME:    i386
 # IAMCU-SAME:   iamcu
 # AARCH-SAME:   aarch64
-# ARM-SAME:     arm-little
+# ARM-SAME:     littlearm
 # MIPS-SAME:    mips
-# PPC-SAME:     ppc{{$}}
-# PPC64BE-SAME: ppc64{{$}}
-# PPC64LE-SAME: ppc64{{$}}
+# PPC-SAME:     powerpc{{$}}
+# PPC64BE-SAME: powerpc{{$}}
+# PPC64LE-SAME: powerpc{{$}}
 # RISCV32-SAME: riscv{{$}}
 # RISCV64-SAME: riscv{{$}}
 # SPARC-SAME:   sparc
diff --git a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test
--- a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test
@@ -5,7 +5,7 @@
 RUN: llvm-readobj --symbols %t2 | grep "Symbol {" | wc -l | FileCheck --check-prefix=SYMS %s
 RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=SYM_SEC_IDS
 
-EHDR:      Format: ELF64-x86-64
+EHDR:      Format: elf64-x86-64
 EHDR-NEXT: Arch: x86_64
 EHDR-NEXT: AddressSize: 64bit
 EHDR-NEXT: LoadName:
diff --git a/llvm/test/tools/llvm-readobj/ELF/all.test b/llvm/test/tools/llvm-readobj/ELF/all.test
--- a/llvm/test/tools/llvm-readobj/ELF/all.test
+++ b/llvm/test/tools/llvm-readobj/ELF/all.test
@@ -2,7 +2,7 @@
 # RUN: llvm-readobj -a %t.o | FileCheck %s --check-prefix LLVM-ALL
 # RUN: llvm-readobj --all %t.o | FileCheck %s --check-prefix LLVM-ALL
 
-# LLVM-ALL: Format: ELF32-i386
+# LLVM-ALL: Format: elf32-i386
 # LLVM-ALL: Arch: i386
 # LLVM-ALL: AddressSize: 32bit
 # LLVM-ALL: LoadName:
diff --git a/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-definitions.test b/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-definitions.test
--- a/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-definitions.test
+++ b/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-definitions.test
@@ -1,6 +1,6 @@
 RUN: llvm-readobj --file-headers -l -S --symbols %p/Inputs/trivial.obj.elf-amdhsa-gfx803 | FileCheck %s
 
-CHECK: Format: ELF64-amdgpu
+CHECK: Format: elf64-amdgpu
 CHECK: Arch: unknown
 CHECK: ElfHeader {
 CHECK:   Ident {
diff --git a/llvm/test/tools/llvm-readobj/ELF/basic.test b/llvm/test/tools/llvm-readobj/ELF/basic.test
--- a/llvm/test/tools/llvm-readobj/ELF/basic.test
+++ b/llvm/test/tools/llvm-readobj/ELF/basic.test
@@ -5,7 +5,7 @@
 # RUN: llvm-readelf %t.trivial.obj.elf-x86-64 | FileCheck --check-prefix=NO-OUTPUT --allow-empty %s
 
 # HEADER: File: {{.*}}trivial.obj.elf-x86-64
-# HEADER: Format: ELF64-x86-64
+# HEADER: Format: elf64-x86-64
 # HEADER: Arch: x86_64
 # HEADER: AddressSize: 64bit
 
diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-no-pt-dynamic.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-no-pt-dynamic.test
--- a/llvm/test/tools/llvm-readobj/ELF/dynamic-no-pt-dynamic.test
+++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-no-pt-dynamic.test
@@ -5,7 +5,7 @@
 # RUN: llvm-readelf --dynamic-table %t.no-phdr | FileCheck %s --check-prefix=GNU
 
 # LLVM:      File: {{.*}}.no-phdr
-# LLVM-NEXT: Format: ELF64-x86-64
+# LLVM-NEXT: Format: elf64-x86-64
 # LLVM-NEXT: Arch: x86_64
 # LLVM-NEXT: AddressSize: 64bit
 # LLVM-NEXT: LoadName:{{ *}}
diff --git a/llvm/test/tools/llvm-readobj/ELF/file-headers.test b/llvm/test/tools/llvm-readobj/ELF/file-headers.test
--- a/llvm/test/tools/llvm-readobj/ELF/file-headers.test
+++ b/llvm/test/tools/llvm-readobj/ELF/file-headers.test
@@ -4,7 +4,7 @@
 # RUN: llvm-readobj --file-headers %t.i386 | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.i386 --check-prefix I386
 
 #      I386:File: [[FILE]]
-# I386-NEXT:Format: ELF32-i386
+# I386-NEXT:Format: elf32-i386
 # I386-NEXT:Arch: i386
 # I386-NEXT:AddressSize: 32bit
 # I386-NEXT:LoadName: <Not found>
@@ -52,7 +52,7 @@
 # RUN:  | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.x86-64 --check-prefix X86-64
 
 #      X86-64:File: [[FILE]]
-# X86-64-NEXT:Format: ELF64-x86-64
+# X86-64-NEXT:Format: elf64-x86-64
 # X86-64-NEXT:Arch: x86_64
 # X86-64-NEXT:AddressSize: 64bit
 # X86-64-NEXT:LoadName: <Not found>
@@ -107,7 +107,7 @@
   Machine: EM_LANAI
 
 #      LANAI:File: [[FILE]]
-# LANAI-NEXT:Format: ELF32-lanai
+# LANAI-NEXT:Format: elf32-lanai
 # LANAI-NEXT:Arch: lanai
 # LANAI-NEXT:AddressSize: 32bit
 # LANAI-NEXT:LoadName: <Not found>
diff --git a/llvm/test/tools/llvm-readobj/ELF/loadname.test b/llvm/test/tools/llvm-readobj/ELF/loadname.test
--- a/llvm/test/tools/llvm-readobj/ELF/loadname.test
+++ b/llvm/test/tools/llvm-readobj/ELF/loadname.test
@@ -4,7 +4,7 @@
 # RUN: llvm-readobj %t.o | FileCheck %s --check-prefix LLVM
 # RUN: llvm-readelf --dynamic-table %t.o | FileCheck %s --check-prefix GNU
 
-# LLVM:      Format: ELF64-x86-64
+# LLVM:      Format: elf64-x86-64
 # LLVM-NEXT: Arch: x86_64
 # LLVM-NEXT: AddressSize: 64bit
 # LLVM-NEXT: LoadName: test.so
diff --git a/llvm/test/tools/llvm-readobj/ELF/no-action.test b/llvm/test/tools/llvm-readobj/ELF/no-action.test
--- a/llvm/test/tools/llvm-readobj/ELF/no-action.test
+++ b/llvm/test/tools/llvm-readobj/ELF/no-action.test
@@ -7,7 +7,7 @@
 # RUN: llvm-readelf %t.exe | FileCheck %s -DFILE=%t.exe --check-prefix GNU --allow-empty
 
 # LLVM: File: [[FILE]]
-# LLVM: Format: ELF64-x86-64
+# LLVM: Format: elf64-x86-64
 # LLVM: Arch: x86_64
 # LLVM: AddressSize: 64bit
 # LLVM: LoadName: <Not found>{{$}}
diff --git a/llvm/test/tools/llvm-readobj/ELF/ppc64-glink.test b/llvm/test/tools/llvm-readobj/ELF/ppc64-glink.test
--- a/llvm/test/tools/llvm-readobj/ELF/ppc64-glink.test
+++ b/llvm/test/tools/llvm-readobj/ELF/ppc64-glink.test
@@ -2,7 +2,7 @@
 
 RUN: llvm-readobj --dynamic-table %p/Inputs/ppc64.exe | FileCheck %s
 
-CHECK: Format: ELF64-ppc64
+CHECK: Format: elf64-powerpc
 CHECK: Arch: powerpc64le
 CHECK: AddressSize: 64bit
 
diff --git a/llvm/test/tools/llvm-readobj/ELF/program-headers.test b/llvm/test/tools/llvm-readobj/ELF/program-headers.test
--- a/llvm/test/tools/llvm-readobj/ELF/program-headers.test
+++ b/llvm/test/tools/llvm-readobj/ELF/program-headers.test
@@ -79,7 +79,7 @@
 # RUN: llvm-readobj -l %p/../../../Object/Inputs/program-headers.mips \
 # RUN:     | FileCheck %s -check-prefix ELF-MIPS
 
-# ELF-MIPS:      Format: ELF32-mips
+# ELF-MIPS:      Format: elf32-mips
 # ELF-MIPS-NEXT: Arch: mips
 # ELF-MIPS-NEXT: AddressSize: 32bit
 # ELF-MIPS-NEXT: LoadName:
@@ -126,7 +126,7 @@
 # RUN: llvm-readobj -l %p/../../../Object/Inputs/program-headers.mips64 \
 # RUN:     | FileCheck %s -check-prefix ELF-MIPS64
 
-# ELF-MIPS64:      Format: ELF64-mips
+# ELF-MIPS64:      Format: elf64-mips
 # ELF-MIPS64-NEXT: Arch: mips64
 # ELF-MIPS64-NEXT: AddressSize: 64bit
 # ELF-MIPS64-NEXT: LoadName:
diff --git a/llvm/test/tools/llvm-readobj/archive.test b/llvm/test/tools/llvm-readobj/archive.test
--- a/llvm/test/tools/llvm-readobj/archive.test
+++ b/llvm/test/tools/llvm-readobj/archive.test
@@ -13,7 +13,7 @@
 
 # LLVM: {{^$}}
 # LLVM-NEXT: File: [[ARFILE]](trivial.obj.elf-x86-64)
-# LLVM: Format: ELF64-x86-64
+# LLVM: Format: elf64-x86-64
 # LLVM: ElfHeader {
 # LLVM:   Machine: EM_X86_64
 # LLVM: Sections [
@@ -33,7 +33,7 @@
 
 # LLVM-EMPTY:
 # LLVM-NEXT: File: [[ARFILE]](trivial.obj.elf-i386)
-# LLVM: Format: ELF32-i386
+# LLVM: Format: elf32-i386
 # LLVM: ElfHeader {
 # LLVM:   Machine: EM_386
 # LLVM: Sections [
diff --git a/llvm/test/tools/llvm-readobj/thin-archive.test b/llvm/test/tools/llvm-readobj/thin-archive.test
--- a/llvm/test/tools/llvm-readobj/thin-archive.test
+++ b/llvm/test/tools/llvm-readobj/thin-archive.test
@@ -11,7 +11,7 @@
 # RUN: llvm-readelf --all %t.a | FileCheck %s --check-prefixes=GNU,COFF
 
 # LLVM: File: {{.*}}1.o
-# LLVM: Format: ELF64-x86-64
+# LLVM: Format: elf64-x86-64
 # LLVM: ElfHeader {
 # LLVM:   SectionHeaderCount: 3
 # LLVM: Sections [
@@ -23,7 +23,7 @@
 # GNU: Section Headers:
 
 # LLVM: File: {{.*}}2.o
-# LLVM: Format: ELF32-i386
+# LLVM: Format: elf32-i386
 # LLVM: ElfHeader {
 # LLVM:   SectionHeaderCount: 4
 # LLVM: Sections [
@@ -48,9 +48,9 @@
 # RUN: llvm-readobj --file-headers %t.a | FileCheck %s --check-prefix=RESIZED
 
 # RESIZED: File: {{.*}}1.o
-# RESIZED: Format: ELF64-x86-64
+# RESIZED: Format: elf64-x86-64
 # RESIZED: File: {{.*}}2.o
-# RESIZED: Format: ELF64-x86-64
+# RESIZED: Format: elf64-x86-64
 
 # Remove the second member and show that the first can still be dumped, but that the last isn't.
 # RUN: rm %t/2.o
@@ -58,7 +58,7 @@
 # RUN: FileCheck %s --check-prefix=ERR --input-file=%t.err
 
 # MISSING:     File: {{.*}}1.o
-# MISSING:     Format: ELF64-x86-64
+# MISSING:     Format: elf64-x86-64
 # MISSING-NOT: File: {{.*}}3.o
 # ERR: error: '{{.*}}.a': '{{.*}}2.o': {{[Nn]}}o such file or directory