Update Rust to 1.75.0

.gitignore

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

.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/17.0-2023-12-14
+	url = https://github.com/solana-labs/llvm-project.git
+	branch = solana-rustc/17.0-2023-12-14
 	shallow = true
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book

.reuse/dep5

@@ -13,10 +13,12 @@ Files: compiler/*
        tests/*
        src/*
        .github/*
+       build.sh
        Cargo.lock
        Cargo.toml
        CODE_OF_CONDUCT.md
        config.example.toml
+       config.toml
        configure
        CONTRIBUTING.md
        COPYRIGHT

Cargo.lock

@@ -723,8 +723,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
 [[package]]
 name = "compiler_builtins"
 version = "0.1.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b73c3443a5fd2438d7ba4853c64e4c8efc2404a9e28a9234cc2d5eebc6c242"
+source = "git+https://github.com/solana-labs/compiler-builtins?tag=solana-tools-v1.40#81ef46f3fe1357095acdd089a700890fe4e13974"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",
@@ -781,6 +780,7 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 name = "core"
 version = "0.0.0"
 dependencies = [
+ "getrandom 0.1.16",
  "rand",
  "rand_xorshift",
 ]
@@ -1591,6 +1591,17 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -1599,7 +1610,7 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -2523,7 +2534,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
@@ -2544,7 +2555,7 @@ dependencies = [
  "colored",
  "ctrlc",
  "env_logger 0.10.0",
- "getrandom",
+ "getrandom 0.2.10",
  "lazy_static",
  "libc",
  "libffi",
@@ -3175,7 +3186,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -3240,7 +3251,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
  "redox_syscall 0.2.16",
  "thiserror",
 ]
@@ -5137,7 +5148,7 @@ dependencies = [
  "rustc-demangle",
  "std_detect",
  "unwind",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -5963,7 +5974,7 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -6003,6 +6014,12 @@ dependencies = [
  "try-lock",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"

Cargo.toml

@@ -105,6 +105,7 @@ miniz_oxide.debug = 0
 object.debug = 0
 
 [patch.crates-io]
+compiler_builtins = { git = "https://github.com/solana-labs/compiler-builtins", tag = "solana-tools-v1.40" }
 # See comments in `library/rustc-std-workspace-core/README.md` for what's going on
 # here
 rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }

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/solana-labs/llvm-project) of Rust's LLVM
+fork.
+
+Solana SDK does not depend directly on this repo.  Instead [bpf-tools]
+builds and releases binary packages that the Solana SDK pulls in.
+
+[bpf-tools]: https://github.com/solana-labs/bpf-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/solana-labs/compiler-builtins
+[llvm-project]: https://github.com/solana-labs/llvm-project
+
+---
+
 # The Rust Programming Language
 
 [![Rust Community](https://img.shields.io/badge/Rust_Community%20-Join_us-brightgreen?style=plastic&logo=rust)](https://www.rust-lang.org/community)

build.sh

@@ -0,0 +1,23 @@
+#!/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},bpfel-unknown-unknown,sbf-solana-solana

compiler/rustc_codegen_gcc/src/intrinsic/mod.rs

@@ -14,7 +14,8 @@ use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::traits::{ArgAbiMethods, BuilderMethods, ConstMethods, IntrinsicCallMethods};
 #[cfg(feature="master")]
-use rustc_codegen_ssa::traits::{BaseTypeMethods, MiscMethods};
+use rustc_codegen_ssa::traits::MiscMethods;
+use rustc_codegen_ssa::traits::BaseTypeMethods;
 use rustc_codegen_ssa::errors::InvalidMonomorphization;
 use rustc_middle::bug;
 use rustc_middle::ty::{self, Instance, Ty};

compiler/rustc_codegen_gcc/src/type_.rs

@@ -26,10 +26,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>()
     }
@@ -126,6 +122,10 @@ impl<'gcc, 'tcx> BaseTypeMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
         self.double_type
     }
 
+    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)
     }

compiler/rustc_codegen_llvm/src/allocator.rs

@@ -83,13 +83,15 @@ 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_ptr().cast(), name.len(), i8);
-    if tcx.sess.target.default_hidden_visibility {
-        llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden);
+    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);
+        if tcx.sess.target.default_hidden_visibility {
+            llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden);
+        }
+        let llval = llvm::LLVMConstInt(i8, 0, False);
+        llvm::LLVMSetInitializer(ll_g, llval);
     }
-    let llval = llvm::LLVMConstInt(i8, 0, False);
-    llvm::LLVMSetInitializer(ll_g, llval);
 
     if tcx.sess.opts.debuginfo != DebugInfo::None {
         let dbg_cx = debuginfo::CodegenUnitDebugContext::new(llmod);

compiler/rustc_codegen_llvm/src/type_.rs

@@ -164,6 +164,10 @@ impl<'ll, 'tcx> BaseTypeMethods<'tcx> for CodegenCx<'ll, 'tcx> {
         unsafe { llvm::LLVMDoubleTypeInContext(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) }
     }

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -46,7 +46,7 @@ use std::cell::OnceCell;
 use std::collections::BTreeSet;
 use std::ffi::OsString;
 use std::fs::{read, File, OpenOptions};
-use std::io::{BufWriter, Write};
+use std::io::{prelude::*, BufWriter, SeekFrom, Write};
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::process::{ExitStatus, Output, Stdio};
@@ -310,6 +310,10 @@ fn link_rlib<'a>(
             let (metadata, metadata_position) =
                 create_wrapper_file(sess, b".rmeta".to_vec(), codegen_results.metadata.raw_data());
             let metadata = emit_wrapper_file(sess, &metadata, tmpdir, METADATA_FILENAME);
+            if sess.opts.cg.target_cpu.as_ref().unwrap_or(
+                &sess.target.cpu.as_ref().to_string()) == "sbfv2" {
+                patch_synthetic_object_file(sess, &metadata);
+            }
             match metadata_position {
                 MetadataPosition::First => {
                     // Most of the time metadata in rlib files is wrapped in a "dummy" object
@@ -1798,14 +1802,19 @@ fn add_pre_link_args(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor)
     cmd.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.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);
@@ -1936,9 +1945,24 @@ fn add_linked_symbol_object(
     if let Err(error) = result {
         sess.emit_fatal(errors::FailedToWrite { path, error });
     }
+    if sess.opts.cg.target_cpu.as_ref().unwrap_or(
+        &sess.target.cpu.as_ref().to_string()) == "sbfv2" {
+        patch_synthetic_object_file(sess, &path);
+    }
     cmd.add_object(&path);
 }
 
+fn patch_synthetic_object_file(sess: &Session, path: &PathBuf) {
+    const EM_SBF: [u8; 2] = [0x07, 0x01];
+    if let Ok(mut sf) = fs::OpenOptions::new().write(true).open(path) {
+        if let Ok(_) = sf.seek(SeekFrom::Start(0x12)) {
+            sf.write(&EM_SBF).unwrap();
+        }
+    } else {
+        sess.fatal(format!("failed to patch {}", path.display()));
+    }
+}
+
 /// Add object files containing code from the current crate.
 fn add_local_crate_regular_objects(cmd: &mut dyn Linker, codegen_results: &CodegenResults) {
     for obj in codegen_results.modules.iter().filter_map(|m| m.object.as_ref()) {

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -354,6 +354,17 @@ impl<'a> GccLinker<'a> {
                         self.linker_arg(&format!("--out-implib={}", (*implib).to_str().unwrap()));
                     }
                 }
+            } else if self.sess.target.arch == "bpf" || self.sess.target.arch == "sbf" {
+                if self.sess.opts.test {
+                    self.linker_arg("--entry=main");
+                } else {
+                    self.linker_arg("--entry=entrypoint");
+                }
+                if self.sess.opts.cg.target_cpu.as_ref().unwrap_or(&self.sess.target.cpu.as_ref().to_string()) == "sbfv2"
+                {
+                    self.linker_arg("--section-start=.text=0x100000000");
+                    self.linker_arg("--pack-dyn-relocs=relr");
+                }
             }
         }
     }

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -208,9 +208,10 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
         "avr" => Architecture::Avr,
         "msp430" => Architecture::Msp430,
         "hexagon" => Architecture::Hexagon,
-        "bpf" => Architecture::Bpf,
         "loongarch64" => Architecture::LoongArch64,
         "csky" => Architecture::Csky,
+        "bpf" => Architecture::Bpf,
+        "sbf" => Architecture::Bpf,
         // Unsupported architecture.
         _ => return None,
     };