Skip to content

Commit ee79800

Browse files
committed
Address review comments
1 parent 17a43f9 commit ee79800

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

lld/COFF/Driver.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,10 @@ void LinkerDriver::setMachine(MachineTypes machine) {
659659
if (!isArm64EC(machine)) {
660660
ctx.symtab.machine = machine;
661661
} else {
662+
// Set up a hybrid symbol table on ARM64EC/ARM64X. This is primarily useful
663+
// on ARM64X, where both the native and EC symbol tables are meaningful.
664+
// However, since ARM64EC can include native object files, we also need to
665+
// support a hybrid symbol table there.
662666
ctx.symtab.machine = ARM64EC;
663667
ctx.hybridSymtab.emplace(ctx, ARM64);
664668
}
@@ -2551,6 +2555,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
25512555
for (auto *s : lto::LTO::getRuntimeLibcallSymbols(TT))
25522556
symtab.addLibcall(s);
25532557
}
2558+
25542559
// Windows specific -- if __load_config_used can be resolved, resolve
25552560
// it.
25562561
if (symtab.findUnderscore("_load_config_used"))

0 commit comments

Comments
 (0)