[SOL] Add BPF target to LLDB

Author: dmakarov

lldb/include/lldb/Utility/ArchSpec.h

@@ -224,6 +224,7 @@ class ArchSpec {
 
     eCore_wasm32,
 
+    eCore_bpf,
     eCore_sbf,
     eCore_sbfv2,
 

lldb/source/Utility/ArchSpec.cpp

@@ -231,11 +231,9 @@ static const CoreDefinition g_core_definitions[] = {
     {eByteOrderLittle, 4, 1, 4, llvm::Triple::wasm32, ArchSpec::eCore_wasm32,
      "wasm32"},
 
-    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbf,
-     "sbf"},
-
-    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv2,
-     "sbfv2"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::bpfel, ArchSpec::eCore_bpf, "bpf"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbf, "sbf"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv2, "sbfv2"},
 };
 
 // Ensure that we have an entry in the g_core_definitions for each core. If you
@@ -412,6 +410,8 @@ static const ArchDefinitionEntry g_elf_arch_entries[] = {
      ArchSpec::eRISCVSubType_riscv32, 0xFFFFFFFFu, 0xFFFFFFFFu}, // riscv32
     {ArchSpec::eCore_riscv64, llvm::ELF::EM_RISCV,
      ArchSpec::eRISCVSubType_riscv64, 0xFFFFFFFFu, 0xFFFFFFFFu}, // riscv64
+    {ArchSpec::eCore_bpf, llvm::ELF::EM_BPF, LLDB_INVALID_CPUTYPE,
+     0xFFFFFFFFu, 0xFFFFFFFFu}, // bpf
     {ArchSpec::eCore_sbf, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbf,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbf
     {ArchSpec::eCore_sbfv2, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv2,

llvm/lib/Object/RelocationResolver.cpp

@@ -107,6 +107,7 @@ static uint64_t resolveAArch64(uint64_t Type, uint64_t Offset, uint64_t S,
 
 static bool supportsBPF(uint64_t Type) {
   switch (Type) {
+  case ELF::R_BPF_64_64:
   case ELF::R_BPF_64_ABS32:
   case ELF::R_BPF_64_ABS64:
     return true;
@@ -118,6 +119,8 @@ static bool supportsBPF(uint64_t Type) {
 static uint64_t resolveBPF(uint64_t Type, uint64_t Offset, uint64_t S,
                            uint64_t LocData, int64_t /*Addend*/) {
   switch (Type) {
+  case ELF::R_BPF_64_64:
+    return S + LocData;
   case ELF::R_BPF_64_ABS32:
     return (S + LocData) & 0xFFFFFFFF;
   case ELF::R_BPF_64_ABS64:
@@ -129,6 +132,7 @@ static uint64_t resolveBPF(uint64_t Type, uint64_t Offset, uint64_t S,
 
 static bool supportsSBF(uint64_t Type) {
   switch (Type) {
+  case ELF::R_SBF_64_64:
   case ELF::R_SBF_64_ABS32:
   case ELF::R_SBF_64_ABS64:
     return true;
@@ -140,6 +144,8 @@ static bool supportsSBF(uint64_t Type) {
 static uint64_t resolveSBF(uint64_t Type, uint64_t Offset, uint64_t S,
                            uint64_t LocData, int64_t /*Addend*/) {
   switch (Type) {
+  case ELF::R_SBF_64_64:
+    return S + LocData;
   case ELF::R_SBF_64_ABS32:
     return (S + LocData) & 0xFFFFFFFF;
   case ELF::R_SBF_64_ABS64: