From b9556857d86b0f7be692e2c6f3991499d848d599 Mon Sep 17 00:00:00 2001
From: Sean Fertile <sfertile@ca.ibm.com>
Date: Fri, 13 Apr 2018 16:42:48 +0000
Subject: [PATCH] Add PPC64_GLINK dynamic tag.

Add support for the PPC64_GLINK dynamic tag which is used in the ElfV2 abi.

Differential Revision: https://reviews.llvm.org/D45574

llvm-svn: 330038
---
 include/llvm/BinaryFormat/DynamicTags.def |  15 +++++++++++++++
 test/tools/llvm-readobj/Inputs/ppc64.exe  | Bin 0 -> 69520 bytes
 test/tools/llvm-readobj/ppc64-glink.test  |  11 +++++++++++
 tools/llvm-readobj/ELFDumper.cpp          |  12 ++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100755 test/tools/llvm-readobj/Inputs/ppc64.exe
 create mode 100644 test/tools/llvm-readobj/ppc64-glink.test

diff --git a/include/llvm/BinaryFormat/DynamicTags.def b/include/llvm/BinaryFormat/DynamicTags.def
index c39f38a0c30..34c888d2759 100644
--- a/include/llvm/BinaryFormat/DynamicTags.def
+++ b/include/llvm/BinaryFormat/DynamicTags.def
@@ -16,6 +16,11 @@
 #define MIPS_DYNAMIC_TAG_DEFINED
 #endif
 
+#ifndef PPC64_DYNAMIC_TAG
+#define PPC64_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value)
+#define PPC64_DYNAMIC_TAG_DEFINED
+#endif
+
 #ifndef DYNAMIC_TAG_MARKER
 #define DYNAMIC_TAG_MARKER(name, value) DYNAMIC_TAG(name, value)
 #define DYNAMIC_TAG_MARKER_DEFINED
@@ -171,6 +176,10 @@ MIPS_DYNAMIC_TAG(MIPS_RWPLT, 0x70000034)        // Points to the base
 MIPS_DYNAMIC_TAG(MIPS_RLD_MAP_REL, 0x70000035)  // Relative offset of run time loader
                                                 // map, used for debugging.
 
+// PPC64 specific dynamic table entries.
+PPC64_DYNAMIC_TAG(PPC64_GLINK, 0x70000000) // Address of 32 bytes before the
+                                           // first glink lazy resolver stub.
+
 // Sun machine-independent extensions.
 DYNAMIC_TAG(AUXILIARY, 0x7FFFFFFD) // Shared object to load before self
 DYNAMIC_TAG(FILTER, 0x7FFFFFFF)    // Shared object to get values from
@@ -181,7 +190,13 @@ DYNAMIC_TAG(FILTER, 0x7FFFFFFF)    // Shared object to get values from
 #endif
 #ifdef MIPS_DYNAMIC_TAG_DEFINED
 #undef MIPS_DYNAMIC_TAG
+#undef MIPS_DYNAMIC_TAG_DEFINED
 #endif
 #ifdef HEXAGON_DYNAMIC_TAG_DEFINED
 #undef HEXAGON_DYNAMIC_TAG
+#undef HEXAGON_DYNAMIC_TAG_DEFINED
+#endif
+#ifdef PPC64_DYNAMIC_TAG_DEFINED
+#undef PPC64_DYNAMIC_TAG
+#undef PPC64_DYNAMIC_TAG_DEFINED
 #endif
diff --git a/test/tools/llvm-readobj/Inputs/ppc64.exe b/test/tools/llvm-readobj/Inputs/ppc64.exe
new file mode 100755
index 0000000000000000000000000000000000000000..0db6147ca70aa4ef0605f683e391efb0566f1833
GIT binary patch
literal 69520
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

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-readobj/ppc64-glink.test b/test/tools/llvm-readobj/ppc64-glink.test
new file mode 100644
index 00000000000..9602a5af8ed
--- /dev/null
+++ b/test/tools/llvm-readobj/ppc64-glink.test
@@ -0,0 +1,11 @@
+# Check DT_PPC64_GLINK dynamic tag.
+
+RUN: llvm-readobj -dynamic-table %p/Inputs/ppc64.exe | FileCheck %s
+
+CHECK: Format: ELF64-ppc64
+CHECK: Arch: powerpc64le
+CHECK: AddressSize: 64bit
+
+CHECK:      DynamicSection [ (25 entries)
+CHECK-NEXT:   Tag                Type                 Name/Value
+CHECK:        0x0000000070000000 PPC64_GLINK          0x10000830
diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp
index 6ad9d07f7c2..0adacf9bf5b 100644
--- a/tools/llvm-readobj/ELFDumper.cpp
+++ b/tools/llvm-readobj/ELFDumper.cpp
@@ -1551,6 +1551,7 @@ static const char *getTypeString(unsigned Arch, uint64_t Type) {
 #include "llvm/BinaryFormat/DynamicTags.def"
 #undef HEXAGON_DYNAMIC_TAG
     }
+
   case EM_MIPS:
     switch (Type) {
 #define MIPS_DYNAMIC_TAG(name, value)                                          \
@@ -1559,12 +1560,22 @@ static const char *getTypeString(unsigned Arch, uint64_t Type) {
 #include "llvm/BinaryFormat/DynamicTags.def"
 #undef MIPS_DYNAMIC_TAG
     }
+
+    case EM_PPC64:
+      switch(Type) {
+#define PPC64_DYNAMIC_TAG(name, value)                                         \
+    case DT_##name:                                                            \
+      return #name;
+#include "llvm/BinaryFormat/DynamicTags.def"
+#undef PPC64_DYNAMIC_TAG
+    }
   }
 #undef DYNAMIC_TAG
   switch (Type) {
 // Now handle all dynamic tags except the architecture specific ones
 #define MIPS_DYNAMIC_TAG(name, value)
 #define HEXAGON_DYNAMIC_TAG(name, value)
+#define PPC64_DYNAMIC_TAG(name, value)
 // Also ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc.
 #define DYNAMIC_TAG_MARKER(name, value)
 #define DYNAMIC_TAG(name, value)                                               \
@@ -1574,6 +1585,7 @@ static const char *getTypeString(unsigned Arch, uint64_t Type) {
 #undef DYNAMIC_TAG
 #undef MIPS_DYNAMIC_TAG
 #undef HEXAGON_DYNAMIC_TAG
+#undef PPC64_DYNAMIC_TAG
 #undef DYNAMIC_TAG_MARKER
   default: return "unknown";
   }