[SOL] Add missing SBF conditions to match BPFEL target

anza-xyz · Feb 16, 2024 · 470273a · 470273a
1 parent a4488d2
commit 470273a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
@@ -982,7 +982,8 @@ class Triple {
 
   /// Tests whether the target is eBPF.
   bool isBPF() const {
-    return getArch() == Triple::bpfel || getArch() == Triple::bpfeb;
+    return getArch() == Triple::bpfel || getArch() == Triple::bpfeb ||
+           getArch() == Triple::sbf;
   }
 
   /// Tests whether the target supports comdat

diff --git a/llvm/lib/BinaryFormat/ELF.cpp b/llvm/lib/BinaryFormat/ELF.cpp
@@ -195,6 +195,7 @@ uint16_t ELF::convertArchNameToEMachine(StringRef Arch) {
       .Case("riscv", EM_RISCV)
       .Case("lanai", EM_LANAI)
       .Case("bpf", EM_BPF)
+      .Case("sbf", EM_BPF)
       .Case("ve", EM_VE)
       .Case("csky", EM_CSKY)
       .Case("loongarch", EM_LOONGARCH)

diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
@@ -356,6 +356,7 @@ void MCObjectFileInfo::initELFMCObjectFileInfo(const Triple &T, bool Large) {
     break;
   case Triple::bpfel:
   case Triple::bpfeb:
+  case Triple::sbf:
     FDECFIEncoding = dwarf::DW_EH_PE_sdata8;
     break;
   case Triple::hexagon:

diff --git a/llvm/lib/Object/RelocationResolver.cpp b/llvm/lib/Object/RelocationResolver.cpp
@@ -784,6 +784,7 @@ getRelocationResolver(const ObjectFile &Obj) {
         return {supportsAArch64, resolveAArch64};
       case Triple::bpfel:
       case Triple::bpfeb:
+      case Triple::sbf:
         return {supportsBPF, resolveBPF};
       case Triple::loongarch64:
         return {supportsLoongArch, resolveLoongArch};

diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp b/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
@@ -24,7 +24,9 @@ namespace {
 class BPFAsmBackend : public MCAsmBackend {
 public:
   BPFAsmBackend(support::endianness Endian, const MCSubtargetInfo &STI)
-    : MCAsmBackend(Endian), isSolana(STI.hasFeature(BPF::FeatureSolana)) {}
+    : MCAsmBackend(Endian),
+      isSolana(STI.hasFeature(BPF::FeatureSolana) ||
+               STI.getTargetTriple().getArch() == Triple::sbf) {}
   ~BPFAsmBackend() override = default;
 
   void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,

diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -824,6 +824,7 @@ PrettyPrinter &selectPrettyPrinter(Triple const &Triple) {
     return AMDGCNPrettyPrinterInst;
   case Triple::bpfel:
   case Triple::bpfeb:
+  case Triple::sbf:
     return BPFPrettyPrinterInst;
   case Triple::arm:
   case Triple::armeb: