aboutsummaryrefslogtreecommitdiff
path: root/test/Object
diff options
context:
space:
mode:
Diffstat (limited to 'test/Object')
-rw-r--r--test/Object/ARM/symbol-addr.ll12
-rw-r--r--test/Object/Inputs/COFF/i386.yaml1
-rwxr-xr-xtest/Object/Inputs/coff_archive.libbin0 -> 41196 bytes
-rw-r--r--test/Object/Inputs/liblong_filenames.abin0 -> 10920 bytes
-rw-r--r--test/Object/Inputs/libsimple_archive.abin0 -> 1596 bytes
-rw-r--r--test/Object/Inputs/macho-text-sections.macho-x86_64bin0 -> 268 bytes
-rw-r--r--test/Object/Inputs/program-headers.elf-i386bin0 -> 987 bytes
-rw-r--r--test/Object/Inputs/program-headers.elf-x86-64bin0 -> 1108 bytes
-rw-r--r--test/Object/Inputs/trivial-object-test.elf-mips64elbin0 -> 1064 bytes
-rw-r--r--test/Object/Mips/feature.test4
-rw-r--r--test/Object/X86/macho-text-sections.test3
-rw-r--r--test/Object/archive-long-index.test40
-rw-r--r--test/Object/coff-archive.test225
-rw-r--r--test/Object/obj2yaml.test170
-rw-r--r--test/Object/objdump-private-headers.test18
-rw-r--r--test/Object/objdump-relocations.test7
-rw-r--r--test/Object/objdump-sectionheaders.test16
-rw-r--r--test/Object/readobj-elf-versioning.test49
-rw-r--r--test/Object/readobj-shared-object.test362
-rw-r--r--test/Object/readobj.test2
-rw-r--r--test/Object/simple-archive.test12
-rw-r--r--test/Object/yaml2obj-readobj.test5
22 files changed, 857 insertions, 69 deletions
diff --git a/test/Object/ARM/symbol-addr.ll b/test/Object/ARM/symbol-addr.ll
new file mode 100644
index 000000000000..6bcbde9f9f18
--- /dev/null
+++ b/test/Object/ARM/symbol-addr.ll
@@ -0,0 +1,12 @@
+; RUN: llc %s -mtriple=arm-unknown-unknown -filetype=obj -o - \
+; RUN: | llvm-objdump -t - | FileCheck %s
+; RUN: llc %s -mtriple=thumb-unknown-unknown -filetype=obj -o - \
+; RUN: | llvm-objdump -t - | FileCheck %s
+
+; Check that the symbol address does not include the ARM/Thumb instruction
+; indicator bit.
+; CHECK: 00000000 g F .text {{[0-9]+}} test
+
+define i32 @test() {
+ ret i32 1
+}
diff --git a/test/Object/Inputs/COFF/i386.yaml b/test/Object/Inputs/COFF/i386.yaml
index ca902220c13b..aec7a5813cf9 100644
--- a/test/Object/Inputs/COFF/i386.yaml
+++ b/test/Object/Inputs/COFF/i386.yaml
@@ -1,5 +1,6 @@
header: !Header
Machine: IMAGE_FILE_MACHINE_I386 # (0x14c)
+ Characteristics: [ IMAGE_FILE_DEBUG_STRIPPED ]
sections:
- !Section
diff --git a/test/Object/Inputs/coff_archive.lib b/test/Object/Inputs/coff_archive.lib
new file mode 100755
index 000000000000..e079991bfbac
--- /dev/null
+++ b/test/Object/Inputs/coff_archive.lib
Binary files differ
diff --git a/test/Object/Inputs/liblong_filenames.a b/test/Object/Inputs/liblong_filenames.a
new file mode 100644
index 000000000000..368d665c94ee
--- /dev/null
+++ b/test/Object/Inputs/liblong_filenames.a
Binary files differ
diff --git a/test/Object/Inputs/libsimple_archive.a b/test/Object/Inputs/libsimple_archive.a
new file mode 100644
index 000000000000..6e232e3e3cf8
--- /dev/null
+++ b/test/Object/Inputs/libsimple_archive.a
Binary files differ
diff --git a/test/Object/Inputs/macho-text-sections.macho-x86_64 b/test/Object/Inputs/macho-text-sections.macho-x86_64
new file mode 100644
index 000000000000..cce203ba0d88
--- /dev/null
+++ b/test/Object/Inputs/macho-text-sections.macho-x86_64
Binary files differ
diff --git a/test/Object/Inputs/program-headers.elf-i386 b/test/Object/Inputs/program-headers.elf-i386
new file mode 100644
index 000000000000..eb92c71cee5a
--- /dev/null
+++ b/test/Object/Inputs/program-headers.elf-i386
Binary files differ
diff --git a/test/Object/Inputs/program-headers.elf-x86-64 b/test/Object/Inputs/program-headers.elf-x86-64
new file mode 100644
index 000000000000..037bf14866a1
--- /dev/null
+++ b/test/Object/Inputs/program-headers.elf-x86-64
Binary files differ
diff --git a/test/Object/Inputs/trivial-object-test.elf-mips64el b/test/Object/Inputs/trivial-object-test.elf-mips64el
new file mode 100644
index 000000000000..5ad9ba3a0bc0
--- /dev/null
+++ b/test/Object/Inputs/trivial-object-test.elf-mips64el
Binary files differ
diff --git a/test/Object/Mips/feature.test b/test/Object/Mips/feature.test
index e8da60974603..340301450a50 100644
--- a/test/Object/Mips/feature.test
+++ b/test/Object/Mips/feature.test
@@ -2,10 +2,12 @@ RUN: llvm-objdump -disassemble -triple mips64el -mattr +mips64r2 %p/../Inputs/de
RUN: | FileCheck %s
CHECK: Disassembly of section .text:
-CHECK: .text:
+CHECK: dext:
CHECK: 0: 08 00 e0 03 jr $ra
CHECK: 4: 43 49 82 7c dext $2, $4, 5, 10
+CHECK: dextu:
CHECK: 8: 08 00 e0 03 jr $ra
CHECK: c: 83 28 82 7c dext $2, $4, 2, 6
+CHECK: dextm:
CHECK: 10: 08 00 e0 03 jr $ra
CHECK: 14: 43 09 82 7c dext $2, $4, 5, 2
diff --git a/test/Object/X86/macho-text-sections.test b/test/Object/X86/macho-text-sections.test
new file mode 100644
index 000000000000..1b697dcadad6
--- /dev/null
+++ b/test/Object/X86/macho-text-sections.test
@@ -0,0 +1,3 @@
+RUN: llvm-objdump -disassemble %p/../Inputs/macho-text-sections.macho-x86_64 | FileCheck %s
+
+CHECK: Disassembly of section __notext,__notext
diff --git a/test/Object/archive-long-index.test b/test/Object/archive-long-index.test
new file mode 100644
index 000000000000..bd530edbf418
--- /dev/null
+++ b/test/Object/archive-long-index.test
@@ -0,0 +1,40 @@
+#
+# Check if the index is appearing properly in the output file
+#
+RUN: llvm-nm -s %p/Inputs/liblong_filenames.a | FileCheck -check-prefix=CHECKIDX %s
+
+CHECKIDX: Archive map
+CHECKIDX: abcdefghijklmnopqrstuvwxyz12345678 in 1.o
+CHECKIDX: main in 1.o
+CHECKIDX: fn1 in 2.o
+CHECKIDX: fn3 in 3.o
+CHECKIDX: fn1 in 3.o
+CHECKIDX: shankar in 4.o
+CHECKIDX: a in 5.o
+CHECKIDX: b in 6.o
+CHECKIDX: a in abcdefghijklmnopqrstuvwxyz1.o
+CHECKIDX: b in abcdefghijklmnopqrstuvwxyz2.o
+CHECKIDX: bda in abcdefghijklmnopqrstuvwxyz2.o
+CHECKIDX: b in abcdefghijklmnopq.o
+CHECKIDX: 1.o:
+CHECKIDX: 00000000 D abcdefghijklmnopqrstuvwxyz12345678
+CHECKIDX: U bda
+CHECKIDX: 00000000 T main
+CHECKIDX: 2.o:
+CHECKIDX: 00000000 T fn1
+CHECKIDX: 3.o:
+CHECKIDX: 0000000b T fn1
+CHECKIDX: 00000000 T fn3
+CHECKIDX: 4.o:
+CHECKIDX: C shankar
+CHECKIDX: 5.o:
+CHECKIDX: C a
+CHECKIDX: 6.o:
+CHECKIDX: C b
+CHECKIDX: abcdefghijklmnopqrstuvwxyz1.o:
+CHECKIDX: C a
+CHECKIDX: abcdefghijklmnopqrstuvwxyz2.o:
+CHECKIDX: C b
+CHECKIDX: 00000000 T bda
+CHECKIDX: abcdefghijklmnopq.o:
+CHECKIDX: C b
diff --git a/test/Object/coff-archive.test b/test/Object/coff-archive.test
new file mode 100644
index 000000000000..768fe1c4b129
--- /dev/null
+++ b/test/Object/coff-archive.test
@@ -0,0 +1,225 @@
+#
+# Check if the index is appearing properly in the output file
+#
+RUN: llvm-nm --numeric-sort -s %p/Inputs/coff_archive.lib | FileCheck -check-prefix=CHECKIDX %s
+
+CHECKIDX: Archive map
+CHECKIDX: ??0invalid_argument@std@@QAE@PBD@Z in Debug\mymath.obj
+CHECKIDX: ??0logic_error@std@@QAE@PBD@Z in Debug\mymath.obj
+CHECKIDX: ??1invalid_argument@std@@UAE@XZ in Debug\mymath.obj
+CHECKIDX: ??1logic_error@std@@UAE@XZ in Debug\mymath.obj
+CHECKIDX: ??_7invalid_argument@std@@6B@ in Debug\mymath.obj
+CHECKIDX: ??_7logic_error@std@@6B@ in Debug\mymath.obj
+CHECKIDX: ??_C@_0BC@IHENMCGI@b?5cannot?5be?5zero?$CB?$AA@ in Debug\mymath.obj
+CHECKIDX: ??_Ginvalid_argument@std@@UAEPAXI@Z in Debug\mymath.obj
+CHECKIDX: ??_Glogic_error@std@@UAEPAXI@Z in Debug\mymath.obj
+CHECKIDX: ??_R0?AVexception@std@@@8 in Debug\mymath.obj
+CHECKIDX: ??_R0?AVinvalid_argument@std@@@8 in Debug\mymath.obj
+CHECKIDX: ??_R0?AVlogic_error@std@@@8 in Debug\mymath.obj
+CHECKIDX: ??_R0PAVexception@std@@@8 in Debug\mymath.obj
+CHECKIDX: ??_R0PAVinvalid_argument@std@@@8 in Debug\mymath.obj
+CHECKIDX: ??_R0PAVlogic_error@std@@@8 in Debug\mymath.obj
+CHECKIDX: ??_R0PAX@8 in Debug\mymath.obj
+CHECKIDX: ??_R1A@?0A@EA@exception@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R1A@?0A@EA@invalid_argument@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R1A@?0A@EA@logic_error@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R2exception@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R2invalid_argument@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R2logic_error@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R3exception@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R3invalid_argument@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R3logic_error@std@@8 in Debug\mymath.obj
+CHECKIDX: ??_R4invalid_argument@std@@6B@ in Debug\mymath.obj
+CHECKIDX: ??_R4logic_error@std@@6B@ in Debug\mymath.obj
+CHECKIDX: ?Add@MyMathFuncs@MathFuncs@@SANNN@Z in Debug\mymath.obj
+CHECKIDX: ?Divide@MyMathFuncs@MathFuncs@@SANNN@Z in Debug\mymath.obj
+CHECKIDX: ?Multiply@MyMathFuncs@MathFuncs@@SANNN@Z in Debug\mymath.obj
+CHECKIDX: ?Subtract@MyMathFuncs@MathFuncs@@SANNN@Z in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@C@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@D@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@E@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@F@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@G@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@H@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@I@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@J@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@K@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@M@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@N@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@O@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@_J@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@_K@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?_Rank@?$_Arithmetic_traits@_N@std@@2HB in Debug\mymath.obj
+CHECKIDX: ?value@?$integral_constant@I$0A@@tr1@std@@2IB in Debug\mymath.obj
+CHECKIDX: ?value@?$integral_constant@_N$00@tr1@std@@2_NB in Debug\mymath.obj
+CHECKIDX: ?value@?$integral_constant@_N$0A@@tr1@std@@2_NB in Debug\mymath.obj
+CHECKIDX: __CT??_R0PAVexception@std@@@84 in Debug\mymath.obj
+CHECKIDX: __CT??_R0PAVinvalid_argument@std@@@84 in Debug\mymath.obj
+CHECKIDX: __CT??_R0PAVlogic_error@std@@@84 in Debug\mymath.obj
+CHECKIDX: __CT??_R0PAX@84 in Debug\mymath.obj
+CHECKIDX: __CTA4PAVinvalid_argument@std@@ in Debug\mymath.obj
+CHECKIDX: __TI4PAVinvalid_argument@std@@ in Debug\mymath.obj
+CHECKIDX: __real@0000000000000000 in Debug\mymath.obj
+CHECKIDX: Debug\stdafx.obj:
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$T
+CHECKIDX: 00000000 i .drectve
+CHECKIDX: 00000001 a @feat.00
+CHECKIDX: 00ab9d1b a @comp.id
+CHECKIDX: Debug\mymath.obj:
+CHECKIDX: 00000000 d .data
+CHECKIDX: 00000000 d .data
+CHECKIDX: 00000000 d .data
+CHECKIDX: 00000000 d .data
+CHECKIDX: 00000000 d .data
+CHECKIDX: 00000000 d .data
+CHECKIDX: 00000000 d .data
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$S
+CHECKIDX: 00000000 N .debug$T
+CHECKIDX: 00000000 i .drectve
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rdata$r
+CHECKIDX: 00000000 r .rtc$IMZ
+CHECKIDX: 00000000 r .rtc$TMZ
+CHECKIDX: 00000000 N .sxdata
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text
+CHECKIDX: 00000000 t .text$x
+CHECKIDX: 00000000 r .xdata$x
+CHECKIDX: 00000000 r .xdata$x
+CHECKIDX: 00000000 r .xdata$x
+CHECKIDX: 00000000 r .xdata$x
+CHECKIDX: 00000000 r .xdata$x
+CHECKIDX: 00000000 r .xdata$x
+CHECKIDX: 00000000 r .xdata$x
+CHECKIDX: 00000000 T ??0invalid_argument@std@@QAE@PBD@Z
+CHECKIDX: 00000000 T ??0logic_error@std@@QAE@PBD@Z
+CHECKIDX: 00000000 T ??1invalid_argument@std@@UAE@XZ
+CHECKIDX: 00000000 T ??1logic_error@std@@UAE@XZ
+CHECKIDX: 00000000 R ??_C@_0BC@IHENMCGI@b?5cannot?5be?5zero?$CB?$AA@
+CHECKIDX: 00000000 T ??_Ginvalid_argument@std@@UAEPAXI@Z
+CHECKIDX: 00000000 T ??_Glogic_error@std@@UAEPAXI@Z
+CHECKIDX: 00000000 D ??_R0?AVexception@std@@@8
+CHECKIDX: 00000000 D ??_R0?AVinvalid_argument@std@@@8
+CHECKIDX: 00000000 D ??_R0?AVlogic_error@std@@@8
+CHECKIDX: 00000000 D ??_R0PAVexception@std@@@8
+CHECKIDX: 00000000 D ??_R0PAVinvalid_argument@std@@@8
+CHECKIDX: 00000000 D ??_R0PAVlogic_error@std@@@8
+CHECKIDX: 00000000 D ??_R0PAX@8
+CHECKIDX: 00000000 R ??_R1A@?0A@EA@exception@std@@8
+CHECKIDX: 00000000 R ??_R1A@?0A@EA@invalid_argument@std@@8
+CHECKIDX: 00000000 R ??_R1A@?0A@EA@logic_error@std@@8
+CHECKIDX: 00000000 R ??_R2exception@std@@8
+CHECKIDX: 00000000 R ??_R2invalid_argument@std@@8
+CHECKIDX: 00000000 R ??_R2logic_error@std@@8
+CHECKIDX: 00000000 R ??_R3exception@std@@8
+CHECKIDX: 00000000 R ??_R3invalid_argument@std@@8
+CHECKIDX: 00000000 R ??_R3logic_error@std@@8
+CHECKIDX: 00000000 R ??_R4invalid_argument@std@@6B@
+CHECKIDX: 00000000 R ??_R4logic_error@std@@6B@
+CHECKIDX: 00000000 T ?Add@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00000000 T ?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00000000 T ?Multiply@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00000000 T ?Subtract@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@C@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@D@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@E@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@F@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@G@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@H@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@I@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@J@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@K@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@M@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@N@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@O@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@_J@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@_K@std@@2HB
+CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@_N@std@@2HB
+CHECKIDX: 00000000 R ?value@?$integral_constant@I$0A@@tr1@std@@2IB
+CHECKIDX: 00000000 R ?value@?$integral_constant@_N$00@tr1@std@@2_NB
+CHECKIDX: 00000000 R ?value@?$integral_constant@_N$0A@@tr1@std@@2_NB
+CHECKIDX: 00000000 R __CT??_R0PAVexception@std@@@84
+CHECKIDX: 00000000 R __CT??_R0PAVinvalid_argument@std@@@84
+CHECKIDX: 00000000 R __CT??_R0PAVlogic_error@std@@@84
+CHECKIDX: 00000000 R __CT??_R0PAX@84
+CHECKIDX: 00000000 R __CTA4PAVinvalid_argument@std@@
+CHECKIDX: 00000000 r __RTC_InitBase.rtc$IMZ
+CHECKIDX: 00000000 r __RTC_Shutdown.rtc$TMZ
+CHECKIDX: 00000000 R __TI4PAVinvalid_argument@std@@
+CHECKIDX: 00000000 R __real@0000000000000000
+CHECKIDX: 00000000 t __unwindfunclet$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z$0
+CHECKIDX: 00000000 r __unwindtable$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00000001 a @feat.00
+CHECKIDX: 00000004 R ??_7invalid_argument@std@@6B@
+CHECKIDX: 00000004 R ??_7logic_error@std@@6B@
+CHECKIDX: 00000008 r __ehfuncinfo$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 0000000e t __ehhandler$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00ab9d1b a @comp.id
+CHECKIDX: U ??2@YAPAXI@Z
+CHECKIDX: U ??3@YAXPAX@Z
+CHECKIDX: U ??_7type_info@@6B@
+CHECKIDX: w ??_Einvalid_argument@std@@UAEPAXI@Z
+CHECKIDX: w ??_Elogic_error@std@@UAEPAXI@Z
+CHECKIDX: U ??_Ginvalid_argument@std@@UAEPAXI@Z
+CHECKIDX: U ??_Glogic_error@std@@UAEPAXI@Z
+CHECKIDX: U ?what@exception@std@@UBEPBDXZ
+CHECKIDX: U @__security_check_cookie@4
+CHECKIDX: U __CxxThrowException@8
+CHECKIDX: U __RTC_CheckEsp
+CHECKIDX: U __RTC_InitBase
+CHECKIDX: U __RTC_Shutdown
+CHECKIDX: U ___CxxFrameHandler3
+CHECKIDX: U ___security_cookie
+CHECKIDX: U __fltused
+CHECKIDX: U __imp_??0exception@std@@QAE@ABQBD@Z
+CHECKIDX: U __imp_??1exception@std@@UAE@XZ
diff --git a/test/Object/obj2yaml.test b/test/Object/obj2yaml.test
new file mode 100644
index 000000000000..0d96fd2bfd8e
--- /dev/null
+++ b/test/Object/obj2yaml.test
@@ -0,0 +1,170 @@
+RUN: obj2yaml %p/Inputs/trivial-object-test.coff-i386 | FileCheck %s --check-prefix COFF-I386
+RUN: obj2yaml %p/Inputs/trivial-object-test.coff-x86-64 | FileCheck %s --check-prefix COFF-X86-64
+
+
+COFF-I386: header: !Header
+COFF-I386-NEXT: Machine: IMAGE_FILE_MACHINE_I386 # (0x14c)
+
+COFF-I386: sections:
+COFF-I386-NEXT: - !Section
+COFF-I386-NEXT: Name: .text
+COFF-I386-NEXT: Characteristics: [IMAGE_SCN_CNT_CODE, IMAGE_SCN_ALIGN_16BYTES, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ, ] # 0x60500020
+COFF-I386-NEXT: SectionData: !hex "83EC0CC744240800000000C7042400000000E800000000E8000000008B44240883C40CC3" # |....D$.......$...............D$.....|
+
+COFF-I386: Relocations:
+COFF-I386-NEXT: - !Relocation
+COFF-I386-NEXT: VirtualAddress: 0xe
+COFF-I386-NEXT: SymbolTableIndex: 5
+COFF-I386-NEXT: Type: IMAGE_REL_I386_DIR32
+
+COFF-I386: - !Relocation
+COFF-I386-NEXT: VirtualAddress: 0x13
+COFF-I386-NEXT: SymbolTableIndex: 6
+COFF-I386-NEXT: Type: IMAGE_REL_I386_REL32
+
+COFF-I386: - !Relocation
+COFF-I386-NEXT: VirtualAddress: 0x18
+COFF-I386-NEXT: SymbolTableIndex: 7
+COFF-I386-NEXT: Type: IMAGE_REL_I386_REL32
+
+COFF-I386: - !Section
+COFF-I386-NEXT: Name: .data
+COFF-I386-NEXT: Characteristics: [IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_ALIGN_1BYTES, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE, ] # 0xc0100040
+COFF-I386-NEXT: SectionData: !hex "48656C6C6F20576F726C642100" # |Hello World!.|
+
+COFF-I386: symbols:
+COFF-I386-NEXT: - !Symbol
+COFF-I386-NEXT: Name: .text
+COFF-I386-NEXT: Value: 0
+COFF-I386-NEXT: SectionNumber: 1
+COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+COFF-I386-NEXT: NumberOfAuxSymbols: 1
+COFF-I386-NEXT: AuxillaryData: !hex "240000000300000000000000010000000000" # |$.................|
+
+COFF-I386: - !Symbol
+COFF-I386-NEXT: Name: .data
+COFF-I386-NEXT: Value: 0
+COFF-I386-NEXT: SectionNumber: 2
+COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+COFF-I386-NEXT: NumberOfAuxSymbols: 1
+COFF-I386-NEXT: AuxillaryData: !hex "0D0000000000000000000000020000000000" # |..................|
+
+COFF-I386: - !Symbol
+COFF-I386-NEXT: Name: _main
+COFF-I386-NEXT: Value: 0
+COFF-I386-NEXT: SectionNumber: 1
+COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_FUNCTION # (2)
+COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+COFF-I386: - !Symbol
+COFF-I386-NEXT: Name: L_.str
+COFF-I386-NEXT: Value: 0
+COFF-I386-NEXT: SectionNumber: 2
+COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+
+COFF-I386: - !Symbol
+COFF-I386-NEXT: Name: _puts
+COFF-I386-NEXT: Value: 0
+COFF-I386-NEXT: SectionNumber: 0
+COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+COFF-I386: - !Symbol
+COFF-I386-NEXT: Name: _SomeOtherFunction
+COFF-I386-NEXT: Value: 0
+COFF-I386-NEXT: SectionNumber: 0
+COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+
+COFF-X86-64: header: !Header
+COFF-X86-64-NEXT: Machine: IMAGE_FILE_MACHINE_AMD64 # (0x8664)
+
+COFF-X86-64: sections:
+COFF-X86-64-NEXT: - !Section
+COFF-X86-64-NEXT: Name: .text
+COFF-X86-64-NEXT: Characteristics: [IMAGE_SCN_CNT_CODE, IMAGE_SCN_ALIGN_16BYTES, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ, ] # 0x60500020
+COFF-X86-64-NEXT: SectionData: !hex "4883EC28C744242400000000488D0D00000000E800000000E8000000008B4424244883C428C3" # |H..(.D$$....H.................D$$H..(.|
+
+COFF-X86-64: Relocations:
+COFF-X86-64-NEXT: - !Relocation
+COFF-X86-64-NEXT: VirtualAddress: 0xf
+COFF-X86-64-NEXT: SymbolTableIndex: 5
+COFF-X86-64-NEXT: Type: IMAGE_REL_AMD64_REL32
+
+COFF-X86-64: - !Relocation
+COFF-X86-64-NEXT: VirtualAddress: 0x14
+COFF-X86-64-NEXT: SymbolTableIndex: 6
+COFF-X86-64-NEXT: Type: IMAGE_REL_AMD64_REL32
+
+COFF-X86-64: - !Relocation
+COFF-X86-64-NEXT: VirtualAddress: 0x19
+COFF-X86-64-NEXT: SymbolTableIndex: 7
+COFF-X86-64-NEXT: Type: IMAGE_REL_AMD64_REL32
+
+COFF-X86-64: - !Section
+COFF-X86-64-NEXT: Name: .data
+COFF-X86-64-NEXT: Characteristics: [IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_ALIGN_1BYTES, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE, ] # 0xc0100040
+COFF-X86-64-NEXT: SectionData: !hex "48656C6C6F20576F726C642100" # |Hello World!.|
+
+COFF-X86-64: symbols:
+COFF-X86-64-NEXT: - !Symbol
+COFF-X86-64-NEXT: Name: .text
+COFF-X86-64-NEXT: Value: 0
+COFF-X86-64-NEXT: SectionNumber: 1
+COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+COFF-X86-64-NEXT: NumberOfAuxSymbols: 1
+COFF-X86-64-NEXT: AuxillaryData: !hex "260000000300000000000000010000000000" # |&.................|
+
+COFF-X86-64: - !Symbol
+COFF-X86-64-NEXT: Name: .data
+COFF-X86-64-NEXT: Value: 0
+COFF-X86-64-NEXT: SectionNumber: 2
+COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+COFF-X86-64-NEXT: NumberOfAuxSymbols: 1
+COFF-X86-64-NEXT: AuxillaryData: !hex "0D0000000000000000000000020000000000" # |..................|
+
+COFF-X86-64: - !Symbol
+COFF-X86-64-NEXT: Name: main
+COFF-X86-64-NEXT: Value: 0
+COFF-X86-64-NEXT: SectionNumber: 1
+COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+COFF-X86-64: - !Symbol
+COFF-X86-64-NEXT: Name: L.str
+COFF-X86-64-NEXT: Value: 0
+COFF-X86-64-NEXT: SectionNumber: 2
+COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+
+COFF-X86-64: - !Symbol
+COFF-X86-64-NEXT: Name: puts
+COFF-X86-64-NEXT: Value: 0
+COFF-X86-64-NEXT: SectionNumber: 0
+COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+COFF-X86-64: - !Symbol
+COFF-X86-64-NEXT: Name: SomeOtherFunction
+COFF-X86-64-NEXT: Value: 0
+COFF-X86-64-NEXT: SectionNumber: 0
+COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
diff --git a/test/Object/objdump-private-headers.test b/test/Object/objdump-private-headers.test
new file mode 100644
index 000000000000..c562044b3c4e
--- /dev/null
+++ b/test/Object/objdump-private-headers.test
@@ -0,0 +1,18 @@
+RUN: llvm-objdump -p %p/Inputs/program-headers.elf-i386 \
+RUN: | FileCheck %s -check-prefix ELF-i386
+RUN: llvm-objdump -p %p/Inputs/program-headers.elf-x86-64 \
+RUN: | FileCheck %s -check-prefix ELF-x86-64
+
+ELF-i386: Program Header:
+ELF-i386: LOAD off 0x00000000 vaddr 0x08048000 paddr 0x08048000 align 2**12
+ELF-i386: filesz 0x00000134 memsz 0x00000134 flags r-x
+ELF-i386: STACK off 0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
+ELF-i386: filesz 0x00000000 memsz 0x00000000 flags rw-
+
+ELF-x86-64: Program Header:
+ELF-x86-64: LOAD off 0x0000000000000000 vaddr 0x0000000000400000 paddr 0x0000000000400000 align 2**21
+ELF-x86-64: filesz 0x0000000000000138 memsz 0x0000000000000138 flags r-x
+ELF-x86-64: EH_FRAME off 0x00000000000000f4 vaddr 0x00000000004000f4 paddr 0x00000000004000f4 align 2**2
+ELF-x86-64: filesz 0x0000000000000014 memsz 0x0000000000000014 flags r--
+ELF-x86-64: STACK off 0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**3
+ELF-x86-64: filesz 0x0000000000000000 memsz 0x0000000000000000 flags rw-
diff --git a/test/Object/objdump-relocations.test b/test/Object/objdump-relocations.test
index 6d35a2651d7a..95c4c4dcaedf 100644
--- a/test/Object/objdump-relocations.test
+++ b/test/Object/objdump-relocations.test
@@ -8,6 +8,8 @@ RUN: llvm-objdump -r %p/Inputs/trivial-object-test.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF-x86-64
RUN: llvm-objdump -r %p/Inputs/trivial-object-test.elf-hexagon \
RUN: | FileCheck %s -check-prefix ELF-hexagon
+RUN: llvm-objdump -r %p/Inputs/trivial-object-test.elf-mips64el \
+RUN: | FileCheck %s -check-prefix ELF-MIPS64EL
RUN: llvm-objdump -r %p/Inputs/relocations.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF-complex-x86-64
@@ -40,6 +42,11 @@ ELF-hexagon: R_HEX_LO16 puts
ELF-hexagon: R_HEX_B15_PCREL testf
ELF-hexagon: R_HEX_B22_PCREL puts
+// Note: this file was produced with gas to make sure we don't end up in a
+// situation where LLVM produces and accepts a broken file.
+ELF-MIPS64EL: .data
+ELF-MIPS64EL: R_MIPS_64
+
ELF-complex-x86-64: .text
ELF-complex-x86-64-NEXT: R_X86_64_8 .data-4
ELF-complex-x86-64-NEXT: R_X86_64_16 .data-4
diff --git a/test/Object/objdump-sectionheaders.test b/test/Object/objdump-sectionheaders.test
index a417d07a81cc..bc2478cea2fb 100644
--- a/test/Object/objdump-sectionheaders.test
+++ b/test/Object/objdump-sectionheaders.test
@@ -6,11 +6,11 @@
; CHECK: Sections:
; CHECK: Idx Name Size Address Type
-; CHECK: 0 000000000 00000000000000000
-; CHECK: 1 .text 000000026 00000000000000000 TEXT DATA
-; CHECK: 2 .rodata.str1.1 00000000d 00000000000000026 DATA
-; CHECK: 3 .note.GNU-stack 000000000 00000000000000033
-; CHECK: 4 .rela.text 000000048 00000000000000038
-; CHECK: 5 .symtab 0000000c0 00000000000000080
-; CHECK: 6 .strtab 000000033 00000000000000140
-; CHECK: 7 .shstrtab 00000004b 00000000000000173
+; CHECK: 0 00000000 0000000000000000
+; CHECK: 1 .text 00000026 0000000000000000 TEXT DATA
+; CHECK: 2 .rodata.str1.1 0000000d 0000000000000026 DATA
+; CHECK: 3 .note.GNU-stack 00000000 0000000000000033
+; CHECK: 4 .rela.text 00000048 0000000000000038
+; CHECK: 5 .symtab 000000c0 0000000000000080
+; CHECK: 6 .strtab 00000033 0000000000000140
+; CHECK: 7 .shstrtab 0000004b 0000000000000173
diff --git a/test/Object/readobj-elf-versioning.test b/test/Object/readobj-elf-versioning.test
index 0906f344e2c5..1f09ef32a11a 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 {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: foo@VER1 FUNC {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: unversioned_define FUNC {{[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 3b5457ce0737..72dbd32ea9d5 100644
--- a/test/Object/readobj-shared-object.test
+++ b/test/Object/readobj-shared-object.test
@@ -1,59 +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
-
-ELF32:File Format : ELF32-i386
-ELF32:Arch : i386
-ELF32:Address Size: 32 bits
-ELF32:Load Name : libfoo.so
-
-ELF:Symbols:
-ELF: .dynsym DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .dynstr DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .text DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .eh_frame DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .tdata DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .dynamic DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .got.plt DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .data DBG {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} formatspecific
-ELF: .bss DBG {{[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 {{[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 {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: tls_sym DATA {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,threadlocal
-ELF: defined_sym 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 {{[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:Dynamic Symbols:
-ELF: common_sym DATA {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global
-ELF: tls_sym DATA {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} global,threadlocal
-ELF: defined_sym 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 {{[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:Libraries needed:
-ELF: libc.so.6
-ELF: libm.so.6
-ELF: Total: 2
+ELF64: Format: ELF64-x86-64
+ELF64: Arch: x86_64
+ELF64: AddressSize: 64bit
+ELF64: LoadName: libfoo.so
+ELF32: Format: ELF32-i386
+ELF32: Arch: i386
+ELF32: AddressSize: 32bit
+ELF32: LoadName: libfoo.so
+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: 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: 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/Object/readobj.test b/test/Object/readobj.test
new file mode 100644
index 000000000000..e29f40492d77
--- /dev/null
+++ b/test/Object/readobj.test
@@ -0,0 +1,2 @@
+// Don't crash while reading non-dynamic files.
+RUN: llvm-readobj %p/Inputs/trivial-object-test.elf-x86-64
diff --git a/test/Object/simple-archive.test b/test/Object/simple-archive.test
new file mode 100644
index 000000000000..3e6760ed97a4
--- /dev/null
+++ b/test/Object/simple-archive.test
@@ -0,0 +1,12 @@
+#
+# Check if the index is appearing properly in the output file
+#
+RUN: llvm-nm -s %p/Inputs/libsimple_archive.a | FileCheck -check-prefix=CHECKIDX %s
+
+CHECKIDX: Archive map
+CHECKIDX: abcdefghijklmnopqrstuvwxyz12345678 in 1.o
+CHECKIDX: main in 1.o
+CHECKIDX: 1.o:
+CHECKIDX: 00000000 D abcdefghijklmnopqrstuvwxyz12345678
+CHECKIDX: U fn1
+CHECKIDX: 00000000 T main
diff --git a/test/Object/yaml2obj-readobj.test b/test/Object/yaml2obj-readobj.test
new file mode 100644
index 000000000000..545ccc48aa4c
--- /dev/null
+++ b/test/Object/yaml2obj-readobj.test
@@ -0,0 +1,5 @@
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-readobj -file-headers - | FileCheck %s --check-prefix COFF-I386
+
+// COFF-I386: Characteristics [ (0x200)
+// COFF-I386-NEXT: IMAGE_FILE_DEBUG_STRIPPED (0x200)
+// COFF-I386-NEXT: ]