Skip to content

Account for GOT VariantKind on osx-arm64 #185

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
MichalStrehovsky merged 1 commit into from
Sep 9, 2022
Merged

Account for GOT VariantKind on osx-arm64 #185

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
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
# as most of those are useless.
#==============================================================================#

# Tool Runtime Dir
.dotnet

# Build results
artifacts

#==============================================================================#
# File extensions to be ignored anywhere in the tree.
#==============================================================================#
Expand Down
50 changes: 47 additions & 3 deletions llvm/tools/objwriter/objwriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ void ObjectWriter::SwitchSection(const char *SectionName,
assert(!Section->getBeginSymbol());
// Output a DWARF linker-local symbol.
// This symbol is used as a base for other symbols in a section.
MCSymbol *SectionStartSym = OutContext->createTempSymbol();
MCSymbol *SectionStartSym = OutContext->createLinkerPrivateTempSymbol();
Streamer->emitLabel(SectionStartSym);
Section->setBeginSymbol(SectionStartSym);
}
Expand Down Expand Up @@ -444,6 +444,25 @@ int ObjectWriter::EmitSymbolRef(const char *SymbolName,
Size = 8;
break;
case RelocType::IMAGE_REL_BASED_REL32:
if (ObjFileInfo->getObjectFileType() == ObjFileInfo->IsMachO &&
ObjFileInfo->getTargetTriple().getArch() == Triple::aarch64) {
MCSymbol *TempSymbol = OutContext->createTempSymbol();
Streamer->emitLabel(TempSymbol);
const MCExpr *TargetExpr = MCSymbolRefExpr::create(Symbol, Kind, *OutContext);
const MCSymbolRefExpr *SectionExpr = MCSymbolRefExpr::create(TempSymbol, Kind, *OutContext);
TargetExpr = MCBinaryExpr::createSub(
TargetExpr, SectionExpr, *OutContext);
// If the fixup is pc-relative, we need to bias the value to be relative to
// the start of the field, not the end of the field
TargetExpr = MCBinaryExpr::createSub(
TargetExpr, MCConstantExpr::create(4, *OutContext), *OutContext);
if (Delta != 0) {
TargetExpr = MCBinaryExpr::createAdd(
TargetExpr, MCConstantExpr::create(Delta, *OutContext), *OutContext);
}
Streamer->emitValueImpl(TargetExpr, 4, SMLoc(), false);
return 4;
}
Size = 4;
IsPCRel = true;
if (ObjFileInfo->getObjectFileType() == ObjFileInfo->IsELF) {
Expand All @@ -453,6 +472,21 @@ int ObjectWriter::EmitSymbolRef(const char *SymbolName,
}
break;
case RelocType::IMAGE_REL_BASED_RELPTR32:
if (ObjFileInfo->getObjectFileType() == ObjFileInfo->IsMachO &&
ObjFileInfo->getTargetTriple().getArch() == Triple::aarch64) {
MCSymbol *TempSymbol = OutContext->createTempSymbol();
Streamer->emitLabel(TempSymbol);
const MCExpr *TargetExpr = MCSymbolRefExpr::create(Symbol, Kind, *OutContext);
const MCSymbolRefExpr *SectionExpr = MCSymbolRefExpr::create(TempSymbol, Kind, *OutContext);
TargetExpr = MCBinaryExpr::createSub(
TargetExpr, SectionExpr, *OutContext);
if (Delta != 0) {
TargetExpr = MCBinaryExpr::createAdd(
TargetExpr, MCConstantExpr::create(Delta, *OutContext), *OutContext);
}
Streamer->emitValueImpl(TargetExpr, 4, SMLoc(), false);
return 4;
}
Size = 4;
IsPCRel = true;
Delta += 4;
Expand All @@ -475,13 +509,19 @@ int ObjectWriter::EmitSymbolRef(const char *SymbolName,
return 4;
}
case RelocType::IMAGE_REL_BASED_ARM64_PAGEBASE_REL21: {
if (ObjFileInfo->getObjectFileType() == ObjFileInfo->IsMachO) {
Kind = MCSymbolRefExpr::VK_PAGE;
}
const MCExpr *TargetExpr = GenTargetExpr(Symbol, Kind, Delta);
TargetExpr =
AArch64MCExpr::create(TargetExpr, AArch64MCExpr::VK_CALL, *OutContext);
EmitRelocDirective(GetDFSize(), "R_AARCH64_ADR_PREL_PG_HI21", TargetExpr);
return 4;
}
case RelocType::IMAGE_REL_BASED_ARM64_PAGEOFFSET_12A: {
if (ObjFileInfo->getObjectFileType() == ObjFileInfo->IsMachO) {
Kind = MCSymbolRefExpr::VK_PAGEOFF;
}
const MCExpr *TargetExpr = GenTargetExpr(Symbol, Kind, Delta);
TargetExpr =
AArch64MCExpr::create(TargetExpr, AArch64MCExpr::VK_LO12, *OutContext);
Expand Down Expand Up @@ -560,8 +600,12 @@ void ObjectWriter::EmitCFILsda(const char *LsdaBlobSymbolName) {
// Create symbol reference
MCSymbol *T = OutContext->getOrCreateSymbol(LsdaBlobSymbolName);
Assembler->registerSymbol(*T);
Streamer->emitCFILsda(T, llvm::dwarf::Constants::DW_EH_PE_pcrel |
llvm::dwarf::Constants::DW_EH_PE_sdata4);
if (ObjFileInfo->getObjectFileType() == ObjFileInfo->IsMachO) {
Streamer->emitCFILsda(T, llvm::dwarf::Constants::DW_EH_PE_pcrel);
} else {
Streamer->emitCFILsda(T, llvm::dwarf::Constants::DW_EH_PE_pcrel |
llvm::dwarf::Constants::DW_EH_PE_sdata4);
}
}

void ObjectWriter::EmitCFICode(int Offset, const char *Blob) {
Expand Down