Skip to content

[CHERIoT] Clean up detection of CHERIoT in LLD now that we have an ELF flag. #146

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 15, 2025
+1 −36
Merged

[CHERIoT] Clean up detection of CHERIoT in LLD now that we have an ELF flag. #146

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
37 changes: 1 addition & 36 deletions lld/ELF/Relocations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,9 +761,7 @@ static void reportUndefinedSymbol(Ctx &ctx, const UndefinedDiag &undef,

// Provide a spelling-like hint when we fail to resolve a local symbol but
// find a corresponding export in another compartment.
// FIXME: Is there a better way to test for cheriot here?
if (ctx.arg.isCheriAbi && ctx.arg.emachine == EM_RISCV &&
ctx.arg.capabilitySize == 8) {
if (ctx.arg.eflags & EF_RISCV_CHERIOT) {
StringRef SymName = sym.getName();
for (auto GlobalSymbol : ctx.symtab->getSymbols()) {
if (!GlobalSymbol->isGlobal())
Expand Down Expand Up @@ -792,39 +790,6 @@ static void reportUndefinedSymbol(Ctx &ctx, const UndefinedDiag &undef,
}
}

// Provide a spelling-like hint when we fail to resolve a local symbol but
// find a corresponding export in another compartment.
// FIXME: Is there a better way to test for cheriot here?
if (ctx.arg.isCheriAbi && ctx.arg.emachine == EM_RISCV &&
ctx.arg.capabilitySize == 8) {
StringRef SymName = sym.getName();
for (auto GlobalSymbol : ctx.symtab->getSymbols()) {
if (!GlobalSymbol->isGlobal())
continue;
if (!GlobalSymbol->isDefined())
continue;

StringRef GlobalName = GlobalSymbol->getName();
if (!GlobalName.consume_front("__export_"))
continue;
size_t functionNameStart = GlobalName.find("__Z");
if (functionNameStart == StringRef::npos)
continue;

StringRef GlobalCompartmentName =
GlobalName.take_front(functionNameStart);
StringRef GlobalFunctionName = GlobalName.substr(functionNameStart + 1);
if (GlobalFunctionName == SymName) {
msg << "\n>>> did you mean the \"" << toStr(ctx, sym)
<< "\" export from compartment \"" << GlobalCompartmentName
<< "\"?\n"
<< ">>> defined in: " << toStr(ctx, GlobalSymbol->file) << "\n"
<< ">>> the declaration may be missing a compartment annotation";
break;
}
}
}

if (sym.getName().starts_with("_ZTV"))
msg << "\n>>> the vtable symbol may be undefined because the class is "
"missing its key function "
Expand Down