From 3780b3a9eb6a51ab2ced55bda20b315d7817221d Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 18 Aug 2016 14:32:11 +0000
Subject: [PATCH] llvm-readobj: handle import libraries with -coff-exports

`link -dump -exports` lists exported symbols from import libraries as well as
normal dlls.  Ensure that we can handle import libraries as well in
llvm-readobj.

llvm-svn: 279069
---
 llvm/test/tools/llvm-readobj/Inputs/library.lib    | Bin 0 -> 2166 bytes
 .../tools/llvm-readobj/coff-exports-implib.test    |  22 +++++++++++++++++++++
 llvm/tools/llvm-readobj/llvm-readobj.cpp           |   2 ++
 3 files changed, 24 insertions(+)
 create mode 100755 llvm/test/tools/llvm-readobj/Inputs/library.lib
 create mode 100644 llvm/test/tools/llvm-readobj/coff-exports-implib.test

diff --git a/llvm/test/tools/llvm-readobj/Inputs/library.lib b/llvm/test/tools/llvm-readobj/Inputs/library.lib
new file mode 100755
index 0000000000000000000000000000000000000000..193380dd4858ce8cf4cc02298eeb4678a31f83ad
GIT binary patch
literal 2166
zcmcIm&2G~`5dQ4^;vy7<pBs{qDgl>}I1V8af`k?+QQfpkQz2EVoHU`-QW{rjdf>zh
zaOg{L>74_&z5oX*@c{Hi%8b1mJE18_3oGs4?5t<z+iz$6=w*A**?Xlu)5lBBEauEo
zF>B<<<ykQ`a&pwt08mx4Ky(X;9RrCIQL8}w+^@+LkWATjZFPOE(X^M}ZY(uw>&>->
z-E(#Z?ZHRbc74;b{#3vxq2aGLtDE%|d%4oA&<<z+z_xdf`kkTU_7NKSE8X_6Ewwss
z|8Usu4`Bx*U&|eIoqoFqTMp(%!!QIcEiFNCWL01*3LM9P6B1OZp2vYy(t`>LRKyWO
z6bb6NjgXhuKt=#C8BjRv0Gx?ngH3^o1Yj!S;v_QNUe5#RZ#*$el0YrZQX+W0^!43>
zLQEi(s3@84`<<f?iyQtFsL<fEoQS@R)SHaMF)bQ$=^hQfQ~f0b5$emxo(jF^LX6uq
zxS%TaSYC#HN(Y2AZt)Zgp`ae)Zi-KkzsKbc)wAvNs?!;`hwkoBf6{oWTebR%w>r_V
zG2X}@pv&Nmi1l>PEDKpdx#R91kgsRkigH2z`Q~^B7j{mC47m(=?(Rv67aZ@1NQuch
zB)~|g5J*_Ab0Z3W9Vm$zcPbjxUW<TJiK2zVorx(%A;>6}qIyjE<~heMUe1)Rw-huX
zrsSoRnes(WM9)n5FASLFTpyAXQ&ZjCs1;v~GLO7pKgoc9$d{vb#r-NspqPq$zrrPS
zzf37-y&rNS`hSY<tcXq};=G8OGL`H6vhn4#6wX=?yy&#h>k;~L_;Sz0_Pji{2`g!`
oqEKG4y%c^E3s=RVQvMCz${Sh9$^V0KwC+<J%#G2L8aAT+26YIq(*OVf

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-readobj/coff-exports-implib.test b/llvm/test/tools/llvm-readobj/coff-exports-implib.test
new file mode 100644
index 0000000..9715109
--- /dev/null
+++ b/llvm/test/tools/llvm-readobj/coff-exports-implib.test
@@ -0,0 +1,22 @@
+RUN: llvm-readobj -coff-exports %p/Inputs/library.lib | FileCheck %s
+
+CHECK: File: library.dll
+CHECK: Format: COFF-import-file
+CHECK: Type: const
+CHECK: Symbol: __imp__constant
+
+CHECK: File: library.dll
+CHECK: Format: COFF-import-file
+CHECK: Type: data
+CHECK: Symbol: __imp__data
+
+CHECK: File: library.dll
+CHECK: Format: COFF-import-file
+CHECK: Type: code
+CHECK: Symbol: __imp__function
+
+CHECK: File: library.dll
+CHECK: Format: COFF-import-file
+CHECK: Type: code
+CHECK: Symbol: __imp__ordinal
+
diff --git a/llvm/tools/llvm-readobj/llvm-readobj.cpp b/llvm/tools/llvm-readobj/llvm-readobj.cpp
index 14178b9..d811ea9 100644
--- a/llvm/tools/llvm-readobj/llvm-readobj.cpp
+++ b/llvm/tools/llvm-readobj/llvm-readobj.cpp
@@ -460,6 +460,8 @@ static void dumpArchive(const Archive *Arc) {
     }
     if (ObjectFile *Obj = dyn_cast<ObjectFile>(&*ChildOrErr.get()))
       dumpObject(Obj);
+    else if (COFFImportFile *Imp = dyn_cast<COFFImportFile>(&*ChildOrErr.get()))
+      dumpCOFFImportFile(Imp);
     else
       reportError(Arc->getFileName(), readobj_error::unrecognized_file_format);
   }
-- 
2.7.4