diff options
5 files changed, 4 insertions, 47 deletions
diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h index 35801c47adc..b2c22336b7b 100644 --- a/llvm/include/llvm/Object/ELFObjectFile.h +++ b/llvm/include/llvm/Object/ELFObjectFile.h @@ -855,7 +855,6 @@ uint8_t ELFObjectFile<ELFT>::getBytesInAddress() const { template <class ELFT> StringRef ELFObjectFile<ELFT>::getFileFormatName() const { - bool IsLittleEndian = ELFT::TargetEndianness == support::little; switch (EF.getHeader()->e_ident[ELF::EI_CLASS]) { case ELF::ELFCLASS32: switch (EF.getHeader()->e_machine) { @@ -864,7 +863,7 @@ StringRef ELFObjectFile<ELFT>::getFileFormatName() const { case ELF::EM_X86_64: return "ELF32-x86-64"; case ELF::EM_ARM: - return (IsLittleEndian ? "ELF32-arm-little" : "ELF32-arm-big"); + return "ELF32-arm"; case ELF::EM_HEXAGON: return "ELF32-hexagon"; case ELF::EM_MIPS: @@ -884,7 +883,7 @@ StringRef ELFObjectFile<ELFT>::getFileFormatName() const { case ELF::EM_X86_64: return "ELF64-x86-64"; case ELF::EM_AARCH64: - return (IsLittleEndian ? "ELF64-aarch64-little" : "ELF64-aarch64-big"); + return "ELF64-aarch64"; case ELF::EM_PPC64: return "ELF64-ppc64"; case ELF::EM_S390: diff --git a/llvm/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll b/llvm/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll index 7c5315a33e3..7c1524e02b5 100644 --- a/llvm/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll +++ b/llvm/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll @@ -1,7 +1,5 @@ ; RUN: llc -O0 -filetype=obj -o %t1 < %s -; RUN: llvm-dwarfdump %t1 | FileCheck %s - -; CHECK: file format ELF64-aarch64-big +; RUN: llvm-dwarfdump %t1 target datalayout = "E-m:e-i64:64-i128:128-n32:64-S128" target triple = "aarch64_be-none--eabi" diff --git a/llvm/test/tools/llvm-dwarfdump/AArch64/little-endian-dump.ll b/llvm/test/tools/llvm-dwarfdump/AArch64/little-endian-dump.ll deleted file mode 100644 index 4367012505a..00000000000 --- a/llvm/test/tools/llvm-dwarfdump/AArch64/little-endian-dump.ll +++ /dev/null @@ -1,18 +0,0 @@ -; RUN: llc -O0 -filetype=obj -o %t1 < %s -; RUN: llvm-dwarfdump %t1 | FileCheck %s - -; CHECK: file format ELF64-aarch64-little - -target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128" -target triple = "aarch64-none--eabi" - -!llvm.dbg.cu = !{!0} -!llvm.module.flags = !{!3, !4} -!llvm.ident = !{!5} - -!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.6.0 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !2, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [/a/empty.c] [DW_LANG_C99] -!1 = metadata !{metadata !"empty.c", metadata !"/a"} -!2 = metadata !{} -!3 = metadata !{i32 2, metadata !"Dwarf Version", i32 4} -!4 = metadata !{i32 2, metadata !"Debug Info Version", i32 1} -!5 = metadata !{metadata !"clang version 3.6.0 "} diff --git a/llvm/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll b/llvm/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll index 8c29104bc5d..b7f962d5f16 100644 --- a/llvm/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll +++ b/llvm/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll @@ -1,7 +1,5 @@ ; RUN: llc -O0 -filetype=obj -o %t1 < %s -; RUN: llvm-dwarfdump %t1 | FileCheck %s - -; CHECK: file format ELF32-arm-big +; RUN: llvm-dwarfdump %t1 target datalayout = "E-m:e-p:32:32-i64:64-v128:64:128-n32-S64" target triple = "armebv8-none--eabi" diff --git a/llvm/test/tools/llvm-dwarfdump/ARM/little-endian-dump.ll b/llvm/test/tools/llvm-dwarfdump/ARM/little-endian-dump.ll deleted file mode 100644 index f7936c17828..00000000000 --- a/llvm/test/tools/llvm-dwarfdump/ARM/little-endian-dump.ll +++ /dev/null @@ -1,20 +0,0 @@ -; RUN: llc -O0 -filetype=obj -o %t1 < %s -; RUN: llvm-dwarfdump %t1 | FileCheck %s - -; CHECK: file format ELF32-arm-little - -target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-n32-S64" -target triple = "armv8-none--eabi" - -!llvm.dbg.cu = !{!0} -!llvm.module.flags = !{!3, !4, !5, !6} -!llvm.ident = !{!7} - -!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.6.0 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !2, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [/a/empty.c] [DW_LANG_C99] -!1 = metadata !{metadata !"empty.c", metadata !"/a"} -!2 = metadata !{} -!3 = metadata !{i32 2, metadata !"Dwarf Version", i32 4} -!4 = metadata !{i32 2, metadata !"Debug Info Version", i32 1} -!5 = metadata !{i32 1, metadata !"wchar_size", i32 4} -!6 = metadata !{i32 1, metadata !"min_enum_size", i32 4} -!7 = metadata !{metadata !"clang version 3.6.0 "} |
