[SOL] Update llvm path, add SBF libs to CMake

Author: joncinque

build

@@ -25,7 +25,7 @@ esac
 # First build the libraries for Zig to link against, as well as native `llvm-tblgen`.
 mkdir -p "$ROOTDIR/out/build-llvm-host"
 cd "$ROOTDIR/out/build-llvm-host"
-cmake "$ROOTDIR/llvm" \
+cmake "$ROOTDIR/llvm-project-solana/llvm" \
   -DCMAKE_INSTALL_PREFIX="$ROOTDIR/out/host" \
   -DCMAKE_PREFIX_PATH="$ROOTDIR/out/host" \
   -DCMAKE_BUILD_TYPE=Release \
@@ -145,7 +145,7 @@ fi
 # Rebuild LLVM with Zig.
 mkdir -p "$ROOTDIR/out/build-llvm-$TARGET-$MCPU"
 cd "$ROOTDIR/out/build-llvm-$TARGET-$MCPU"
-cmake "$ROOTDIR/llvm" \
+cmake "$ROOTDIR/llvm-project-solana/llvm" \
   -DCMAKE_INSTALL_PREFIX="$ROOTDIR/out/$TARGET-$MCPU" \
   -DCMAKE_PREFIX_PATH="$ROOTDIR/out/$TARGET-$MCPU" \
   -DCMAKE_BUILD_TYPE=Release \

zig/CMakeLists.txt

@@ -407,6 +407,7 @@ set(ZIG_STAGE2_SOURCES
     lib/std/Target/powerpc.zig
     lib/std/Target/riscv.zig
     lib/std/Target/s390x.zig
+    lib/std/Target/sbf.zig
     lib/std/Target/sparc.zig
     lib/std/Target/wasm.zig
     lib/std/Target/x86.zig

zig/build.zig

@@ -1287,6 +1287,11 @@ const llvm_libs = [_][]const u8{
     "LLVMBPFCodeGen",
     "LLVMBPFDesc",
     "LLVMBPFInfo",
+    "LLVMSBFDisassembler",
+    "LLVMSBFAsmParser",
+    "LLVMSBFCodeGen",
+    "LLVMSBFDesc",
+    "LLVMSBFInfo",
     "LLVMAVRDisassembler",
     "LLVMAVRAsmParser",
     "LLVMAVRCodeGen",

zig/cmake/Findllvm.cmake

@@ -280,6 +280,11 @@ else()
   FIND_AND_ADD_LLVM_LIB(LLVMBPFCodeGen)
   FIND_AND_ADD_LLVM_LIB(LLVMBPFDesc)
   FIND_AND_ADD_LLVM_LIB(LLVMBPFInfo)
+  FIND_AND_ADD_LLVM_LIB(LLVMSBFDisassembler)
+  FIND_AND_ADD_LLVM_LIB(LLVMSBFAsmParser)
+  FIND_AND_ADD_LLVM_LIB(LLVMSBFCodeGen)
+  FIND_AND_ADD_LLVM_LIB(LLVMSBFDesc)
+  FIND_AND_ADD_LLVM_LIB(LLVMSBFInfo)
   FIND_AND_ADD_LLVM_LIB(LLVMAVRDisassembler)
   FIND_AND_ADD_LLVM_LIB(LLVMAVRAsmParser)
   FIND_AND_ADD_LLVM_LIB(LLVMAVRCodeGen)