Merge branch 'LucasSte-solana-1.84.1' into solana-1.84.1

Author: LucasSte

Diff for: .github/workflows/ci.yml

@@ -15,6 +15,8 @@ on:
       - try
       - try-perf
       - automation/bors/try
+      - master
+      - solana-**
   pull_request:
     branches:
       - "**"
@@ -130,8 +132,8 @@ jobs:
           # which then uses log commands to actually set them.
           EXTRA_VARIABLES: ${{ toJson(matrix.env) }}
 
-      - name: ensure the channel matches the target branch
-        run: src/ci/scripts/verify-channel.sh
+#      - name: ensure the channel matches the target branch
+#        run: src/ci/scripts/verify-channel.sh
 
       - name: collect CPU statistics
         run: src/ci/scripts/collect-cpu-stats.sh
@@ -180,14 +182,14 @@ jobs:
       - name: disable git crlf conversion
         run: src/ci/scripts/disable-git-crlf-conversion.sh
 
-      - name: ensure line endings are correct
-        run: src/ci/scripts/verify-line-endings.sh
-
-      - name: ensure backported commits are in upstream branches
-        run: src/ci/scripts/verify-backported-commits.sh
+#      - name: ensure line endings are correct
+#        run: src/ci/scripts/verify-line-endings.sh
+#
+#      - name: ensure backported commits are in upstream branches
+#        run: src/ci/scripts/verify-backported-commits.sh
 
-      - name: ensure the stable version number is correct
-        run: src/ci/scripts/verify-stable-version-number.sh
+#      - name: ensure the stable version number is correct
+#        run: src/ci/scripts/verify-stable-version-number.sh
 
       - name: run the build
         # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
@@ -204,37 +206,6 @@ jobs:
           echo "disk usage:"
           df -h
 
-      - name: upload artifacts to github
-        uses: actions/upload-artifact@v4
-        with:
-          # name is set in previous step
-          name: ${{ env.DOC_ARTIFACT_NAME }}
-          path: obj/artifacts/doc
-          if-no-files-found: ignore
-          retention-days: 5
-
-      - name: upload artifacts to S3
-        run: src/ci/scripts/upload-artifacts.sh
-        env:
-          AWS_ACCESS_KEY_ID: ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
-        # Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
-        # builders *should* have the AWS credentials available. Still, explicitly
-        # adding the condition is helpful as this way CI will not silently skip
-        # deploying artifacts from a dist builder if the variables are misconfigured,
-        # erroring about invalid credentials instead.
-        if: github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1'
-
-      - name: upload job metrics to DataDog
-        if: needs.calculate_matrix.outputs.run_type != 'pr'
-        env:
-          DATADOG_SITE: datadoghq.com
-          DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
-          DD_GITHUB_JOB_NAME: ${{ matrix.name }}
-        run: |
-          npm install -g @datadog/datadog-ci@^2.x.x
-          python3 src/ci/scripts/upload-build-metrics.py build/cpu-usage.csv
-
   # This job isused to tell bors the final status of the build, as there is no practical way to detect
   # when a workflow is successful listening to webhooks only in our current bors implementation (homu).
   outcome:

Diff for: .gitignore

@@ -34,7 +34,6 @@ Session.vim
 !/tests/run-make/thumb-none-qemu/example/.cargo
 
 ## Configuration
-/config.toml
 /Makefile
 config.mk
 config.stamp

Diff for: .gitmodules

@@ -32,8 +32,8 @@
 	shallow = true
 [submodule "src/llvm-project"]
 	path = src/llvm-project
-	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/19.1-2024-12-03
+	url = https://github.com/anza-xyz/llvm-project.git
+	branch = solana-rustc/19.1-2024-12-03
 	shallow = true
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book

Diff for: Cargo.lock

@@ -3117,9 +3117,8 @@ dependencies = [
 
 [[package]]
 name = "rustc-build-sysroot"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6d984a9db43148467059309bd1e5ad577085162f695d9fe2cf3543aeb25cd38"
+version = "0.5.3"
+source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.47#0d6d7ae18aaecf45f0a6e87bcf83b2293263f5bd"
 dependencies = [
  "anyhow",
  "rustc_version",

Diff for: README.md

@@ -1,3 +1,50 @@
+# Fork of the Rust Programming Language that supports Berkley Packet Filter (BPF) targets
+
+This fork of Rust contains changes that enable rustc to build BPF
+modules.  It depends on a customized
+[fork](https://github.com/anza-xyz/llvm-project) of Rust's LLVM
+fork.
+
+Solana SDK does not depend directly on this repo.  Instead [platform-tools]
+builds and releases binary packages that the Solana SDK pulls in.
+
+[platform-tools]: https://github.com/anza-xyz/platform-tools
+
+BPF modules are built using target triple `bpfel-unknown-unknown`
+which represents the little endian version of BPF.  There is no
+support for big endian at this time.
+
+Upgrading the compiler and standard library source tree
+-------------------------------------------------------
+
+The source tree has two external dependencies
+1. [compiler-builtins]
+2. [llvm-project]
+
+If any of the depencies is changed or this repository is updated to
+make a new release of the bpf-tools, tag the dependencies, and this
+repository with a new bpf-tools-v1.x tag, so that all components of
+the released bpf-tools have the same tag, e.g. bpf-tools-v1.6. Thus,
+release of every version of the bpf-tools is fully specified by the
+release version.
+
+The [llvm-project] is a submodule of this repository, therefore its
+version is explicitly committed in this repository.  However,
+[compiler-builtins] is pulled in as a cargo package.  Therefore, it is
+necessary to update the `[patch.crates-io]` subsection of the
+top-level `Cargo.toml` file, and specify which tag must be used to
+pull the correct version of [compiler-builtins].
+
+After this repository is tagged for a new release, update the
+`bpf-tools/build.sh` in [bpf-tools] repository to pull the correct
+version of the rust repository and make a new release tag in
+[bpf-tools] repository.
+
+[compiler-builtins]: https://github.com/anza-xyz/compiler-builtins
+[llvm-project]: https://github.com/anza-xyz/llvm-project
+
+---
+
 <div align="center">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/rust-lang/www.rust-lang.org/master/static/images/rust-social-wide-dark.svg">

Diff for: build.sh

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2025 Anza Technology Inc. <https://www.anza.xyz>
+#
+# SPDX-License-Identifier: MIT
+
+#!/usr/bin/env bash
+
+set -ex
+
+if [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
+    echo "--llvm to rebuild llvm";
+    exit;
+fi
+
+unameOut="$(uname -s)-$(uname -m)"
+case "${unameOut}" in
+    Linux-x86_64*)  HOST_TRIPLE=x86_64-unknown-linux-gnu;;
+    Linux-aarch64*) HOST_TRIPLE=aarch64-unknown-linux-gnu;;
+    Darwin-x86_64*) HOST_TRIPLE=x86_64-apple-darwin;;
+    Darwin-arm64*)  HOST_TRIPLE=aarch64-apple-darwin;;
+    MINGW*)         HOST_TRIPLE=x86_64-pc-windows-msvc;;
+    *)              HOST_TRIPLE=x86_64-unknown-linux-gnu
+esac
+
+if [ "$1" == "--llvm" ]; then
+    rm -f build/${HOST_TRIPLE}/llvm/llvm-finished-building;
+fi
+./x.py build --stage 1 --target ${HOST_TRIPLE},sbf-solana-solana,sbpf-solana-solana,sbpfv1-solana-solana,sbpfv2-solana-solana,sbpfv3-solana-solana

Diff for: compiler/rustc_codegen_gcc/build_system/build_sysroot/Cargo.toml

@@ -6,7 +6,7 @@ resolver = "2"
 
 [dependencies]
 core = { path = "./sysroot_src/library/core" }
-compiler_builtins = "0.1"
+compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.47" }
 alloc = { path = "./sysroot_src/library/alloc" }
 std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
 test = { path = "./sysroot_src/library/test" }

Diff for: compiler/rustc_codegen_gcc/src/type_.rs

@@ -33,10 +33,6 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
         }
     }
 
-    pub fn type_void(&self) -> Type<'gcc> {
-        self.context.new_type::<()>()
-    }
-
     pub fn type_size_t(&self) -> Type<'gcc> {
         self.context.new_type::<usize>()
     }
@@ -180,6 +176,10 @@ impl<'gcc, 'tcx> BaseTypeCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
         bug!("unsupported float width 128")
     }
 
+    fn type_void(&self) -> Type<'gcc> {
+        self.context.new_type::<()>()
+    }
+
     fn type_func(&self, params: &[Type<'gcc>], return_type: Type<'gcc>) -> Type<'gcc> {
         self.context.new_function_pointer_type(None, return_type, params, false)
     }

Diff for: compiler/rustc_codegen_llvm/src/allocator.rs

@@ -83,11 +83,13 @@ pub(crate) unsafe fn codegen(
         let llval = llvm::LLVMConstInt(i8, val as u64, False);
         llvm::LLVMSetInitializer(ll_g, llval);
 
-        let name = NO_ALLOC_SHIM_IS_UNSTABLE;
-        let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_c_char_ptr(), name.len(), i8);
-        llvm::set_visibility(ll_g, llvm::Visibility::from_generic(tcx.sess.default_visibility()));
-        let llval = llvm::LLVMConstInt(i8, 0, False);
-        llvm::LLVMSetInitializer(ll_g, llval);
+        if tcx.sess.target.arch != "sbf" {
+            let name = NO_ALLOC_SHIM_IS_UNSTABLE;
+            let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_ptr().cast(), name.len(), i8);
+            llvm::set_visibility(ll_g, llvm::Visibility::from_generic(tcx.sess.default_visibility()));
+            let llval = llvm::LLVMConstInt(i8, 0, False);
+            llvm::LLVMSetInitializer(ll_g, llval);
+        }
     }
 
     if tcx.sess.opts.debuginfo != DebugInfo::None {

Diff for: compiler/rustc_codegen_llvm/src/type_.rs

@@ -182,6 +182,10 @@ impl<'ll, 'tcx> BaseTypeCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {
         unsafe { llvm::LLVMFP128TypeInContext(self.llcx) }
     }
 
+    fn type_void(&self) -> &'ll Type {
+        unsafe { llvm::LLVMVoidTypeInContext(self.llcx) }
+    }
+
     fn type_func(&self, args: &[&'ll Type], ret: &'ll Type) -> &'ll Type {
         unsafe { llvm::LLVMFunctionType(ret, args.as_ptr(), args.len() as c_uint, False) }
     }

Diff for: compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1970,17 +1970,23 @@ fn add_pre_link_args(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor)
     cmd.verbatim_args(&sess.opts.unstable_opts.pre_link_args);
 }
 
-/// Add a link script embedded in the target, if applicable.
+/// Add a link script embedded in the target, if applicable and not found in the command line.
 fn add_link_script(cmd: &mut dyn Linker, sess: &Session, tmpdir: &Path, crate_type: CrateType) {
     match (crate_type, &sess.target.link_script) {
         (CrateType::Cdylib | CrateType::Executable, Some(script)) => {
             if !sess.target.linker_flavor.is_gnu() {
                 sess.dcx().emit_fatal(errors::LinkScriptUnavailable);
             }
 
+            if sess.opts.cg.link_args.contains(&String::from("--script"))
+                || sess.opts.cg.link_args.contains(&String::from("-T")) {
+                return;
+            }
+
             let file_name = ["rustc", &sess.target.llvm_target, "linkfile.ld"].join("-");
 
             let path = tmpdir.join(file_name);
+
             if let Err(error) = fs::write(&path, script.as_ref()) {
                 sess.dcx().emit_fatal(errors::LinkScriptWriteFailure { path, error });
             }

Diff for: compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -444,6 +444,21 @@ impl<'a> GccLinker<'a> {
                     self.link_arg(soname);
                 }
             }
+
+            if self.sess.target.arch == "bpf" || self.sess.target.arch == "sbf" {
+                if self.sess.opts.test {
+                    self.link_arg("--entry=main");
+                } else {
+                    self.link_arg("--entry=entrypoint");
+                }
+                if self.sess.opts.cg.target_cpu.as_ref()
+                    .unwrap_or(&self.sess.target.cpu.as_ref().to_string()) == "v3" {
+                    self.link_arg("-Bsymbolic");
+                    if self.sess.opts.debuginfo == DebugInfo::None {
+                        self.link_arg("--strip-all");
+                    }
+                }
+            }
         }
     }
 

Diff for: compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -249,6 +249,7 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
         "loongarch64" => (Architecture::LoongArch64, None),
         "csky" => (Architecture::Csky, None),
         "arm64ec" => (Architecture::Aarch64, Some(SubArchitecture::Arm64EC)),
+        "sbf" => (Architecture::Sbf, None),
         // Unsupported architecture.
         _ => return None,
     };

Diff for: compiler/rustc_codegen_ssa/src/base.rs

@@ -519,6 +519,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
         };
 
         let result = bx.call(start_ty, None, None, start_fn, &args, None, instance);
+
         if cx.sess().target.os.contains("uefi") {
             bx.ret(result);
         } else {

Diff for: compiler/rustc_codegen_ssa/src/traits/type_.rs

@@ -23,6 +23,8 @@ pub trait BaseTypeCodegenMethods<'tcx>: BackendTypes {
     fn type_f128(&self) -> Self::Type;
 
     fn type_array(&self, ty: Self::Type, len: u64) -> Self::Type;
+    fn type_void(&self) -> Self::Type;
+
     fn type_func(&self, args: &[Self::Type], ret: Self::Type) -> Self::Type;
     fn type_kind(&self, ty: Self::Type) -> TypeKind;
     fn type_ptr(&self) -> Self::Type;

Diff for: compiler/rustc_feature/src/unstable.rs

@@ -338,6 +338,7 @@ declare_features! (
     (unstable, riscv_target_feature, "1.45.0", Some(44839)),
     (unstable, rtm_target_feature, "1.35.0", Some(44839)),
     (unstable, s390x_target_feature, "1.82.0", Some(44839)),
+    (unstable, sbf_target_feature, "1.54.0", Some(44839)),
     (unstable, sparc_target_feature, "1.84.0", Some(132783)),
     (unstable, sse4a_target_feature, "1.27.0", Some(44839)),
     (unstable, tbm_target_feature, "1.27.0", Some(44839)),

Diff for: compiler/rustc_llvm/build.rs

@@ -25,6 +25,7 @@ const OPTIONAL_COMPONENTS: &[&str] = &[
     "riscv",
     "xtensa",
     "bpf",
+    "sbf",
 ];
 
 const REQUIRED_COMPONENTS: &[&str] =

Diff for: compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

@@ -168,6 +168,18 @@ extern "C" void LLVMRustTimeTraceProfilerFinish(const char *FileName) {
 #define SUBTARGET_LOONGARCH
 #endif
 
+#ifdef LLVM_COMPONENT_BPF
+#define SUBTARGET_BPF SUBTARGET(BPF)
+#else
+#define SUBTARGET_BPF
+#endif
+
+#ifdef LLVM_COMPONENT_SBF
+#define SUBTARGET_SBF SUBTARGET(SBF)
+#else
+#define SUBTARGET_SBF
+#endif
+
 #define GEN_SUBTARGETS                                                         \
   SUBTARGET_X86                                                                \
   SUBTARGET_ARM                                                                \
@@ -183,7 +195,9 @@ extern "C" void LLVMRustTimeTraceProfilerFinish(const char *FileName) {
   SUBTARGET_HEXAGON                                                            \
   SUBTARGET_XTENSA                                                             \
   SUBTARGET_RISCV                                                              \
-  SUBTARGET_LOONGARCH
+  SUBTARGET_LOONGARCH                                                          \
+  SUBTARGET_BPF                                                                \
+  SUBTARGET_SBF
 
 #define SUBTARGET(x)                                                           \
   namespace llvm {                                                             \

Diff for: compiler/rustc_llvm/src/lib.rs

@@ -248,4 +248,12 @@ pub fn initialize_available_targets() {
         LLVMInitializeBPFAsmPrinter,
         LLVMInitializeBPFAsmParser
     );
+    init_target!(
+        llvm_component = "sbf",
+        LLVMInitializeSBFTargetInfo,
+        LLVMInitializeSBFTarget,
+        LLVMInitializeSBFTargetMC,
+        LLVMInitializeSBFAsmPrinter,
+        LLVMInitializeSBFAsmParser
+    );
 }

Diff for: compiler/rustc_passes/src/entry.rs

@@ -30,8 +30,9 @@ struct EntryContext<'tcx> {
 }
 
 fn entry_fn(tcx: TyCtxt<'_>, (): ()) -> Option<(DefId, EntryFnType)> {
+    let exe_only = (tcx.sess.target.arch != "bpf" && tcx.sess.target.arch != "sbf") || !tcx.sess.opts.test;
     let any_exe = tcx.crate_types().iter().any(|ty| *ty == CrateType::Executable);
-    if !any_exe {
+    if !any_exe && exe_only {
         // No need to find a main function.
         return None;
     }