Upgrade to Rust 1.79.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/18.1-2024-05-19
+	url = https://github.com/anza-xyz/llvm-project.git
+	branch = solana-rustc/18.1-2024-05-19
 	shallow = true
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book

.reuse/dep5

@@ -11,10 +11,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

@@ -739,9 +739,8 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11973008a8cf741fe6d22f339eba21fd0ca81e2760a769ba8243ed6c21edd7e"
+version = "0.1.112"
+source = "git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.43#8e7bd0b5b32d58c96aca7c6d45d3989211e1a378"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",
@@ -791,6 +790,7 @@ dependencies = [
 name = "core"
 version = "0.0.0"
 dependencies = [
+ "getrandom 0.1.16",
  "rand",
  "rand_xorshift",
 ]
@@ -1551,6 +1551,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.13"
@@ -1559,7 +1570,7 @@ checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -2467,7 +2478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
@@ -2489,7 +2500,7 @@ dependencies = [
  "colored",
  "ctrlc",
  "directories",
- "getrandom",
+ "getrandom 0.2.13",
  "jemalloc-sys",
  "lazy_static",
  "libc",
@@ -3148,7 +3159,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.13",
 ]
 
 [[package]]
@@ -3204,7 +3215,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.13",
  "libredox",
  "thiserror",
 ]
@@ -3360,9 +3371,8 @@ dependencies = [
 
 [[package]]
 name = "rustc-build-sysroot"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9bf37423495cd3a6a9ef8c75fc4566de0d26de0ab75f36f67a426e58df5768c"
+version = "0.5.3"
+source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.43#54b64222f01199bfc1fc7ac36f244cef4f573c7e"
 dependencies = [
  "anyhow",
  "rustc_version",
@@ -5274,7 +5284,7 @@ dependencies = [
  "rustc-demangle",
  "std_detect",
  "unwind",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -6145,7 +6155,7 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.13",
 ]
 
 [[package]]
@@ -6185,6 +6195,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

@@ -107,6 +107,7 @@ debug = 0
 strip = true
 
 [patch.crates-io]
+compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.43" }
 # 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/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">

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},sbf-solana-solana

compiler/rustc_codegen_gcc/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.43" }
 alloc = { path = "./sysroot_src/library/alloc" }
 std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
 test = { path = "./sysroot_src/library/test" }

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>()
     }
@@ -136,6 +132,10 @@ impl<'gcc, 'tcx> BaseTypeMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
         unimplemented!("f16_f128")
     }
 
+    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.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.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

@@ -174,6 +174,10 @@ impl<'ll, 'tcx> BaseTypeMethods<'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) }
     }

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -46,7 +46,7 @@ use itertools::Itertools;
 use std::collections::BTreeSet;
 use std::ffi::{OsStr, 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};
@@ -311,6 +311,10 @@ fn link_rlib<'a>(
                 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
@@ -1870,14 +1874,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.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);
@@ -2008,9 +2017,24 @@ fn add_linked_symbol_object(
     if let Err(error) = result {
         sess.dcx().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_all(&EM_SBF).unwrap();
+        }
+    } else {
+        sess.psess.dcx.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

@@ -337,6 +337,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

@@ -216,6 +216,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::Bpf, None),
         // Unsupported architecture.
         _ => return None,
     };