Skip to content

[llvm-dlltool] Remove the i386 underscore prefix from COFFImportFile::ImportName. NFC. #98226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2024
Merged

[llvm-dlltool] Remove the i386 underscore prefix from COFFImportFile::ImportName. NFC. #98226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions llvm/include/llvm/Object/COFFImportFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,11 @@ struct COFFShortExport {
/// linking both ARM64EC and pure ARM64 objects, and the linker will pick only
/// the exports relevant to the target platform. For non-hybrid targets,
/// the NativeExports parameter should not be used.
Error writeImportLibrary(
StringRef ImportName, StringRef Path, ArrayRef<COFFShortExport> Exports,
COFF::MachineTypes Machine, bool MinGW,
ArrayRef<COFFShortExport> NativeExports = std::nullopt);
Error writeImportLibrary(StringRef ImportName, StringRef Path,
ArrayRef<COFFShortExport> Exports,
COFF::MachineTypes Machine, bool MinGW,
ArrayRef<COFFShortExport> NativeExports = std::nullopt,
bool AddUnderscores = true);

} // namespace object
} // namespace llvm
Expand Down
14 changes: 10 additions & 4 deletions llvm/lib/Object/COFFImportFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,8 @@ NewArchiveMember ObjectFactory::createWeakExternal(StringRef Sym,
Error writeImportLibrary(StringRef ImportName, StringRef Path,
ArrayRef<COFFShortExport> Exports,
MachineTypes Machine, bool MinGW,
ArrayRef<COFFShortExport> NativeExports) {
ArrayRef<COFFShortExport> NativeExports,
bool AddUnderscores) {

MachineTypes NativeMachine = Machine;
if (isArm64EC(Machine)) {
Expand Down Expand Up @@ -691,10 +692,15 @@ Error writeImportLibrary(StringRef ImportName, StringRef Path,
}

if (!E.ImportName.empty() && Name != E.ImportName) {
StringRef Prefix = "";
if (Machine == IMAGE_FILE_MACHINE_I386 && AddUnderscores)
Prefix = "_";

if (ImportType == IMPORT_CODE)
Members.push_back(
OF.createWeakExternal(E.ImportName, Name, false, M));
Members.push_back(OF.createWeakExternal(E.ImportName, Name, true, M));
Members.push_back(OF.createWeakExternal((Prefix + E.ImportName).str(),
Name, false, M));
Members.push_back(OF.createWeakExternal((Prefix + E.ImportName).str(),
Name, true, M));
continue;
}

Expand Down
2 changes: 0 additions & 2 deletions llvm/lib/Object/COFFModuleDefinition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,6 @@ class Parser {
if (Tok.K == EqualEqual) {
read();
E.ImportName = std::string(Tok.Value);
if (AddUnderscores && !isDecorated(E.ImportName, MingwDef))
E.ImportName = std::string("_").append(E.ImportName);
continue;
}
// EXPORTAS must be at the end of export definition
Expand Down
5 changes: 3 additions & 2 deletions llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,9 @@ int llvm::dlltoolDriverMain(llvm::ArrayRef<const char *> ArgsArr) {
}

std::string Path = std::string(Args.getLastArgValue(OPT_l));
if (!Path.empty() && writeImportLibrary(OutputFile, Path, Exports, Machine,
/*MinGW=*/true, NativeExports))
if (!Path.empty() &&
writeImportLibrary(OutputFile, Path, Exports, Machine,
/*MinGW=*/true, NativeExports, AddUnderscores))
return 1;
return 0;
}