From fe9ce427d076627beed834d5c322e61323dfd1fc Mon Sep 17 00:00:00 2001
From: Simon Atanasyan <simon@atanasyan.com>
Date: Mon, 11 Nov 2013 20:51:48 +0000
Subject: [PATCH] Add support for DT_VERxxx and DT_MIPS_xxx .dynamic section
 entries to the llvm-readobj.

The patch reviewed by Michael Spencer.
http://llvm-reviews.chandlerc.com/D2113

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194421 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../tools/llvm-readobj/Inputs/dynamic-table.c |   7 ++++
 .../llvm-readobj/Inputs/dynamic-table.mips    | Bin 0 -> 5395 bytes
 test/tools/llvm-readobj/dynamic.test          |  33 ++++++++++++++++++
 tools/llvm-readobj/ELFDumper.cpp              |  22 ++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 test/tools/llvm-readobj/Inputs/dynamic-table.c
 create mode 100644 test/tools/llvm-readobj/Inputs/dynamic-table.mips
 create mode 100644 test/tools/llvm-readobj/dynamic.test

diff --git a/test/tools/llvm-readobj/Inputs/dynamic-table.c b/test/tools/llvm-readobj/Inputs/dynamic-table.c
new file mode 100644
index 00000000000..6d36e8a7118
--- /dev/null
+++ b/test/tools/llvm-readobj/Inputs/dynamic-table.c
@@ -0,0 +1,7 @@
+// clang -target mipsel-linux-gnu -shared -fPIC -lc dynamic-table.c \
+//       -o dynamic-table.mips
+int puts(const char *);
+
+void foo(void) {
+  puts("Hello, World");
+}
diff --git a/test/tools/llvm-readobj/Inputs/dynamic-table.mips b/test/tools/llvm-readobj/Inputs/dynamic-table.mips
new file mode 100644
index 0000000000000000000000000000000000000000..ab36ceeb5a00197c3d4fdeade13337d93f21f180
GIT binary patch
literal 5395
zcmb7IYiwLs5uV-aBo2gf?Kt3oq3d+9jYzK?H+@9-$HtGm<Rm6>Y4ZbJ@5}b0eX)C8
zC4j`nsYE2KZb>RcL<OY+HHfMXL8wAXQma8Cf(R_ZkMIM@{7R5ODiSY=(B=E?xwCui
zCaIWYJZH|CGc#w-V`uKy#wYegA`wxrq+Q4@ZxGoHn)!gpCR@t8B_<nXKt3TKqiFf>
z_@mg3HnA<hmNs+%mfH<NB_Lw-`+X6NMI?jX8gL_!<5Bz_gc8M7@Wf3(wXp@`igEN4
zbqvk>LLhT_y}-)Zh(Esz0~T=qk*DSSllf~e-TbBZ`|Ed}E!_U0xA9olyIk8#z%9T5
zEa*d^(^w1j+Hjm}yafeZ%SG@ApWFt15NHFbdlhT$0PTiwXVAYD6lxfoGHqa}%s4<#
z8H9Su)P;Fv%3@xbJArnYKD^s#l<vTZ1}Nvh1G-G7{!gG^)X#O$K5bGzecue^ItW|`
zV?dv|FPvxgPvpaBhk<K+5QN=)=s|+(#u$Hs1uuUF8sE&7)7LI}9F+S)=)?-%0A<_>
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
D70xj)

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-readobj/dynamic.test b/test/tools/llvm-readobj/dynamic.test
new file mode 100644
index 00000000000..78a9b3bd937
--- /dev/null
+++ b/test/tools/llvm-readobj/dynamic.test
@@ -0,0 +1,33 @@
+RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table.mips \
+RUN:     | FileCheck %s -check-prefix ELF-MIPS
+
+ELF-MIPS: Format: ELF32-mips
+ELF-MIPS: Arch: mipsel
+ELF-MIPS: AddressSize: 32bit
+ELF-MIPS: LoadName:
+ELF-MIPS: DynamicSection [ (23 entries)
+ELF-MIPS:   Tag        Type                 Name/Value
+ELF-MIPS:   0x00000001 NEEDED               SharedLibrary (libc.so.6)
+ELF-MIPS:   0x0000000C INIT                 0x528
+ELF-MIPS:   0x0000000D FINI                 0x860
+ELF-MIPS:   0x00000004 HASH                 0x210
+ELF-MIPS:   0x00000005 STRTAB               0x3D8
+ELF-MIPS:   0x00000006 SYMTAB               0x2A8
+ELF-MIPS:   0x0000000A STRSZ                231 (bytes)
+ELF-MIPS:   0x0000000B SYMENT               16 (bytes)
+ELF-MIPS:   0x00000003 PLTGOT               0x108E0
+ELF-MIPS:   0x00000011 REL                  0x518
+ELF-MIPS:   0x00000012 RELSZ                16 (bytes)
+ELF-MIPS:   0x00000013 RELENT               8 (bytes)
+ELF-MIPS:   0x70000001 MIPS_RLD_VERSION     1
+ELF-MIPS:   0x70000005 MIPS_FLAGS           0x2
+ELF-MIPS:   0x70000006 MIPS_BASE_ADDRESS    0x0
+ELF-MIPS:   0x7000000A MIPS_LOCAL_GOTNO     10
+ELF-MIPS:   0x70000011 MIPS_SYMTABNO        19
+ELF-MIPS:   0x70000012 MIPS_UNREFEXTNO      26
+ELF-MIPS:   0x70000013 MIPS_GOTSYM          0xD
+ELF-MIPS:   0x6FFFFFFE VERNEED              0x4E8
+ELF-MIPS:   0x6FFFFFFF VERNEEDNUM           1
+ELF-MIPS:   0x6FFFFFF0 VERSYM               0x4C0
+ELF-MIPS:   0x00000000 NULL                 0x0
+ELF-MIPS: ]
diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp
index f384824d5ed..07a9083f3c8 100644
--- a/tools/llvm-readobj/ELFDumper.cpp
+++ b/tools/llvm-readobj/ELFDumper.cpp
@@ -683,6 +683,16 @@ 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(VERNEED);
+  LLVM_READOBJ_TYPE_CASE(VERNEEDNUM);
+  LLVM_READOBJ_TYPE_CASE(VERSYM);
+  LLVM_READOBJ_TYPE_CASE(MIPS_RLD_VERSION);
+  LLVM_READOBJ_TYPE_CASE(MIPS_FLAGS);
+  LLVM_READOBJ_TYPE_CASE(MIPS_BASE_ADDRESS);
+  LLVM_READOBJ_TYPE_CASE(MIPS_LOCAL_GOTNO);
+  LLVM_READOBJ_TYPE_CASE(MIPS_SYMTABNO);
+  LLVM_READOBJ_TYPE_CASE(MIPS_UNREFEXTNO);
+  LLVM_READOBJ_TYPE_CASE(MIPS_GOTSYM);
   default: return "unknown";
   }
 }
@@ -715,9 +725,21 @@ static void printValue(const ELFFile<ELFT> *O, uint64_t Type, uint64_t Value,
   case DT_FINI_ARRAY:
   case DT_PREINIT_ARRAY:
   case DT_DEBUG:
+  case DT_VERNEED:
+  case DT_VERSYM:
   case DT_NULL:
+  case DT_MIPS_FLAGS:
+  case DT_MIPS_BASE_ADDRESS:
+  case DT_MIPS_GOTSYM:
     OS << format("0x%" PRIX64, Value);
     break;
+  case DT_VERNEEDNUM:
+  case DT_MIPS_RLD_VERSION:
+  case DT_MIPS_LOCAL_GOTNO:
+  case DT_MIPS_SYMTABNO:
+  case DT_MIPS_UNREFEXTNO:
+    OS << Value;
+    break;
   case DT_PLTRELSZ:
   case DT_RELASZ:
   case DT_RELAENT:
-- 
2.34.1