Fix compilation since last rust

Thanks to @4lDO2 for all this. I just moved his changes to io_uring onto
the master branch of the kernel. I take no credit.
This commit is contained in:
jD91mZM2
2020-08-01 12:59:42 +02:00
parent 93856b43b9
commit fbeb297949
4 changed files with 9 additions and 8 deletions

2
.cargo/config Normal file
View File

@@ -0,0 +1,2 @@
[build]
rustflags = ["-Cembed-bitcode=yes"]

10
Cargo.lock generated
View File

@@ -33,11 +33,11 @@ dependencies = [
"linked_list_allocator 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
"paste 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"raw-cpuid 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.56",
"redox_syscall 0.2.0",
"rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"slab_allocator 0.3.1",
"spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"x86 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
"x86 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -113,7 +113,7 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.1.56"
version = "0.2.0"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -182,7 +182,7 @@ dependencies = [
[[package]]
name = "x86"
version = "0.29.0"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bit_field 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -213,4 +213,4 @@ dependencies = [
"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f"
"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
"checksum spinning_top 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32d801a3a53bcf5071f85fef8d5cab9e5f638fc5580a37e6eb7aba4b37438d24"
"checksum x86 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6874753c331118b83f24d69325958b61f8ef47dbbc7aff2257a0bbe33fb24e3b"
"checksum x86 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8cc872a9a776500ccc6f49799729858738c946b8865fa7e3d6b47cc5dc3a8a7"

View File

@@ -28,7 +28,7 @@ version = "0.1.16"
default-features = false
[dependencies.x86]
version = "0.29.0"
version = "0.32.0"
default-features = false
[features]

View File

@@ -41,14 +41,13 @@
#![deny(unreachable_patterns)]
#![feature(allocator_api)]
#![feature(asm)]
#![feature(llvm_asm)]
#![feature(concat_idents)]
#![feature(const_fn)]
#![feature(core_intrinsics)]
#![feature(global_asm)]
#![feature(integer_atomics)]
#![feature(lang_items)]
#![feature(matches_macro)] // stable in current Rust
#![feature(naked_functions)]
#![feature(ptr_internals)]
#![feature(thread_local)]