[PATCH] D44280: [llvm-readobj] Extend the output of -elf-section-groups with the field Link

Alexander Shaposhnikov via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 12 15:42:39 PDT 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rL327341: [llvm-readobj] Extend the output of -elf-section-groups (authored by alexshap, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D44280?vs=137812&id=138099#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D44280

Files:
  llvm/trunk/test/tools/llvm-readobj/broken-group.test
  llvm/trunk/test/tools/llvm-readobj/elf-groups.test
  llvm/trunk/tools/llvm-readobj/ELFDumper.cpp


Index: llvm/trunk/test/tools/llvm-readobj/broken-group.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/broken-group.test
+++ llvm/trunk/test/tools/llvm-readobj/broken-group.test
@@ -20,6 +20,8 @@
 # LLVM-STDOUT-NEXT:   Group {
 # LLVM-STDOUT-NEXT:     Name: .group
 # LLVM-STDOUT-NEXT:     Index: 2
+# LLVM-STDOUT-NEXT:     Link: 5
+# LLVM-STDOUT-NEXT:     Info: 1
 # LLVM-STDOUT-NEXT:     Type: COMDAT
 # LLVM-STDOUT-NEXT:     Signature: bar
 # LLVM-STDOUT-NEXT:     Section(s) in group [
@@ -29,6 +31,8 @@
 # LLVM-STDOUT-NEXT:   Group {
 # LLVM-STDOUT-NEXT:     Name: .group1
 # LLVM-STDOUT-NEXT:     Index: 4
+# LLVM-STDOUT-NEXT:     Link: 5
+# LLVM-STDOUT-NEXT:     Info: 2
 # LLVM-STDOUT-NEXT:     Type: COMDAT
 # LLVM-STDOUT-NEXT:     Signature: zed
 # LLVM-STDOUT-NEXT:     Section(s) in group [
Index: llvm/trunk/test/tools/llvm-readobj/elf-groups.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/elf-groups.test
+++ llvm/trunk/test/tools/llvm-readobj/elf-groups.test
@@ -21,6 +21,8 @@
 CHECK-NEXT:      Group {
 CHECK-NEXT:        Name: .group (92)
 CHECK-NEXT:        Index: 1
+CHECK-NEXT:        Link: 23
+CHECK-NEXT:        Info: 17
 CHECK-NEXT:        Type: COMDAT (0x1)
 CHECK-NEXT:        Signature: _Z3fooIcEvT_
 CHECK-NEXT:        Section(s) in group [
@@ -31,6 +33,8 @@
 CHECK-NEXT:      Group {
 CHECK-NEXT:        Name: .group (92)
 CHECK-NEXT:        Index: 2
+CHECK-NEXT:        Link: 23
+CHECK-NEXT:        Info: 18
 CHECK-NEXT:        Type: COMDAT (0x1)
 CHECK-NEXT:        Signature: _Z3fooIiEvT_
 CHECK-NEXT:        Section(s) in group [
Index: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
===================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
@@ -2482,6 +2482,8 @@
   StringRef Signature;
   uint64_t ShName;
   uint64_t Index;
+  uint32_t Link;
+  uint32_t Info;
   uint32_t Type;
   std::vector<GroupMember> Members;
 };
@@ -2508,7 +2510,14 @@
 
     StringRef Name = unwrapOrError(Obj->getSectionName(&Sec));
     StringRef Signature = StrTable.data() + Sym->st_name;
-    Ret.push_back({Name, Signature, Sec.sh_name, I - 1, Data[0], {}});
+    Ret.push_back({Name, 
+                   Signature, 
+                   Sec.sh_name, 
+                   I - 1,
+                   Sec.sh_link,
+                   Sec.sh_info,
+                   Data[0], 
+                   {}});
 
     std::vector<GroupMember> &GM = Ret.back().Members;
     for (uint32_t Ndx : Data.slice(1)) {
@@ -3780,6 +3789,8 @@
     DictScope D(W, "Group");
     W.printNumber("Name", G.Name, G.ShName);
     W.printNumber("Index", G.Index);
+    W.printNumber("Link", G.Link);
+    W.printNumber("Info", G.Info);
     W.printHex("Type", getGroupType(G.Type), G.Type);
     W.startLine() << "Signature: " << G.Signature << "\n";
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D44280.138099.patch
Type: text/x-patch
Size: 2973 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180312/6f3a000c/attachment.bin>


More information about the llvm-commits mailing list