From 0ab2fe9e2afbb1ffab9f7461b858442776b4cfb4 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 1 Mar 2022 21:49:43 +0100 Subject: [PATCH 1/3] Remove the `asm` and `global_asm` features, which are now stable --- src/main.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index f63c65ed..c63156a6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,4 @@ #![feature(lang_items)] -#![feature(global_asm)] -#![feature(asm)] #![no_std] #![no_main] From fa4b5cf35c164126bf10474e6d4815a1e52e4e82 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 1 Mar 2022 21:55:38 +0100 Subject: [PATCH 2/3] Remove `lang_items` feature --- src/main.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index c63156a6..22094add 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -#![feature(lang_items)] #![no_std] #![no_main] @@ -378,12 +377,6 @@ pub fn panic(info: &PanicInfo) -> ! { loop {} } -#[lang = "eh_personality"] -#[no_mangle] -pub extern "C" fn eh_personality() { - loop {} -} - #[no_mangle] pub extern "C" fn _Unwind_Resume() { loop {} From 807583aaa6da183d76e9a41ca85151c8495a9212 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 1 Mar 2022 21:56:36 +0100 Subject: [PATCH 3/3] Update Cargo.lock Seems like we forgot to commit this when we updated the x86_64 dependency the last time. --- test-kernel/Cargo.lock | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/test-kernel/Cargo.lock b/test-kernel/Cargo.lock index 5d0ef56f..a76396ee 100644 --- a/test-kernel/Cargo.lock +++ b/test-kernel/Cargo.lock @@ -1,10 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "bit_field" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" [[package]] name = "bitflags" @@ -19,12 +21,19 @@ dependencies = [ "x86_64", ] +[[package]] +name = "volatile" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0" + [[package]] name = "x86_64" -version = "0.13.2" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b871116e3c83dad0795580b10b2b1dd05cb52ec719af36180371877b09681f7f" +checksum = "958ab3202b01bc43ba2eb832102c4a487ed93151667a2289062e5f2b00058be2" dependencies = [ "bit_field", "bitflags", + "volatile", ]