Skip to content

Commit d9d227e

Browse files
committed
[SOL] Revert to R_BPF_64_32 until support for R_BPF_64_ABS32 added
1 parent 9743d18 commit d9d227e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/lldb-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818

1919
jobs:
2020
build_lldb:
21+
if: false
2122
name: lldb build
2223
runs-on: ${{ matrix.os }}
2324
# Workaround for build faliure on Mac OS X: llvm.org/PR46190, https://github.com/actions/virtual-environments/issues/2274

llvm/lib/Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ unsigned BPFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
6464
// CALL instruction.
6565
return ELF::R_BPF_64_32;
6666
case FK_Data_8:
67-
return ELF::R_BPF_64_64;
67+
return isSolana ? ELF::R_BPF_64_64 : ELF::R_BPF_64_ABS64;
6868
case FK_Data_4:
6969
if (const MCSymbolRefExpr *A = Target.getSymA()) {
7070
const MCSymbol &Sym = A->getSymbol();
@@ -94,7 +94,7 @@ unsigned BPFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
9494
}
9595
}
9696
}
97-
return ELF::R_BPF_64_ABS32;
97+
return isSolana ? ELF::R_BPF_64_32 : ELF::R_BPF_64_ABS32;
9898
}
9999
}
100100

0 commit comments

Comments
 (0)