Support reading GNU symbol versions in ELFObjectFile

tools/llvm-readobj/llvm-readobj.cpp

 //===- llvm-readobj.cpp - Dump contents of an Object File -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This program is a utility that works like traditional Unix "readelf",
 // except that it can handle any type of object file recognized by lib/Object.
 //
 // It makes use of the generic ObjectFile interface.
 //
 // Caution: This utility is new, experimental, unsupported, and incomplete.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Object/ObjectFile.h"
+#include "llvm/Object/ELF.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/FormattedStream.h"
 
 using namespace llvm;
@@ skipping 41 matching lines @@
   if (Flags & SymbolRef::SF_FormatSpecific)
     result += "formatspecific,";
 
   // Remove trailing comma
   if (result.size() > 0) {
     result.erase(result.size() - 1);
   }
   return result;
 }
 
-void DumpSymbol(const SymbolRef &sym) {
+void DumpSymbol(const SymbolRef &Sym, const ObjectFile *obj, bool IsDynamic) {
     StringRef Name;
     SymbolRef::Type Type;
     uint32_t Flags;
     uint64_t Address;
     uint64_t Size;
     uint64_t FileOffset;
-    sym.getName(Name);
-    sym.getAddress(Address);
-    sym.getSize(Size);
-    sym.getFileOffset(FileOffset);
-    sym.getType(Type);
-    sym.getFlags(Flags);
+    Sym.getName(Name);
+    Sym.getAddress(Address);
+    Sym.getSize(Size);
+    Sym.getFileOffset(FileOffset);
+    Sym.getType(Type);
+    Sym.getFlags(Flags);
+    std::string FullName = Name;
+
+    // If this is a dynamic symbol from an ELF object, append
+    // the symbol's version to the name.
+    if (IsDynamic && obj->isELF()) {
+      StringRef Version;
+      bool IsDefault;
+      GetELFSymbolVersion(obj, Sym, Version, IsDefault);
+      if (!Version.empty()) {
+        FullName += (IsDefault ? "@@" : "@");
+        FullName += Version;
+      }
+    }
 
     // format() can't handle StringRefs
-    outs() << format("  %-32s", Name.str().c_str())
+    outs() << format("  %-32s", FullName.c_str())
            << format("  %-4s", GetTypeStr(Type))
            << format("  %16"PRIx64, Address)
            << format("  %16"PRIx64, Size)
            << format("  %16"PRIx64, FileOffset)
            << "  " << GetFlagStr(Flags)
            << "\n";
 }
 
 
 // Iterate through the normal symbols in the ObjectFile
 void DumpSymbols(const ObjectFile *obj) {
   error_code ec;
   uint32_t count = 0;
   outs() << "Symbols:\n";
   symbol_iterator it = obj->begin_symbols();
   symbol_iterator ie = obj->end_symbols();
   while (it != ie) {
-    DumpSymbol(*it);
+    DumpSymbol(*it, obj, false);
     it.increment(ec);
     if (ec)
       report_fatal_error("Symbol iteration failed");
     ++count;
   }
   outs() << "  Total: " << count << "\n\n";
 }
 
 // Iterate through the dynamic symbols in the ObjectFile.
 void DumpDynamicSymbols(const ObjectFile *obj) {
   error_code ec;
   uint32_t count = 0;
   outs() << "Dynamic Symbols:\n";
   symbol_iterator it = obj->begin_dynamic_symbols();
   symbol_iterator ie = obj->end_dynamic_symbols();
   while (it != ie) {
-    DumpSymbol(*it);
+    DumpSymbol(*it, obj, true);
     it.increment(ec);
     if (ec)
       report_fatal_error("Symbol iteration failed");
     ++count;
   }
   outs() << "  Total: " << count << "\n\n";
 }
 
 void DumpLibrary(const LibraryRef &lib) {
   StringRef path;
@@ skipping 53 matching lines @@
     errs() << InputFilename << ": Object type not recognized\n";
   }
 
   DumpHeaders(obj);
   DumpSymbols(obj);
   DumpDynamicSymbols(obj);
   DumpLibrariesNeeded(obj);
   return 0;
 }