Skip to content

[LLD][COFF] Add support for DLL imports on ARM64EC #141587

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
May 29, 2025
Merged

[LLD][COFF] Add support for DLL imports on ARM64EC #141587

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
11 changes: 11 additions & 0 deletions lld/COFF/InputFiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,6 +1490,17 @@ void DLLFile::parse() {
symtab.addLazyDLLSymbol(this, s, impName);
if (code)
symtab.addLazyDLLSymbol(this, s, symbolName);
if (symtab.isEC()) {
StringRef impAuxName = saver().save("__imp_aux_" + symbolName);
symtab.addLazyDLLSymbol(this, s, impAuxName);

if (code) {
std::optional<std::string> mangledName =
getArm64ECMangledFunctionName(symbolName);
if (mangledName)
symtab.addLazyDLLSymbol(this, s, *mangledName);
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion lld/COFF/SymbolTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ void SymbolTable::addLazyDLLSymbol(DLLFile *f, DLLFile::Symbol *sym,
return;
}
auto *u = dyn_cast<Undefined>(s);
if (!u || u->weakAlias || s->pendingArchiveLoad)
if (!u || (u->weakAlias && !u->isECAlias(machine)) || s->pendingArchiveLoad)
return;
s->pendingArchiveLoad = true;
f->makeImport(sym);
Expand Down
60 changes: 60 additions & 0 deletions lld/test/COFF/link-dll-arm64ec.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
REQUIRES: aarch64, x86
RUN: split-file %s %t.dir && cd %t.dir

RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test.s -o test.obj
RUN: llvm-mc -filetype=obj -triple=arm64ec-windows dll.s -o dll.obj
RUN: llvm-mc -filetype=obj -triple=arm64ec-windows %S/Inputs/loadconfig-arm64ec.s -o loadconfig-arm64ec.obj

RUN: lld-link -machine:arm64ec -dll -noentry -out:import.dll loadconfig-arm64ec.obj dll.obj \
RUN: -export:func -export:func2=func -export:func3=func -export:func4=func \
RUN: -export:data,DATA -noimplib

RUN: lld-link -machine:arm64ec -dll -noentry -out:out.dll loadconfig-arm64ec.obj test.obj import.dll \
RUN: -lldmingw -exclude-all-symbols -auto-import:no

RUN: llvm-readobj --coff-imports out.dll | FileCheck --check-prefix=IMPORTS %s
IMPORTS: Import {
IMPORTS-NEXT: Name: import.dll
IMPORTS-NEXT: ImportLookupTableRVA:
IMPORTS-NEXT: ImportAddressTableRVA:
IMPORTS-NEXT: Symbol: data (0)
IMPORTS-NEXT: Symbol: func (0)
IMPORTS-NEXT: Symbol: func2 (0)
IMPORTS-NEXT: Symbol: func3 (0)
IMPORTS-NEXT: Symbol: func4 (0)
IMPORTS-NEXT: }

#--- test.s
.weak_anti_dep func
.weak_anti_dep "#func"
.set func,"#func"
.set "#func",thunk

.section .test, "r"
.rva __imp_data
.rva func
.rva "#func2"
.rva __imp_aux_func3
.rva __imp_func4

.text
.globl thunk
thunk:
ret

.globl __icall_helper_arm64ec
.p2align 2, 0x0
__icall_helper_arm64ec:
mov w0, #0
ret

#--- dll.s
.text
.globl func
func:
ret

.data
.globl data
data:
.word 0