aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/llvm/Object/ELF.h7
-rw-r--r--include/llvm/Support/COFF.h3
-rw-r--r--include/llvm/Support/Win64EH.h18
-rw-r--r--test/MC/ELF/many-sections-2.s2
-rw-r--r--test/Object/readobj-elf-versioning.test49
-rw-r--r--test/Object/readobj-shared-object.test387
-rw-r--r--test/tools/llvm-readobj/Inputs/trivial.ll19
-rw-r--r--test/tools/llvm-readobj/Inputs/trivial.obj.coff-i386bin0 -> 314 bytes
-rw-r--r--test/tools/llvm-readobj/Inputs/trivial.obj.coff-x86-64bin0 -> 319 bytes
-rw-r--r--test/tools/llvm-readobj/Inputs/trivial.obj.elf-i386bin0 -> 896 bytes
-rw-r--r--test/tools/llvm-readobj/Inputs/trivial.obj.elf-x86-64bin0 -> 1256 bytes
-rw-r--r--test/tools/llvm-readobj/Inputs/trivial.obj.macho-i386bin0 -> 472 bytes
-rw-r--r--test/tools/llvm-readobj/Inputs/trivial.obj.macho-x86-64bin0 -> 532 bytes
-rw-r--r--test/tools/llvm-readobj/file-headers.test100
-rw-r--r--test/tools/llvm-readobj/lit.local.cfg1
-rw-r--r--test/tools/llvm-readobj/relocations.test32
-rw-r--r--test/tools/llvm-readobj/sections-ext.test175
-rw-r--r--test/tools/llvm-readobj/sections.test113
-rw-r--r--test/tools/llvm-readobj/symbols.test44
-rw-r--r--tools/llvm-readobj/CMakeLists.txt13
-rw-r--r--tools/llvm-readobj/COFFDumper.cpp1014
-rw-r--r--tools/llvm-readobj/ELF.cpp196
-rw-r--r--tools/llvm-readobj/ELFDumper.cpp800
-rw-r--r--tools/llvm-readobj/Error.cpp62
-rw-r--r--tools/llvm-readobj/Error.h48
-rw-r--r--tools/llvm-readobj/LLVMBuild.txt2
-rw-r--r--tools/llvm-readobj/MachODumper.cpp438
-rw-r--r--tools/llvm-readobj/Makefile2
-rw-r--r--tools/llvm-readobj/ObjDumper.cpp33
-rw-r--r--tools/llvm-readobj/ObjDumper.h60
-rw-r--r--tools/llvm-readobj/StreamWriter.cpp79
-rw-r--r--tools/llvm-readobj/StreamWriter.h282
-rw-r--r--tools/llvm-readobj/llvm-readobj.cpp435
-rw-r--r--tools/llvm-readobj/llvm-readobj.h35
34 files changed, 3928 insertions, 521 deletions
diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h
index 719bc08915..ac6f386032 100644
--- a/include/llvm/Object/ELF.h
+++ b/include/llvm/Object/ELF.h
@@ -790,6 +790,7 @@ public:
uint64_t getNumSections() const;
uint64_t getStringTableIndex() const;
ELF::Elf64_Word getSymbolTableIndex(const Elf_Sym *symb) const;
+ const Elf_Ehdr *getElfHeader() const;
const Elf_Shdr *getSection(const Elf_Sym *symb) const;
const Elf_Shdr *getElfSection(section_iterator &It) const;
const Elf_Sym *getElfSymbol(symbol_iterator &It) const;
@@ -969,6 +970,12 @@ ELFObjectFile<ELFT>::getSection(const Elf_Sym *symb) const {
}
template<class ELFT>
+const typename ELFObjectFile<ELFT>::Elf_Ehdr *
+ELFObjectFile<ELFT>::getElfHeader() const {
+ return Header;
+}
+
+template<class ELFT>
const typename ELFObjectFile<ELFT>::Elf_Shdr *
ELFObjectFile<ELFT>::getElfSection(section_iterator &It) const {
llvm::object::DataRefImpl ShdrRef = It->getRawDataRefImpl();
diff --git a/include/llvm/Support/COFF.h b/include/llvm/Support/COFF.h
index 02c44cdfad..823b43ad93 100644
--- a/include/llvm/Support/COFF.h
+++ b/include/llvm/Support/COFF.h
@@ -321,7 +321,8 @@ namespace COFF {
IMAGE_COMDAT_SELECT_SAME_SIZE,
IMAGE_COMDAT_SELECT_EXACT_MATCH,
IMAGE_COMDAT_SELECT_ASSOCIATIVE,
- IMAGE_COMDAT_SELECT_LARGEST
+ IMAGE_COMDAT_SELECT_LARGEST,
+ IMAGE_COMDAT_SELECT_NEWEST
};
// Auxiliary Symbol Formats
diff --git a/include/llvm/Support/Win64EH.h b/include/llvm/Support/Win64EH.h
index 164aca16bf..ecce713680 100644
--- a/include/llvm/Support/Win64EH.h
+++ b/include/llvm/Support/Win64EH.h
@@ -106,12 +106,17 @@ struct UnwindInfo {
return reinterpret_cast<void *>(&UnwindCodes[(NumCodes+1) & ~1]);
}
- /// \brief Return image-relativ offset of language-specific exception handler.
- uint32_t getLanguageSpecificHandlerOffset() {
- return *reinterpret_cast<uint32_t *>(getLanguageSpecificData());
+ /// \brief Return pointer to language specific data part of UnwindInfo.
+ const void *getLanguageSpecificData() const {
+ return reinterpret_cast<const void *>(&UnwindCodes[(NumCodes+1) & ~1]);
+ }
+
+ /// \brief Return image-relative offset of language-specific exception handler.
+ uint32_t getLanguageSpecificHandlerOffset() const {
+ return *reinterpret_cast<const uint32_t *>(getLanguageSpecificData());
}
- /// \brief Set image-relativ offset of language-specific exception handler.
+ /// \brief Set image-relative offset of language-specific exception handler.
void setLanguageSpecificHandlerOffset(uint32_t offset) {
*reinterpret_cast<uint32_t *>(getLanguageSpecificData()) = offset;
}
@@ -126,6 +131,11 @@ struct UnwindInfo {
RuntimeFunction *getChainedFunctionEntry() {
return reinterpret_cast<RuntimeFunction *>(getLanguageSpecificData());
}
+
+ /// \brief Return pointer to chained unwind info.
+ const RuntimeFunction *getChainedFunctionEntry() const {
+ return reinterpret_cast<const RuntimeFunction *>(getLanguageSpecificData());
+ }
};
diff --git a/test/MC/ELF/many-sections-2.s b/test/MC/ELF/many-sections-2.s
index f5a1a0e437..789ebf378d 100644
--- a/test/MC/ELF/many-sections-2.s
+++ b/test/MC/ELF/many-sections-2.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
-// RUN: llvm-readobj %t | FileCheck %s
+// RUN: llvm-readobj -s %t | FileCheck %s
// CHECK: symtab_shndx
diff --git a/test/Object/readobj-elf-versioning.test b/test/Object/readobj-elf-versioning.test
index be1a39d9c4..1f09ef32a1 100644
--- a/test/Object/readobj-elf-versioning.test
+++ b/test/Object/readobj-elf-versioning.test
@@ -1,15 +1,46 @@
-RUN: llvm-readobj %p/Inputs/elf-versioning-test.i386 \
+RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.i386 \
RUN: | FileCheck %s -check-prefix ELF
-RUN: llvm-readobj %p/Inputs/elf-versioning-test.i386 \
+RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.i386 \
RUN: | FileCheck %s -check-prefix ELF32
-RUN: llvm-readobj %p/Inputs/elf-versioning-test.x86_64 \
+RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.x86_64 \
RUN: | FileCheck %s -check-prefix ELF
-RUN: llvm-readobj %p/Inputs/elf-versioning-test.x86_64 \
+RUN: llvm-readobj -dt %p/Inputs/elf-versioning-test.x86_64 \
RUN: | FileCheck %s -check-prefix ELF64
-ELF: foo@@VER2 FUNC .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: foo@VER1 FUNC .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: unversioned_define FUNC .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
+ELF: DynamicSymbols [
+ELF: Symbol {
+ELF: Name: foo@@VER2
+ELF: Binding: Global
+ELF: Type: Function
+ELF: Section: .text
+ELF: }
+ELF: Symbol {
+ELF: Name: foo@VER1
+ELF: Binding: Global
+ELF: Type: Function
+ELF: Section: .text
+ELF: }
+ELF: Symbol {
+ELF: Name: unversioned_define
+ELF: Binding: Global
+ELF: Type: Function
+ELF: Section: .text
+ELF: }
+ELF: ]
-ELF32: puts@GLIBC_2.0 FUNC {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} undef,global
-ELF64: puts@GLIBC_2.2.5 FUNC {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} undef,global
+ELF32: DynamicSymbols [
+ELF32: Symbol {
+ELF32: Name: puts@GLIBC_2.0
+ELF32: Binding: Global
+ELF32: Type: Function
+ELF32: Section: (0x0)
+ELF32: }
+ELF32: ]
+ELF64: DynamicSymbols [
+ELF64: Symbol {
+ELF64: Name: puts@GLIBC_2.2.5
+ELF64: Binding: Global
+ELF64: Type: Function
+ELF64: Section: (0x0)
+ELF64: }
+ELF64: ]
diff --git a/test/Object/readobj-shared-object.test b/test/Object/readobj-shared-object.test
index 548bd3801e..72dbd32ea9 100644
--- a/test/Object/readobj-shared-object.test
+++ b/test/Object/readobj-shared-object.test
@@ -1,92 +1,319 @@
-RUN: llvm-readobj %p/Inputs/shared-object-test.elf-i386 \
+RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \
+RUN: %p/Inputs/shared-object-test.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF
-RUN: llvm-readobj %p/Inputs/shared-object-test.elf-i386 \
+RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \
+RUN: %p/Inputs/shared-object-test.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF32
-RUN: llvm-readobj %p/Inputs/shared-object-test.elf-x86-64 \
+RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \
+RUN: %p/Inputs/shared-object-test.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF
-RUN: llvm-readobj %p/Inputs/shared-object-test.elf-x86-64 \
+RUN: llvm-readobj -s -t -dt -dynamic-table -needed-libs \
+RUN: %p/Inputs/shared-object-test.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF64
-ELF64:File Format : ELF64-x86-64
-ELF64:Arch : x86_64
-ELF64:Address Size: 64 bits
-ELF64:Load Name : libfoo.so
+ELF64: Format: ELF64-x86-64
+ELF64: Arch: x86_64
+ELF64: AddressSize: 64bit
+ELF64: LoadName: libfoo.so
-ELF32:File Format : ELF32-i386
-ELF32:Arch : i386
-ELF32:Address Size: 32 bits
-ELF32:Load Name : libfoo.so
+ELF32: Format: ELF32-i386
+ELF32: Arch: i386
+ELF32: AddressSize: 32bit
+ELF32: LoadName: libfoo.so
-ELF:Symbols:
-ELF: Name Type Section Address Size FileOffset Flags
-ELF: .dynsym DBG .dynsym {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .dynstr DBG .dynstr {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .text DBG .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .eh_frame DBG .eh_frame {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .tdata DBG .tdata {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .dynamic DBG .dynamic {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .got.plt DBG .got.plt {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .data DBG .data {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .bss DBG .bss {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: shared.ll FILE {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} absolute,formatspecific
-ELF: local_func FUNC .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}}
-ELF: _GLOBAL_OFFSET_TABLE_ DATA {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} absolute
-ELF: _DYNAMIC DATA {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} absolute
-ELF: common_sym DATA .bss {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: tls_sym DATA .tdata {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,threadlocal
-ELF: defined_sym DATA .data {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: __bss_start ? {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,absolute
-ELF: _end ? {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,absolute
-ELF: global_func FUNC .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: _edata ? {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,absolute
-ELF: Total: 21
+ELF: Sections [
+ELF: Section {
+ELF: Name: (0)
+ELF: Type: SHT_NULL
+ELF: Flags [ (0x0)
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .hash
+ELF: Type: SHT_HASH
+ELF: Flags [ (0x2)
+ELF: SHF_ALLOC
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .dynsym
+ELF: Type: SHT_DYNSYM
+ELF: Flags [ (0x2)
+ELF: SHF_ALLOC
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .dynstr
+ELF: Type: SHT_STRTAB
+ELF: Flags [ (0x2)
+ELF: SHF_ALLOC
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .text
+ELF: Type: SHT_PROGBITS
+ELF: Flags [ (0x6)
+ELF: SHF_ALLOC
+ELF: SHF_EXECINSTR
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .eh_frame
+ELF: Type: SHT_PROGBITS
+ELF: Flags [ (0x2)
+ELF: SHF_ALLOC
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .tdata
+ELF: Type: SHT_PROGBITS
+ELF: Flags [ (0x403)
+ELF: SHF_ALLOC
+ELF: SHF_TLS
+ELF: SHF_WRITE
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .dynamic
+ELF: Type: SHT_DYNAMIC
+ELF: Flags [ (0x3)
+ELF: SHF_ALLOC
+ELF: SHF_WRITE
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .got.plt
+ELF: Type: SHT_PROGBITS
+ELF: Flags [ (0x3)
+ELF: SHF_ALLOC
+ELF: SHF_WRITE
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .data
+ELF: Type: SHT_PROGBITS
+ELF: Flags [ (0x3)
+ELF: SHF_ALLOC
+ELF: SHF_WRITE
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .bss
+ELF: Type: SHT_NOBITS
+ELF: Flags [ (0x3)
+ELF: SHF_ALLOC
+ELF: SHF_WRITE
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .shstrtab
+ELF: Type: SHT_STRTAB
+ELF: Flags [ (0x0)
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .symtab
+ELF: Type: SHT_SYMTAB
+ELF: Flags [ (0x0)
+ELF: ]
+ELF: }
+ELF: Section {
+ELF: Name: .strtab
+ELF: Type: SHT_STRTAB
+ELF: Flags [ (0x0)
+ELF: ]
+ELF: }
+ELF: ]
-ELF:Dynamic Symbols:
-ELF: Name Type Section Address Size FileOffset Flags
-ELF: common_sym DATA .bss {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: tls_sym DATA .tdata {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,threadlocal
-ELF: defined_sym DATA .data {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: __bss_start ? {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,absolute
-ELF: _end ? {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,absolute
-ELF: global_func FUNC .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: _edata ? {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,absolute
-ELF: Total: {{[0-9a-f]+}}
+ELF: Symbols [
+ELF: Symbol {
+ELF: Name: .hash
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .hash
+ELF: }
+ELF: Symbol {
+ELF: Name: .dynsym
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .dynsym
+ELF: }
+ELF: Symbol {
+ELF: Name: .dynstr
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .dynstr
+ELF: }
+ELF: Symbol {
+ELF: Name: .text
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .text
+ELF: }
+ELF: Symbol {
+ELF: Name: .eh_frame
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .eh_frame
+ELF: }
+ELF: Symbol {
+ELF: Name: .tdata
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .tdata
+ELF: }
+ELF: Symbol {
+ELF: Name: .dynamic
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .dynamic
+ELF: }
+ELF: Symbol {
+ELF: Name: .got.plt
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .got.plt
+ELF: }
+ELF: Symbol {
+ELF: Name: .data
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .data
+ELF: }
+ELF: Symbol {
+ELF: Name: .bss
+ELF: Binding: Local
+ELF: Type: Section
+ELF: Section: .bss
+ELF: }
+ELF: Symbol {
+ELF: Name: shared.ll
+ELF: Binding: Local
+ELF: Type: File
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: Symbol {
+ELF: Name: local_func
+ELF: Binding: Local
+ELF: Type: Function
+ELF: Section: .text
+ELF: }
+ELF: Symbol {
+ELF: Name: _GLOBAL_OFFSET_TABLE_
+ELF: Binding: Local
+ELF: Type: Object
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: Symbol {
+ELF: Name: _DYNAMIC
+ELF: Binding: Local
+ELF: Type: Object
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: Symbol {
+ELF: Name: common_sym
+ELF: Binding: Global
+ELF: Type: Object
+ELF: Section: .bss
+ELF: }
+ELF: Symbol {
+ELF: Name: tls_sym
+ELF: Binding: Global
+ELF: Type: TLS
+ELF: Section: .tdata
+ELF: }
+ELF: Symbol {
+ELF: Name: defined_sym
+ELF: Binding: Global
+ELF: Type: Object
+ELF: Section: .data
+ELF: }
+ELF: Symbol {
+ELF: Name: __bss_start
+ELF: Binding: Global
+ELF: Type: None
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: Symbol {
+ELF: Name: _end
+ELF: Binding: Global
+ELF: Type: None
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: Symbol {
+ELF: Name: global_func
+ELF: Binding: Global
+ELF: Type: Function
+ELF: Section: .text
+ELF: }
+ELF: Symbol {
+ELF: Name: _edata
+ELF: Binding: Global
+ELF: Type: None
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: ]
-ELF:Sections:
-ELF: Name Address Size Align Flags
-ELF: {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} rodata
-ELF: .hash {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} required,rodata
-ELF: .dynsym {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} required,rodata
-ELF: .dynstr {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} required,rodata
-ELF: .text {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} text,{{(data,)?}}required
-ELF: .eh_frame {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} data,required,rodata
-ELF: .tdata {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} data,required
-ELF: .dynamic {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} required
-ELF: .got.plt {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} data,required
-ELF: .data {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} data,required
-ELF: .bss {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} bss,required,virtual,zeroinit
-ELF: .shstrtab {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} rodata
-ELF: .symtab {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} rodata
-ELF: .strtab {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} rodata
-ELF: Total: 14
-
-ELF:Dynamic section contains 9 entries
-ELF: Tag Type Name/Value
-ELF: 00000001 (NEEDED) Shared library: [libc.so.6]
-ELF: 00000001 (NEEDED) Shared library: [libm.so.6]
-ELF: 0000000e (SONAME) Library soname: [libfoo.so]
-ELF: 00000004 (HASH) {{[0-9a-f]+}}
-ELF: 00000005 (STRTAB) {{[0-9a-f]+}}
-ELF: 00000006 (SYMTAB) {{[0-9a-f]+}}
-ELF: 0000000a (STRSZ) {{[0-9]+}} (bytes)
-ELF: 0000000b (SYMENT) {{[0-9]+}} (bytes)
-ELF: 00000000 (NULL) 0x0
-ELF: Total: 9
-
-ELF:Libraries needed:
-ELF: libc.so.6
-ELF: libm.so.6
-ELF: Total: 2
+ELF: DynamicSymbols [
+ELF: Symbol {
+ELF: Name: common_sym
+ELF: Binding: Global
+ELF: Type: Object
+ELF: Section: .bss
+ELF: }
+ELF: Symbol {
+ELF: Name: tls_sym
+ELF: Binding: Global
+ELF: Type: TLS
+ELF: Section: .tdata
+ELF: }
+ELF: Symbol {
+ELF: Name: defined_sym
+ELF: Binding: Global
+ELF: Type: Object
+ELF: Section: .data
+ELF: }
+ELF: Symbol {
+ELF: Name: __bss_start
+ELF: Binding: Global
+ELF: Type: None
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: Symbol {
+ELF: Name: _end
+ELF: Binding: Global
+ELF: Type: None
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: Symbol {
+ELF: Name: global_func
+ELF: Binding: Global
+ELF: Type: Function
+ELF: Section: .text
+ELF: }
+ELF: Symbol {
+ELF: Name: _edata
+ELF: Binding: Global
+ELF: Type: None
+ELF: Section: (0xFFF1)
+ELF: }
+ELF: ]
+ELF: DynamicSection [ (9 entries)
+ELF: Tag Type Name/Value
+ELF: 00000001 NEEDED SharedLibrary (libc.so.6)
+ELF: 00000001 NEEDED SharedLibrary (libm.so.6)
+ELF: 0000000E SONAME LibrarySoname (libfoo.so)
+ELF: 00000004 HASH {{[0-9a-f]+}}
+ELF: 00000005 STRTAB {{[0-9a-f]+}}
+ELF: 00000006 SYMTAB {{[0-9a-f]+}}
+ELF: 0000000A STRSZ {{[0-9]+}} (bytes)
+ELF: 0000000B SYMENT {{[0-9]+}} (bytes)
+ELF: 00000000 NULL 0x0
+ELF: ]
+ELF: NeededLibraries [
+ELF-NEXT: libc.so.6
+ELF-NEXT: libm.so.6
+ELF-NEXT: ]
diff --git a/test/tools/llvm-readobj/Inputs/trivial.ll b/test/tools/llvm-readobj/Inputs/trivial.ll
new file mode 100644
index 0000000000..2cd7ec89e2
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/trivial.ll
@@ -0,0 +1,19 @@
+; llc -mtriple=i386-pc-win32 trivial.ll -filetype=obj -o trivial-object-test.coff-i386
+; llc -mtriple=x86_64-pc-win32 trivial.ll -filetype=obj -o trivial-object-test.coff-x86-64
+; llc -mtriple=i386-linux-gnu trivial.ll -filetype=obj -o trivial-object-test.elf-i386 -relocation-model=pic
+; llc -mtriple=x86_64-linux-gnu trivial.ll -filetype=obj -o trivial-object-test.elf-x86-64 -relocation-model=pic
+; llc -mtriple=i386-apple-darwin10 trivial.ll -filetype=obj -o trivial-object-test.macho-i386 -relocation-model=pic
+; llc -mtriple=x86_64-apple-darwin10 trivial.ll -filetype=obj -o trivial-object-test.macho-x86-64 -relocation-model=pic
+
+@.str = private unnamed_addr constant [13 x i8] c"Hello World\0A\00", align 1
+
+define i32 @main() nounwind {
+entry:
+ %call = tail call i32 @puts(i8* getelementptr inbounds ([13 x i8]* @.str, i32 0, i32 0)) nounwind
+ tail call void bitcast (void (...)* @SomeOtherFunction to void ()*)() nounwind
+ ret i32 0
+}
+
+declare i32 @puts(i8* nocapture) nounwind
+
+declare void @SomeOtherFunction(...)
diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.coff-i386 b/test/tools/llvm-readobj/Inputs/trivial.obj.coff-i386
new file mode 100644
index 0000000000..282e5699a7
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/trivial.obj.coff-i386
Binary files differ
diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.coff-x86-64 b/test/tools/llvm-readobj/Inputs/trivial.obj.coff-x86-64
new file mode 100644
index 0000000000..8a7060e610
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/trivial.obj.coff-x86-64
Binary files differ
diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.elf-i386 b/test/tools/llvm-readobj/Inputs/trivial.obj.elf-i386
new file mode 100644
index 0000000000..f85e40d626
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/trivial.obj.elf-i386
Binary files differ
diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.elf-x86-64 b/test/tools/llvm-readobj/Inputs/trivial.obj.elf-x86-64
new file mode 100644
index 0000000000..95285c1f23
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/trivial.obj.elf-x86-64
Binary files differ
diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.macho-i386 b/test/tools/llvm-readobj/Inputs/trivial.obj.macho-i386
new file mode 100644
index 0000000000..5048171ccb
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/trivial.obj.macho-i386
Binary files differ
diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.macho-x86-64 b/test/tools/llvm-readobj/Inputs/trivial.obj.macho-x86-64
new file mode 100644
index 0000000000..bcdfc8aa69
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/trivial.obj.macho-x86-64
Binary files differ
diff --git a/test/tools/llvm-readobj/file-headers.test b/test/tools/llvm-readobj/file-headers.test
new file mode 100644
index 0000000000..226eb93423
--- /dev/null
+++ b/test/tools/llvm-readobj/file-headers.test
@@ -0,0 +1,100 @@
+RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-i386 \
+RUN: | FileCheck %s -check-prefix COFF32
+RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-x86-64 \
+RUN: | FileCheck %s -check-prefix COFF64
+RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-i386 \
+RUN: | FileCheck %s -check-prefix ELF32
+RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-x86-64 \
+RUN: | FileCheck %s -check-prefix ELF64
+
+COFF32: File: {{(.*[/\\])?}}trivial.obj.coff-i386
+COFF32-NEXT: Format: COFF-i386
+COFF32-NEXT: Arch: i386
+COFF32-NEXT: AddressSize: 32bit
+COFF32-NEXT: ImageFileHeader {
+COFF32-NEXT: Machine: IMAGE_FILE_MACHINE_I386 (0x14C)
+COFF32-NEXT: SectionCount: 2
+COFF32-NEXT: TimeDateStamp: 2013-03-20 17:56:46 (0x5149F85E)
+COFF32-NEXT: PointerToSymbolTable: 0xA5
+COFF32-NEXT: SymbolCount: 7
+COFF32-NEXT: OptionalHeaderSize: 0
+COFF32-NEXT: Characteristics [ (0x0)
+COFF32-NEXT: ]
+COFF32-NEXT: }
+
+COFF64: File: {{(.*[/\\])?}}trivial.obj.coff-x86-64
+COFF64-NEXT: Format: COFF-x86-64
+COFF64-NEXT: Arch: x86_64
+COFF64-NEXT: AddressSize: 64bit
+COFF64-NEXT: ImageFileHeader {
+COFF64-NEXT: Machine: IMAGE_FILE_MACHINE_AMD64 (0x8664)
+COFF64-NEXT: SectionCount: 2
+COFF64-NEXT: TimeDateStamp: 2013-03-20 17:56:46 (0x5149F85E)
+COFF64-NEXT: PointerToSymbolTable: 0xAB
+COFF64-NEXT: SymbolCount: 7
+COFF64-NEXT: OptionalHeaderSize: 0
+COFF64-NEXT: Characteristics [ (0x0)
+COFF64-NEXT: ]
+COFF64-NEXT: }
+
+ELF32: File: {{(.*[/\\])?}}trivial.obj.elf-i386
+ELF32-NEXT: Format: ELF32-i386
+ELF32-NEXT: Arch: i386
+ELF32-NEXT: AddressSize: 32bit
+ELF32-NEXT: LoadName:
+ELF32-NEXT: ElfHeader {
+ELF32-NEXT: Ident {
+ELF32-NEXT: Magic: (7F 45 4C 46)
+ELF32-NEXT: Class: 32-bit (0x1)
+ELF32-NEXT: DataEncoding: LittleEndian (0x1)
+ELF32-NEXT: FileVersion: 1
+ELF32-NEXT: OS/ABI: GNU/Linux (0x3)
+ELF32-NEXT: ABIVersion: 0
+ELF32-NEXT: Unused: (00 00 00 00 00 00 00)
+ELF32-NEXT: }
+ELF32-NEXT: Type: Relocatable (0x1)
+ELF32-NEXT: Machine: EM_386 (0x3)
+ELF32-NEXT: Version: 1
+ELF32-NEXT: Entry: 0x0
+ELF32-NEXT: ProgramHeaderOffset: 0x0
+ELF32-NEXT: SectionHeaderOffset: 0xC8
+ELF32-NEXT: Flags [ (0x0)
+ELF32-NEXT: ]
+ELF32-NEXT: HeaderSize: 52
+ELF32-NEXT: ProgramHeaderEntrySize: 0
+ELF32-NEXT: ProgramHeaderCount: 0
+ELF32-NEXT: SectionHeaderEntrySize: 40
+ELF32-NEXT: SectionHeaderCount: 10
+ELF32-NEXT: StringTableSectionIndex: 7
+ELF32-NEXT: }
+
+ELF64: File: {{(.*[/\\])?}}trivial.obj.elf-x86-64
+ELF64-NEXT: Format: ELF64-x86-64
+ELF64-NEXT: Arch: x86_64
+ELF64-NEXT: AddressSize: 64bit
+ELF64-NEXT: LoadName:
+ELF64-NEXT: ElfHeader {
+ELF64-NEXT: Ident {
+ELF64-NEXT: Magic: (7F 45 4C 46)
+ELF64-NEXT: Class: 64-bit (0x2)
+ELF64-NEXT: DataEncoding: LittleEndian (0x1)
+ELF64-NEXT: FileVersion: 1
+ELF64-NEXT: OS/ABI: GNU/Linux (0x3)
+ELF64-NEXT: ABIVersion: 0
+ELF64-NEXT: Unused: (00 00 00 00 00 00 00)
+ELF64-NEXT: }
+ELF64-NEXT: Type: Relocatable (0x1)
+ELF64-NEXT: Machine: EM_X86_64 (0x3E)
+ELF64-NEXT: Version: 1
+ELF64-NEXT: Entry: 0x0
+ELF64-NEXT: ProgramHeaderOffset: 0x0
+ELF64-NEXT: SectionHeaderOffset: 0xB8
+ELF64-NEXT: Flags [ (0x0)
+ELF64-NEXT: ]
+ELF64-NEXT: HeaderSize: 64
+ELF64-NEXT: ProgramHeaderEntrySize: 0
+ELF64-NEXT: ProgramHeaderCount: 0
+ELF64-NEXT: SectionHeaderEntrySize: 64
+ELF64-NEXT: SectionHeaderCount: 10
+ELF64-NEXT: StringTableSectionIndex: 7
+ELF64-NEXT: }
diff --git a/test/tools/llvm-readobj/lit.local.cfg b/test/tools/llvm-readobj/lit.local.cfg
new file mode 100644
index 0000000000..df9b335dd1
--- /dev/null
+++ b/test/tools/llvm-readobj/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.test']
diff --git a/test/tools/llvm-readobj/relocations.test b/test/tools/llvm-readobj/relocations.test
new file mode 100644
index 0000000000..0608565373
--- /dev/null
+++ b/test/tools/llvm-readobj/relocations.test
@@ -0,0 +1,32 @@
+RUN: llvm-readobj -r %p/Inputs/trivial.obj.coff-i386 \
+RUN: | FileCheck %s -check-prefix COFF
+RUN: llvm-readobj -r %p/Inputs/trivial.obj.elf-i386 \
+RUN: | FileCheck %s -check-prefix ELF
+RUN: llvm-readobj -r %p/Inputs/trivial.obj.macho-i386 \
+RUN: | FileCheck %s -check-prefix MACHO
+
+COFF: Relocations [
+COFF-NEXT: Section (1) .text {
+COFF-NEXT: 0x4 IMAGE_REL_I386_DIR32 .data
+COFF-NEXT: 0x9 IMAGE_REL_I386_REL32 _puts
+COFF-NEXT: 0xE IMAGE_REL_I386_REL32 _SomeOtherFunction
+COFF-NEXT: }
+COFF-NEXT: ]
+
+ELF: Relocations [
+ELF-NEXT: Section (1) .text {
+ELF-NEXT: 0xC R_386_GOTPC _GLOBAL_OFFSET_TABLE_ 0x0
+ELF-NEXT: 0x12 R_386_GOTOFF .L.str 0x0
+ELF-NEXT: 0x1A R_386_PLT32 puts 0x0
+ELF-NEXT: 0x1F R_386_PLT32 SomeOtherFunction 0x0
+ELF-NEXT: }
+ELF-NEXT: ]
+
+MACHO: Relocations [
+MACHO-NEXT: Section __text {
+MACHO-NEXT: 0x18 GENERIC_RELOC_VANILLA _SomeOtherFunction 0x0
+MACHO-NEXT: 0x13 GENERIC_RELOC_VANILLA _puts 0x0
+MACHO-NEXT: 0xB GENERIC_RELOC_LOCAL_SECTDIFF _main 0x{{[0-9A-F]+}}
+MACHO-NEXT: 0x0 GENERIC_RELOC_PAIR _main 0x{{[0-9A-F]+}}
+MACHO-NEXT: }
+MACHO-NEXT: ]
diff --git a/test/tools/llvm-readobj/sections-ext.test b/test/tools/llvm-readobj/sections-ext.test
new file mode 100644
index 0000000000..a972c9ab51
--- /dev/null
+++ b/test/tools/llvm-readobj/sections-ext.test
@@ -0,0 +1,175 @@
+RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.coff-i386 \
+RUN: | FileCheck %s -check-prefix COFF
+RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.elf-i386 \
+RUN: | FileCheck %s -check-prefix ELF
+RUN: llvm-readobj -s -st -sr -sd %p/I