From 329e09f08c27ff5226e71b27a37eaa27bb5de9ec Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Wed, 24 Sep 2014 20:07:41 +0000 Subject: [PATCH] Report endianness in output of {dwarf, obj}dump For biendian targets like ARM and AArch64, it is useful to have the output of the llvm-dwarfdump and llvm-objdump report the endianness used when the object files were generated. Patch by Charlie Turner. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218408 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/ELFObjectFile.h | 5 +++-- .../llvm-dwarfdump/AArch64/big-endian-dump.ll | 4 +++- .../AArch64/little-endian-dump.ll | 18 +++++++++++++++++ .../llvm-dwarfdump/ARM/big-endian-dump.ll | 4 +++- .../llvm-dwarfdump/ARM/little-endian-dump.ll | 20 +++++++++++++++++++ 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 test/tools/llvm-dwarfdump/AArch64/little-endian-dump.ll create mode 100644 test/tools/llvm-dwarfdump/ARM/little-endian-dump.ll diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h index ed3c08f6f32..2c9c07a48d2 100644 --- a/include/llvm/Object/ELFObjectFile.h +++ b/include/llvm/Object/ELFObjectFile.h @@ -855,6 +855,7 @@ uint8_t ELFObjectFile::getBytesInAddress() const { template StringRef ELFObjectFile::getFileFormatName() const { + bool IsLittleEndian = ELFT::TargetEndianness == support::little; switch (EF.getHeader()->e_ident[ELF::EI_CLASS]) { case ELF::ELFCLASS32: switch (EF.getHeader()->e_machine) { @@ -863,7 +864,7 @@ StringRef ELFObjectFile::getFileFormatName() const { case ELF::EM_X86_64: return "ELF32-x86-64"; case ELF::EM_ARM: - return "ELF32-arm"; + return (IsLittleEndian ? "ELF32-arm-little" : "ELF32-arm-big"); case ELF::EM_HEXAGON: return "ELF32-hexagon"; case ELF::EM_MIPS: @@ -883,7 +884,7 @@ StringRef ELFObjectFile::getFileFormatName() const { case ELF::EM_X86_64: return "ELF64-x86-64"; case ELF::EM_AARCH64: - return "ELF64-aarch64"; + return (IsLittleEndian ? "ELF64-aarch64-little" : "ELF64-aarch64-big"); case ELF::EM_PPC64: return "ELF64-ppc64"; case ELF::EM_S390: diff --git a/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll b/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll index 7c1524e02b5..7c5315a33e3 100644 --- a/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll +++ b/test/tools/llvm-dwarfdump/AArch64/big-endian-dump.ll @@ -1,5 +1,7 @@ ; RUN: llc -O0 -filetype=obj -o %t1 < %s -; RUN: llvm-dwarfdump %t1 +; RUN: llvm-dwarfdump %t1 | FileCheck %s + +; CHECK: file format ELF64-aarch64-big target datalayout = "E-m:e-i64:64-i128:128-n32:64-S128" target triple = "aarch64_be-none--eabi" diff --git a/test/tools/llvm-dwarfdump/AArch64/little-endian-dump.ll b/test/tools/llvm-dwarfdump/AArch64/little-endian-dump.ll new file mode 100644 index 00000000000..4367012505a --- /dev/null +++ b/test/tools/llvm-dwarfdump/AArch64/little-endian-dump.ll @@ -0,0 +1,18 @@ +; 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/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll b/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll index b7f962d5f16..8c29104bc5d 100644 --- a/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll +++ b/test/tools/llvm-dwarfdump/ARM/big-endian-dump.ll @@ -1,5 +1,7 @@ ; RUN: llc -O0 -filetype=obj -o %t1 < %s -; RUN: llvm-dwarfdump %t1 +; RUN: llvm-dwarfdump %t1 | FileCheck %s + +; CHECK: file format ELF32-arm-big target datalayout = "E-m:e-p:32:32-i64:64-v128:64:128-n32-S64" target triple = "armebv8-none--eabi" diff --git a/test/tools/llvm-dwarfdump/ARM/little-endian-dump.ll b/test/tools/llvm-dwarfdump/ARM/little-endian-dump.ll new file mode 100644 index 00000000000..f7936c17828 --- /dev/null +++ b/test/tools/llvm-dwarfdump/ARM/little-endian-dump.ll @@ -0,0 +1,20 @@ +; 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 "} -- 2.34.1