RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 18:42:46 +02:00
Code Issues Projects Releases Wiki Activity

[llvm-dlltool] Respect NONAME keyword

Browse Source 
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
This commit is contained in:
Martin Storsjo 2019-05-22 09:49:54 +00:00
parent dd590dff43
commit 400d5be82b
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Object/COFFImportFile.cpp
View File

@ -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);

14
test/tools/llvm-dlltool/coff-noname.def Normal file
View File

@ -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