[llvm-dlltool] Respect NONAME keyword

This adds proper handling of the NONAME-keyword, which makes llvm-dlltool
generate an import using the ordinal instead of the name.

Patch by by Jannik Vogel, test added by Stefan Schmidt.

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361367 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Object/COFFImportFile.cpp b/lib/Object/COFFImportFile.cpp
index f821b51a9e1aff930347881fba77fcf8d09b116a..ff4a799be60c77b8b0eec182b15733a2b9eb473e 100644 (file)
--- a/lib/Object/COFFImportFile.cpp
+++ b/lib/Object/COFFImportFile.cpp
@@ -595,7 +595,10 @@ Error writeImportLibrary(StringRef ImportName, StringRef Path,
       ImportType = IMPORT_CONST;
 
     StringRef SymbolName = E.SymbolName.empty() ? E.Name : E.SymbolName;
-    ImportNameType NameType = getNameType(SymbolName, E.Name, Machine, MinGW);
+    ImportNameType NameType = E.Noname
+                                  ? IMPORT_ORDINAL
+                                  : getNameType(SymbolName, E.Name,
+                                                Machine, MinGW);
     Expected<std::string> Name = E.ExtName.empty()
                                      ? SymbolName
                                      : replace(SymbolName, E.Name, E.ExtName);

diff --git a/test/tools/llvm-dlltool/coff-noname.def b/test/tools/llvm-dlltool/coff-noname.def
new file mode 100644 (file)
index 0000000..4bad21f
--- /dev/null
+++ b/test/tools/llvm-dlltool/coff-noname.def
@@ -0,0 +1,14 @@
+; RUN: llvm-dlltool -k -m i386 --input-def %s --output-lib %t.a
+; RUN: llvm-readobj %t.a | FileCheck %s
+
+LIBRARY test.dll
+EXPORTS
+ByOrdinalFunction @ 1 NONAME
+ByNameFunction
+
+; CHECK: Name type: ordinal
+; CHECK: Symbol: __imp__ByOrdinalFunction
+; CHECK: Symbol: _ByOrdinalFunction
+; CHECK: Name type: noprefix
+; CHECK: Symbol: __imp__ByNameFunction
+; CHECK: Symbol: _ByNameFunction