diff --git a/Cargo.lock b/Cargo.lock index b9f446f6e944f05910cd441667d6f7e2eda3fab5..2e3001e3a7bf404928c5a897a78a89450596b460 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,11 +40,11 @@ checksum = "2db2df1ebc842c41fd2c4ae5b5a577faf63bd5151b953db752fc686812bee318" dependencies = [ "clap", "log", - "proc-macro2 1.0.18", + "proc-macro2 1.0.19", "quote 1.0.7", "serde", "serde_json", - "syn 1.0.33", + "syn 1.0.36", "tempfile", "toml", ] @@ -156,15 +156,15 @@ version = "0.1.0" [[package]] name = "libc" -version = "0.2.72" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701" +checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" [[package]] name = "log" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ "cfg-if", ] @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" dependencies = [ "unicode-xid 0.2.1", ] @@ -242,7 +242,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.18", + "proc-macro2 1.0.19", ] [[package]] @@ -257,7 +257,7 @@ dependencies = [ name = "ralloc_shim" version = "0.1.1" dependencies = [ - "redox_syscall 0.1.56", + "redox_syscall 0.1.57", "sc", ] @@ -328,13 +328,14 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" version = "0.2.0" +source = "git+https://gitlab.redox-os.org/redox-os/syscall?rev=a0ea09ceb3380b1d1e878bb18886e13742d34e8a#a0ea09ceb3380b1d1e878bb18886e13742d34e8a" dependencies = [ "bitflags", ] @@ -394,9 +395,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "sc" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebbb026ba4a707c25caec2db5ef59ad8b41f7ad77cad06257e06229c891f376" +checksum = "176365c8253e381ad147774b6d9730a1b3fe2d7db498af521ed7d968674a55b3" [[package]] name = "scroll" @@ -455,16 +456,16 @@ version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ - "proc-macro2 1.0.18", + "proc-macro2 1.0.19", "quote 1.0.7", - "syn 1.0.33", + "syn 1.0.36", ] [[package]] name = "serde_json" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" dependencies = [ "itoa", "ryu", @@ -496,11 +497,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" +checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" dependencies = [ - "proc-macro2 1.0.18", + "proc-macro2 1.0.19", "quote 1.0.7", "unicode-xid 0.2.1", ] @@ -514,7 +515,7 @@ dependencies = [ "cfg-if", "libc", "rand 0.7.3", - "redox_syscall 0.1.56", + "redox_syscall 0.1.57", "remove_dir_all", "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index 8553391fba139e3dce92c1a7fa3b267b2a2e2cd9..0a477a45c7ff16a777912e2e73405e1b176fa095 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ default-features = false optional = true [target.'cfg(target_os = "linux")'.dependencies] -sc = "0.2.2" +sc = "0.2.3" [target.'cfg(target_os = "redox")'.dependencies] redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall", rev = "a0ea09ceb3380b1d1e878bb18886e13742d34e8a" } diff --git a/rust-toolchain b/rust-toolchain index 7ff88f6e0b84ae09c7ecb8fb1fac9324090b312b..e1eaad47f2cb0cab6bb3a51cb7ccbe6738136980 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2019-11-25 +nightly-2020-08-01 diff --git a/src/ld_so/tcb.rs b/src/ld_so/tcb.rs index c859903a51fe1d280012cdaa59e688dd8066b174..848901a6ed106fd50f218679a67a54a58b50f70b 100644 --- a/src/ld_so/tcb.rs +++ b/src/ld_so/tcb.rs @@ -193,7 +193,7 @@ impl Tcb { #[cfg(target_arch = "x86_64")] unsafe fn arch_read(offset: usize) -> usize { let value; - asm!(" + llvm_asm!(" mov rax, fs:[rdi] " : "={rax}"(value) diff --git a/src/lib.rs b/src/lib.rs index 9425e7d14bff7fbd90f405d9679fc47919d69231..163d2e118a5a13710c19ff5dd48d24528da62dcd 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,6 +12,7 @@ #![feature(global_asm)] #![feature(lang_items)] #![feature(linkage)] +#![feature(llvm_asm)] #![feature(maybe_uninit_extra)] #![feature(stmt_expr_attributes)] #![feature(str_internals)] diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs index 3115b2805a75749dd642d7544664d3009289aec5..7e996a0fc6b7e9956b658b9c1abf7448caa46224 100644 --- a/src/platform/linux/mod.rs +++ b/src/platform/linux/mod.rs @@ -338,7 +338,7 @@ impl Pal for Sys { unsafe fn pte_clone(stack: *mut usize) -> pid_t { let flags = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND; let pid; - asm!(" + llvm_asm!(" # Call clone syscall syscall