[llvm] e799405 - [llvm-objdump] --syms: print 'i' for STT_GNU_IFUNC

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2020-03-13T08:02:36-07:00
New Revision: e799405e5368033d602f531fcebb81229471cec0

URL: https://github.com/llvm/llvm-project/commit/e799405e5368033d602f531fcebb81229471cec0
DIFF: https://github.com/llvm/llvm-project/commit/e799405e5368033d602f531fcebb81229471cec0.diff

LOG: [llvm-objdump] --syms: print 'i' for STT_GNU_IFUNC

Reviewed By: grimar, Higuoxing, jhenderson

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

Added: 
    

Modified: 
    llvm/test/tools/llvm-objdump/ELF/symbol-table.test
    llvm/tools/llvm-objdump/llvm-objdump.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-objdump/ELF/symbol-table.test b/llvm/test/tools/llvm-objdump/ELF/symbol-table.test
index ef8fe0bb194d..8e622bac92ea 100644
--- a/llvm/test/tools/llvm-objdump/ELF/symbol-table.test
+++ b/llvm/test/tools/llvm-objdump/ELF/symbol-table.test
@@ -15,7 +15,7 @@
 # CHECK-NEXT:0000000000000000 g     F .text	000000000000000f func
 # CHECK-NEXT:0000000000000000 g     O *COM*	0000000000000000 common
 # CHECK-NEXT:0000000000000000 g     O .data	0000000000000000 tls
-# CHECK-NEXT:0000000000000000 g       .text	0000000000000000 ifunc
+# CHECK-NEXT:0000000000000000 g   i   .text	0000000000000000 ifunc
 # CHECK-NEXT:0000000000000000 g       .text	0000000000000000 invalid_type
 # CHECK-NEXT:0000000000000000 g       .text	0000000000000000 STT_HIOS
 # CHECK-NEXT:0000000000000000 g       .text	0000000000000000 STT_LOPROC

diff  --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index fb3cdfbd4806..e24944287000 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -1899,6 +1899,11 @@ void printSymbolTable(const ObjectFile *O, StringRef ArchiveName,
     char GlobLoc = ' ';
     if ((Section != O->section_end() || Absolute) && !Weak)
       GlobLoc = Global ? 'g' : 'l';
+    char IFunc = ' ';
+    if (auto *ELF = dyn_cast<ELFObjectFileBase>(O)) {
+      if (ELFSymbolRef(*I).getELFType() == ELF::STT_GNU_IFUNC)
+        IFunc = 'i';
+    }
     char Debug = (Type == SymbolRef::ST_Debug || Type == SymbolRef::ST_File)
                  ? 'd' : ' ';
     char FileFunc = ' ';
@@ -1917,7 +1922,7 @@ void printSymbolTable(const ObjectFile *O, StringRef ArchiveName,
            << (Weak ? 'w' : ' ') // Weak?
            << ' ' // Constructor. Not supported yet.
            << ' ' // Warning. Not supported yet.
-           << ' ' // Indirect reference to another symbol.
+           << IFunc
            << Debug // Debugging (d) or dynamic (D) symbol.
            << FileFunc // Name of function (F), file (f) or object (O).
            << ' ';