general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update rust-toolchain to nightly-2020-10-25

Browse Source
This commit is contained in:
zongmin.gu 2021-05-18 16:12:38 +08:00 committed by Zongmin.Gu
parent eb046d4241
commit 3756f0658c
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rust-sgx-sdk vendored

@ -1 +1 @@
Subproject commit 77c1d48ca310b1029b672dfc8903666292288632 Subproject commit e2a9b663cdd942659d4c16f8dadda94b1d6fcc6e

2
src/exec/rust-toolchain
View File

@ -1 +1 @@
nightly-2020-09-08 nightly-2020-10-25

24
src/libos/Cargo.lock generated
View File

@ -533,11 +533,11 @@ dependencies = [
[[package]] [[package]]
name = "sgx_alloc" name = "sgx_alloc"
version = "1.1.2" version = "1.1.3"
[[package]] [[package]]
name = "sgx_backtrace_sys" name = "sgx_backtrace_sys"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"cc", "cc",
"sgx_build_helper", "sgx_build_helper",
@ -550,7 +550,7 @@ version = "0.1.3"
[[package]] [[package]]
name = "sgx_cov" name = "sgx_cov"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"profiler_builtins", "profiler_builtins",
@ -562,18 +562,18 @@ dependencies = [
[[package]] [[package]]
name = "sgx_demangle" name = "sgx_demangle"
version = "1.1.2" version = "1.1.3"
[[package]] [[package]]
name = "sgx_libc" name = "sgx_libc"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"sgx_types", "sgx_types",
] ]
[[package]] [[package]]
name = "sgx_rand" name = "sgx_rand"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"sgx_trts", "sgx_trts",
"sgx_tstd", "sgx_tstd",
@ -582,14 +582,14 @@ dependencies = [
[[package]] [[package]]
name = "sgx_tcrypto" name = "sgx_tcrypto"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"sgx_types", "sgx_types",
] ]
[[package]] [[package]]
name = "sgx_tprotected_fs" name = "sgx_tprotected_fs"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"sgx_trts", "sgx_trts",
"sgx_types", "sgx_types",
@ -597,7 +597,7 @@ dependencies = [
[[package]] [[package]]
name = "sgx_trts" name = "sgx_trts"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"sgx_libc", "sgx_libc",
"sgx_types", "sgx_types",
@ -605,14 +605,14 @@ dependencies = [
[[package]] [[package]]
name = "sgx_tse" name = "sgx_tse"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"sgx_types", "sgx_types",
] ]
[[package]] [[package]]
name = "sgx_tstd" name = "sgx_tstd"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"hashbrown_tstd", "hashbrown_tstd",
"sgx_alloc", "sgx_alloc",
@ -627,7 +627,7 @@ dependencies = [
[[package]] [[package]]
name = "sgx_types" name = "sgx_types"
version = "1.1.2" version = "1.1.3"
[[package]] [[package]]
name = "sgx_unwind" name = "sgx_unwind"

2
src/libos/rust-toolchain
View File

@ -1 +1 @@
nightly-2020-09-08 nightly-2020-10-25

2
src/libos/src/error/to_errno.rs
View File

@ -101,7 +101,7 @@ impl ToErrno for rcore_fs::vfs::FsError {
} }
} }
impl ToErrno for std::alloc::AllocErr { impl ToErrno for std::alloc::AllocError {
fn errno(&self) -> Errno { fn errno(&self) -> Errno {
ENOMEM ENOMEM
} }

10
src/libos/src/untrusted/alloc.rs
View File

@ -1,5 +1,5 @@
use super::*; use super::*;
use std::alloc::{AllocErr, AllocRef, Layout}; use std::alloc::{AllocError, AllocRef, Layout};
use std::ptr::{self, write_bytes, NonNull}; use std::ptr::{self, write_bytes, NonNull};
/// The global memory allocator for untrusted memory /// The global memory allocator for untrusted memory
@ -8,9 +8,9 @@ pub static mut UNTRUSTED_ALLOC: UntrustedAlloc = UntrustedAlloc;
pub struct UntrustedAlloc; pub struct UntrustedAlloc;
unsafe impl AllocRef for UntrustedAlloc { unsafe impl AllocRef for UntrustedAlloc {
fn alloc(&mut self, layout: Layout) -> std::result::Result<NonNull<[u8]>, AllocErr> { fn alloc(&self, layout: Layout) -> std::result::Result<NonNull<[u8]>, AllocError> {
if layout.size() == 0 { if layout.size() == 0 {
return Err(AllocErr); return Err(AllocError);
} }
// Do OCall to allocate the untrusted memory according to the given layout // Do OCall to allocate the untrusted memory according to the given layout
@ -26,7 +26,7 @@ unsafe impl AllocRef for UntrustedAlloc {
mem_ptr mem_ptr
} as *mut u8; } as *mut u8;
if mem_ptr == std::ptr::null_mut() { if mem_ptr == std::ptr::null_mut() {
return Err(AllocErr); return Err(AllocError);
} }
// Sanity checks // Sanity checks
@ -43,7 +43,7 @@ unsafe impl AllocRef for UntrustedAlloc {
.unwrap()) .unwrap())
} }
unsafe fn dealloc(&mut self, ptr: NonNull<u8>, layout: Layout) { unsafe fn dealloc(&self, ptr: NonNull<u8>, layout: Layout) {
// Pre-condition: out-of-enclave // Pre-condition: out-of-enclave
debug_assert!(sgx_trts::trts::rsgx_raw_is_outside_enclave( debug_assert!(sgx_trts::trts::rsgx_raw_is_outside_enclave(
ptr.as_ptr(), ptr.as_ptr(),

2
src/libos/src/untrusted/slice_alloc.rs
View File

@ -1,5 +1,5 @@
use super::*; use super::*;
use std::alloc::{AllocErr, AllocRef, Layout}; use std::alloc::{AllocError, AllocRef, Layout};
use std::ptr::NonNull; use std::ptr::NonNull;
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};

2
tools/docker/Dockerfile.aliyunlinux
View File

@ -156,7 +156,7 @@ ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH"
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH" ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2020-09-08 ENV OCCLUM_RUST_VERSION=nightly-2020-10-25
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \
rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \

2
tools/docker/Dockerfile.centos8.2
View File

@ -55,7 +55,7 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH" ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2020-09-08 ENV OCCLUM_RUST_VERSION=nightly-2020-10-25
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \
rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \

2
tools/docker/Dockerfile.ubuntu18.04
View File

@ -72,7 +72,7 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH" ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2020-09-08 ENV OCCLUM_RUST_VERSION=nightly-2020-10-25
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \
rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \