From 600b09339deb5673aa2ade6b604dd7ba57f4e283 Mon Sep 17 00:00:00 2001
From: Davide Italiano <davide@freebsd.org>
Date: Thu, 15 Oct 2015 22:04:55 +0000
Subject: [PATCH] [llvm-readobj/ELF] Dump DT_VERDEF/DT_VERDEFNUM correctly.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250464 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/llvm-readobj/Inputs/verdef.elf-x86-64 | Bin 0 -> 2256 bytes
 test/tools/llvm-readobj/elf-versioninfo.test     |   7 +++++++
 tools/llvm-readobj/ELFDumper.cpp                 |   4 ++++
 3 files changed, 11 insertions(+)
 create mode 100755 test/tools/llvm-readobj/Inputs/verdef.elf-x86-64
 create mode 100644 test/tools/llvm-readobj/elf-versioninfo.test

diff --git a/test/tools/llvm-readobj/Inputs/verdef.elf-x86-64 b/test/tools/llvm-readobj/Inputs/verdef.elf-x86-64
new file mode 100755
index 0000000000000000000000000000000000000000..4b907694e800a622f28357c2cbe4a4129316febf
GIT binary patch
literal 2256
zcmcIl%Wl(95FIBah4LzeMHe8o5(^e!DToCNgo2<&l}bRMA|W9x2Zy>+6QkHbvVmVf
ztoj?U%90P@16XFq7WSYp$DZT3ZlbCZOy$g-$GLOI_l)~tZF9ZiI48uUD!0X<p}Jw~
zN5>}4hTN1njhvCwQd9SwJ`D?(^~n6x$IV8K!j|Tps9_~rQ_Esz1BaUQ50@;@^e8ih
znmBBC6dccK+Z|BL>RFUu<Gu6yLziawFQ@)mer}?!%*el?{v|yz`(!?PIHz@KQ=gsT
zm)5Qy%G0&SPc|Ml>s(wHuiXvwC-4(rwxdWquNB8$ocO&&Ua4Kx{qPP@Z(bkVaZ$(-
zyjR>K@<o~B=*p3b{y}Gd{ZBQypwWwI2J(<8n&ZglAMX|zLoEnmRgHeJ7<}lD=Yh@K
z6+6gDI8|^j5OQl|@rBH-%*}-TEE~^$j>i!qn`Zwu`?=YF%+C6>P5z_8`7o5w_nTXK
zN4vpF-L2OTsfl)-%DiwcMwXBMr||~#o#w|~P2>0K41dPsgM7U@BOmuLjo;$kd)B=3
zVB_wDsyTTN<E*$zyPt@wOcpm7bmOEa?soT$`?lSSccQMi-6(0N9=y(Lxf{8Ij<}&8
zhx-s-kZ$C6c3z4bhq__nw{%54=%jW!McU9m5WE*~*=Q%^H}zMmfjI6OGXWv*Pw5&Q
zC7%4JCjWtf*mz`y{x<Z%>=4iSpvHFzLLBRJo-oT}ofYCaPt^7q&+*KoUROM3jW*{m
z*C?)nIQnE=_#ikJ9)2JA{iH@tQOfu&4FbzK=Nu6~GBD4_{@GVw<ET$O|3B=}VR))?
zeSB-NC)1CLUsWvjC=2Uju8UHx|5}6Wt(Z5o1AR9qc!oUoPyU7K<Jm1WRUfU;t)f%c
VcvnSvp~f`)H^aX#ChNM4{|l6Nt*ih5

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-readobj/elf-versioninfo.test b/test/tools/llvm-readobj/elf-versioninfo.test
new file mode 100644
index 00000000000..3c3d0eefaad
--- /dev/null
+++ b/test/tools/llvm-readobj/elf-versioninfo.test
@@ -0,0 +1,7 @@
+// Test that llvm-readobj dumps version info tags correctly.
+
+RUN: llvm-readobj -dynamic-table %p/Inputs/verdef.elf-x86-64 | FileCheck %s
+
+CHECK: 0x000000006FFFFFF0 VERSYM               0x24C
+CHECK: 0x000000006FFFFFFC VERDEF               0x25C
+CHECK: 0x000000006FFFFFFD VERDEFNUM            3
diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp
index 2f07f47919e..5b4a78cf52f 100644
--- a/tools/llvm-readobj/ELFDumper.cpp
+++ b/tools/llvm-readobj/ELFDumper.cpp
@@ -1244,6 +1244,8 @@ static const char *getTypeString(uint64_t Type) {
   LLVM_READOBJ_TYPE_CASE(SYMENT);
   LLVM_READOBJ_TYPE_CASE(SYMTAB);
   LLVM_READOBJ_TYPE_CASE(TEXTREL);
+  LLVM_READOBJ_TYPE_CASE(VERDEF);
+  LLVM_READOBJ_TYPE_CASE(VERDEFNUM);
   LLVM_READOBJ_TYPE_CASE(VERNEED);
   LLVM_READOBJ_TYPE_CASE(VERNEEDNUM);
   LLVM_READOBJ_TYPE_CASE(VERSYM);
@@ -1378,6 +1380,7 @@ void ELFDumper<ELFT>::printValue(uint64_t Type, uint64_t Value) {
   case DT_FINI_ARRAY:
   case DT_PREINIT_ARRAY:
   case DT_DEBUG:
+  case DT_VERDEF:
   case DT_VERNEED:
   case DT_VERSYM:
   case DT_GNU_HASH:
@@ -1391,6 +1394,7 @@ void ELFDumper<ELFT>::printValue(uint64_t Type, uint64_t Value) {
     OS << format("0x%" PRIX64, Value);
     break;
   case DT_RELCOUNT:
+  case DT_VERDEFNUM:
   case DT_VERNEEDNUM:
   case DT_MIPS_RLD_VERSION:
   case DT_MIPS_LOCAL_GOTNO:
-- 
2.34.1