From 0ea9f9ccf5a55c44dc230df003a07b2b44e35772 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Date: Sun, 24 Jan 2021 09:52:21 +0100
Subject: [PATCH] switch to the latest nightly compiler
- explicit activation of optimized core functions (e.g. memcpy) isn't longer required
---
.cargo/config | 2 +-
CMakeLists.txt | 2 +-
rust-toolchain | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.cargo/config b/.cargo/config
index 4efa88359..42399c171 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,6 +1,6 @@
[unstable]
build-std = ["core", "alloc"]
-build-std-features = ["compiler-builtins-mem", "compiler-builtins-asm"]
+build-std-features = ["compiler-builtins-mem"]
[build]
target = "x86_64-unknown-hermit-kernel"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2821208a..6296b8e1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(HERMIT_RS "${CMAKE_BINARY_DIR}/hermit_rs/${HERMIT_ARCH}-unknown-hermit-kerne
add_custom_target(hermit_rs
COMMAND
${CMAKE_COMMAND} -E env CARGO_TARGET_DIR=${CMAKE_BINARY_DIR}/hermit_rs RUST_TARGET_PATH=${HERMIT_ROOT}/librs
- cargo build ${CARGO_BUILDTYPE_PARAMETER} -Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-asm,compiler-builtins-mem --target ${HERMIT_ARCH}-unknown-hermit-kernel.json --features newlib
+ cargo build ${CARGO_BUILDTYPE_PARAMETER} -Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-mem --target ${HERMIT_ARCH}-unknown-hermit-kernel.json --features newlib
WORKING_DIRECTORY
${CMAKE_CURRENT_LIST_DIR})
diff --git a/rust-toolchain b/rust-toolchain
index bbbefdfc5..df325b3c3 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,4 +1,3 @@
[toolchain]
-channel = "nightly-2020-12-23"
+channel = "nightly-2021-01-22"
components = [ "rustfmt", "rust-src", "llvm-tools-preview"]
-targets = [ "x86_64-unknown-hermit" ]
--
GitLab