Bump Rust toolchain

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Sep 18, 2024 · 9a6bae7 · 9a6bae7
1 parent 608d611
commit 9a6bae7
Show file tree

Hide file tree

Showing 24 changed files with 116 additions and 93 deletions.
diff --git a/hacking/nix/rust-utils/build-crates-in-layers.nix b/hacking/nix/rust-utils/build-crates-in-layers.nix
@@ -277,7 +277,7 @@ in let
         "--manifest-path" "${workspace}/Cargo.toml"
         "--target-dir" "$target_dir"
       ]) (lib.optionals (!test) [
-        "--out-dir" "$out/bin"
+        rustEnvironment.artifactDirFlag "$out/bin"
       ])}
 
       ${lib.optionalString test (

diff --git a/hacking/nix/rust-utils/default.nix b/hacking/nix/rust-utils/default.nix
@@ -62,22 +62,37 @@ in
         if channel != null
         then lib.hasPrefix "nightly" channel
         else throw "could not determine isNightly automatically"
+    , backwardsCompatibilityHacks ? {}
     , mkCustomTargetPath ? customTargetTripleTripleName: throw "unimplemented"
     , chooseLinker ? { targetTriple, platform }: null
     , compilerRTSource ? null
     , vendoredSuperLockfile ? null
     }:
-    {
+    let
+      elaborateBackwardsCompatibilityHacks =
+        { outDirInsteadOfArtifactDir ? false
+        , noLibraryWorkspace ? false
+        }:
+        {
+          inherit
+            outDirInsteadOfArtifactDir
+            noLibraryWorkspace
+          ;
+        };
+      elaboratedBackwardsCompatibilityHacks = elaborateBackwardsCompatibilityHacks backwardsCompatibilityHacks;
+    in {
       inherit rustToolchain channel isNightly;
       inherit compilerRTSource;
       inherit chooseLinker;
       inherit vendoredSuperLockfile;
 
+      artifactDirFlag = if elaboratedBackwardsCompatibilityHacks.outDirInsteadOfArtifactDir then "--out-dir" else "--artifact-dir";
+
       mkTargetPath = targetTriple: if !targetTriple.isBuiltin then mkCustomTargetPath targetTriple.name else emptyDirectory;
 
       vendoredSysrootLockfile = vendorLockfile {
         inherit rustToolchain;
-        lockfile = symlinkToRegularFile "Cargo.lock" "${rustToolchain}/lib/rustlib/src/rust/Cargo.lock";
+        lockfile = symlinkToRegularFile "Cargo.lock" "${rustToolchain}/lib/rustlib/src/rust/${lib.optionalString (!elaboratedBackwardsCompatibilityHacks.noLibraryWorkspace) "library/"}Cargo.lock";
       };
     }
   );

diff --git a/hacking/nix/scope/default.nix b/hacking/nix/scope/default.nix
@@ -59,16 +59,16 @@ superCallPackage ../rust-utils {} self //
 
   defaultRustToolchain = fenix.fromToolchainFile {
     file = topLevelRustToolchainFile;
-    sha256 = "sha256-6lRcCTSUmWOh0GheLMTZkY7JC273pWLp2s98Bb2REJQ=";
+    sha256 = "sha256-GJR7CjFPMh450uP/EUzXeng15vusV3ktq7Cioop945U=";
   };
 
   defaultRustEnvironment = elaborateRustEnvironment (mkDefaultElaborateRustEnvironmentArgs {
     rustToolchain = defaultRustToolchain;
   } // {
     channel = (builtins.fromTOML (builtins.readFile topLevelRustToolchainFile)).toolchain.channel;
     compilerRTSource = mkCompilerRTSource {
-      version = "18.0-2024-02-13";
-      hash = "sha256-fbq8H86WT13KsXJECHbcbFkqFseLvV/EC2kihTL2lgI=";
+      version = "19.1-2024-07-30";
+      hash = "sha256-fV51iDAbkRmWJj0twTmQKdZdLueMAKSZR6bBtgVPCbk=";
     };
     mkCustomTargetPath = customTargetTripleTripleName:
       let

diff --git a/hacking/nix/scope/microkit/default.nix b/hacking/nix/scope/microkit/default.nix
@@ -15,8 +15,8 @@
 , sources
 , vendorLockfile
 , toTOMLFile
-, defaultRustToolchain
-, rustToolchain ? defaultRustToolchain
+, defaultRustEnvironment
+, rustEnvironment ? defaultRustEnvironment
 }:
 
 { board, config }:
@@ -86,7 +86,7 @@ let
   tool =
     let
       vendoredLockfile = vendorLockfile {
-        inherit rustToolchain;
+        inherit (rustEnvironment) rustToolchain;
         lockfile = microkitSource + "/tool/microkit/Cargo.lock";
       };
 
@@ -99,7 +99,7 @@ let
         src = lib.cleanSource (microkitSource + "/tool/microkit");
 
         nativeBuildInputs = [
-          rustToolchain
+          rustEnvironment.rustToolchain
         ];
 
         depsBuildBuild = [
@@ -116,7 +116,7 @@ let
         '';
 
         buildPhase = ''
-          cargo build -Z unstable-options --frozen --config ${cargoConfigFile} --out-dir $out/bin
+          cargo build -Z unstable-options --frozen --config ${cargoConfigFile} ${rustEnvironment.artifactDirFlag} $out/bin
         '';
       };
 

diff --git a/hacking/nix/scope/verus/default.nix b/hacking/nix/scope/verus/default.nix
@@ -37,6 +37,10 @@ let
     inherit rustToolchain;
   } // {
     inherit (rustToolchainAttrs.toolchain) channel;
+    backwardsCompatibilityHacks = {
+      outDirInsteadOfArtifactDir = true;
+      noLibraryWorkspace = true;
+    };
     mkCustomTargetPath = mkMkCustomTargetPathForEnvironment {
       rustEnvironment = self;
     };
@@ -77,7 +81,7 @@ stdenv.mkDerivation {
         -p verus-driver -p cargo-verus \
         --features=verus-driver/singular \
         --release \
-        --out-dir $out/bin
+        ${rustEnvironment.artifactDirFlag} $out/bin
   '';
 
   installPhase = ''

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -5,5 +5,5 @@
 #
 
 [toolchain]
-channel = "nightly-2024-05-01"
+channel = "nightly-2024-09-01"
 components = [ "rustfmt", "rust-src", "rustc-dev", "llvm-tools-preview" ]
diff --git a/support/targets/aarch64-sel4-microkit-minimal.json b/support/targets/aarch64-sel4-microkit-minimal.json
@@ -1,7 +1,7 @@
 {
   "arch": "aarch64",
   "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
   "disable-redzone": true,
   "eh-frame-header": false,
   "env": "sel4",
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare ARM64, hardfloat",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "pre-link-args": {

diff --git a/support/targets/aarch64-sel4-microkit-resettable-minimal.json b/support/targets/aarch64-sel4-microkit-resettable-minimal.json
@@ -1,7 +1,7 @@
 {
   "arch": "aarch64",
   "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
   "disable-redzone": true,
   "eh-frame-header": false,
   "env": "sel4",
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare ARM64, hardfloat",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "pre-link-args": {

diff --git a/support/targets/aarch64-sel4-microkit-resettable.json b/support/targets/aarch64-sel4-microkit-resettable.json
@@ -1,7 +1,7 @@
 {
   "arch": "aarch64",
   "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
   "disable-redzone": true,
   "env": "sel4",
   "exe-suffix": ".elf",
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare ARM64, hardfloat",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "pre-link-args": {
     "gnu-lld": [

diff --git a/support/targets/aarch64-sel4-microkit.json b/support/targets/aarch64-sel4-microkit.json
@@ -1,7 +1,7 @@
 {
   "arch": "aarch64",
   "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
   "disable-redzone": true,
   "env": "sel4",
   "exe-suffix": ".elf",
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare ARM64, hardfloat",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "pre-link-args": {
     "gnu-lld": [

diff --git a/support/targets/aarch64-sel4-minimal.json b/support/targets/aarch64-sel4-minimal.json
@@ -1,7 +1,7 @@
 {
   "arch": "aarch64",
   "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
   "disable-redzone": true,
   "eh-frame-header": false,
   "env": "sel4",
@@ -12,10 +12,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare ARM64, hardfloat",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "pre-link-args": {

diff --git a/support/targets/aarch64-sel4.json b/support/targets/aarch64-sel4.json
@@ -1,7 +1,7 @@
 {
   "arch": "aarch64",
   "crt-objects-fallback": "false",
-  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
   "disable-redzone": true,
   "env": "sel4",
   "exe-suffix": ".elf",
@@ -12,10 +12,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare ARM64, hardfloat",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "pre-link-args": {
     "gnu-lld": [

diff --git a/support/targets/armv7a-sel4-minimal.json b/support/targets/armv7a-sel4-minimal.json
@@ -15,10 +15,10 @@
   "llvm-target": "armv7a-none-eabi",
   "max-atomic-width": 64,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare Armv7-A",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/armv7a-sel4.json b/support/targets/armv7a-sel4.json
@@ -15,10 +15,10 @@
   "llvm-target": "armv7a-none-eabi",
   "max-atomic-width": 64,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare Armv7-A",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv32imac-sel4-minimal.json b/support/targets/riscv32imac-sel4-minimal.json
@@ -13,10 +13,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare RISC-V (RV32IMAC ISA)",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv32imac-sel4.json b/support/targets/riscv32imac-sel4.json
@@ -13,10 +13,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare RISC-V (RV32IMAC ISA)",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "relocation-model": "static",
   "target-pointer-width": "32"

diff --git a/support/targets/riscv32imafc-sel4-minimal.json b/support/targets/riscv32imafc-sel4-minimal.json
@@ -14,10 +14,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare RISC-V (RV32IMAFC ISA)",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv32imafc-sel4.json b/support/targets/riscv32imafc-sel4.json
@@ -14,10 +14,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare RISC-V (RV32IMAFC ISA)",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "relocation-model": "static",
   "target-pointer-width": "32"

diff --git a/support/targets/riscv64gc-sel4-minimal.json b/support/targets/riscv64gc-sel4-minimal.json
@@ -15,14 +15,15 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
+    "description": "Bare RISC-V (RV64IMAFDC ISA)",
+    "host_tools": false,
+    "std": false,
+    "tier": 2
   },
   "panic-strategy": "abort",
   "relocation-model": "static",
   "supported-sanitizers": [
+    "shadow-call-stack",
     "kernel-address"
   ],
   "target-pointer-width": "64"