Skip to content
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

Jump to bottom

[SOL] Revert to R_BPF_64_32 until support for R_BPF_64_ABS32 added #18

Merged
merged 1 commit into from
Nov 18, 2021
Merged

[SOL] Revert to R_BPF_64_32 until support for R_BPF_64_ABS32 added #18

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
1 change: 1 addition & 0 deletions .github/workflows/lldb-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:

jobs:
build_lldb:
if: false
name: lldb build
runs-on: ${{ matrix.os }}
# Workaround for build faliure on Mac OS X: llvm.org/PR46190, https://github.com/actions/virtual-environments/issues/2274
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ unsigned BPFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
// CALL instruction.
return ELF::R_BPF_64_32;
case FK_Data_8:
return ELF::R_BPF_64_64;
return isSolana ? ELF::R_BPF_64_64 : ELF::R_BPF_64_ABS64;
case FK_Data_4:
if (const MCSymbolRefExpr *A = Target.getSymA()) {
const MCSymbol &Sym = A->getSymbol();
Expand Down Expand Up @@ -94,7 +94,7 @@ unsigned BPFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
}
}
}
return ELF::R_BPF_64_ABS32;
return isSolana ? ELF::R_BPF_64_32 : ELF::R_BPF_64_ABS32;
}
}

Expand Down