diff options
| author | Martin Storsjo <martin@martin.st> | 2019-05-22 09:49:54 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-05-22 09:49:54 +0000 |
| commit | de6038b26507ee962b0dfd8835133b12658dc2aa (patch) | |
| tree | 1665732403f7246b3930ea463cd32fd4bfb7978b /llvm | |
| parent | f8f93ba90d2672bf2f469b476ee2e1ff426baa30 (diff) | |
| download | bcm5719-llvm-de6038b26507ee962b0dfd8835133b12658dc2aa.tar.gz bcm5719-llvm-de6038b26507ee962b0dfd8835133b12658dc2aa.zip | |
[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
llvm-svn: 361367
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Object/COFFImportFile.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-dlltool/coff-noname.def | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/llvm/lib/Object/COFFImportFile.cpp b/llvm/lib/Object/COFFImportFile.cpp index f821b51a9e1..ff4a799be60 100644 --- a/llvm/lib/Object/COFFImportFile.cpp +++ b/llvm/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/llvm/test/tools/llvm-dlltool/coff-noname.def b/llvm/test/tools/llvm-dlltool/coff-noname.def new file mode 100644 index 00000000000..4bad21fc9ce --- /dev/null +++ b/llvm/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 |
