[PATCH] D41631: [COFF] Keep the underscore on exported decorated stdcall functions
Martin Storsjö via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sat Jan 20 03:47:16 PST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL323035: [COFF] Keep the underscore on exported decorated stdcall functions in MSVC mode (authored by mstorsjo, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D41631?vs=129793&id=130757#toc
Repository:
rL LLVM
https://reviews.llvm.org/D41631
Files:
llvm/trunk/include/llvm/Object/COFFImportFile.h
llvm/trunk/lib/Object/COFFImportFile.cpp
llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
Index: llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
===================================================================
--- llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
+++ llvm/trunk/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
@@ -173,7 +173,7 @@
}
}
- if (writeImportLibrary(Def->OutputFile, Path, Def->Exports, Machine, true))
+ if (writeImportLibrary(Def->OutputFile, Path, Def->Exports, Machine, true, true))
return 1;
return 0;
}
Index: llvm/trunk/lib/Object/COFFImportFile.cpp
===================================================================
--- llvm/trunk/lib/Object/COFFImportFile.cpp
+++ llvm/trunk/lib/Object/COFFImportFile.cpp
@@ -91,7 +91,15 @@
}
static ImportNameType getNameType(StringRef Sym, StringRef ExtName,
- MachineTypes Machine) {
+ MachineTypes Machine, bool MinGW) {
+ // A decorated stdcall function in MSVC is exported with the
+ // type IMPORT_NAME, and the exported function name includes the
+ // the leading underscore. In MinGW on the other hand, a decorated
+ // stdcall function still omits the underscore (IMPORT_NAME_NOPREFIX).
+ // See the comment in isDecorated in COFFModuleDefinition.cpp for more
+ // details.
+ if (ExtName.startswith("_") && ExtName.contains('@') && !MinGW)
+ return IMPORT_NAME;
if (Sym != ExtName)
return IMPORT_NAME_UNDECORATE;
if (Machine == IMAGE_FILE_MACHINE_I386 && Sym.startswith("_"))
@@ -558,7 +566,8 @@
Error writeImportLibrary(StringRef ImportName, StringRef Path,
ArrayRef<COFFShortExport> Exports,
- MachineTypes Machine, bool MakeWeakAliases) {
+ MachineTypes Machine, bool MakeWeakAliases,
+ bool MinGW) {
std::vector<NewArchiveMember> Members;
ObjectFactory OF(llvm::sys::path::filename(ImportName), Machine);
@@ -589,7 +598,7 @@
ImportType = IMPORT_CONST;
StringRef SymbolName = E.SymbolName.empty() ? E.Name : E.SymbolName;
- ImportNameType NameType = getNameType(SymbolName, E.Name, Machine);
+ ImportNameType NameType = getNameType(SymbolName, E.Name, Machine, MinGW);
Expected<std::string> Name = E.ExtName.empty()
? SymbolName
: replace(SymbolName, E.Name, E.ExtName);
Index: llvm/trunk/include/llvm/Object/COFFImportFile.h
===================================================================
--- llvm/trunk/include/llvm/Object/COFFImportFile.h
+++ llvm/trunk/include/llvm/Object/COFFImportFile.h
@@ -98,7 +98,8 @@
Error writeImportLibrary(StringRef ImportName, StringRef Path,
ArrayRef<COFFShortExport> Exports,
- COFF::MachineTypes Machine, bool MakeWeakAliases);
+ COFF::MachineTypes Machine, bool MakeWeakAliases,
+ bool MinGW);
} // namespace object
} // namespace llvm
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41631.130757.patch
Type: text/x-patch
Size: 3015 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180120/8dffa2f9/attachment.bin>
More information about the llvm-commits
mailing list