Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rust-toolchain to nightly-2022-02-23 #388

Merged
merged 1 commit into from
Jun 6, 2022
Merged

Update rust-toolchain to nightly-2022-02-23 #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion dockerfile/Dockerfile.1804.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN bash /root/04_psw.sh

# Seventh, Rust

ENV rust_toolchain nightly-2021-11-01
ENV rust_toolchain nightly-2022-02-23
ADD 05_rust.sh /root
RUN bash /root/05_rust.sh

Expand Down
2 changes: 1 addition & 1 deletion dockerfile/Dockerfile.2004.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN bash /root/04_psw.sh

# Seventh, Rust

ENV rust_toolchain nightly-2021-11-01
ENV rust_toolchain nightly-2022-02-23
ADD 05_rust.sh /root
RUN bash /root/05_rust.sh

Expand Down
2 changes: 1 addition & 1 deletion dockerfile/Dockerfile.centos8.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ENV PSW_REPO="https://download.01.org/intel-sgx/sgx-linux/2.16/distro/centos-str
ADD 04_psw_rpm.sh /root
RUN bash /root/04_psw_rpm.sh

ENV rust_toolchain nightly-2021-11-01
ENV rust_toolchain nightly-2022-02-23
ADD 05_rust.sh /root
RUN bash /root/05_rust.sh

Expand Down
3 changes: 3 additions & 0 deletions edl/sgx_file.edl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ enclave {
untrusted {
int u_open_ocall([out] int *error, [in, string] const char *pathname, int flags);
int u_open64_ocall([out] int *error, [in, string] const char *path, int oflag, int mode);
int u_openat_ocall([out] int *error, int dirfd, [in, string] const char *pathname, int flags);

int u_fstat_ocall([out] int *error, int fd, [out] struct stat_t *buf);
int u_fstat64_ocall([out] int *error, int fd, [out] struct stat64_t *buf);
Expand All @@ -46,6 +47,7 @@ enclave {
int u_fchmod_ocall([out] int *error, int fd, uint32_t mode);
int u_unlink_ocall([out] int *error, [in, string] const char *pathname);
int u_link_ocall([out] int *error, [in, string] const char *oldpath, [in, string] const char *newpath);
int u_unlinkat_ocall([out] int *error, int dirfd, [in, string] const char *pathname, int flags);
int u_linkat_ocall([out] int *error, int olddirfd, [in, string] const char *oldpath, int newdirfd, [in, string] const char *newpath, int flags);
int u_rename_ocall([out] int *error, [in, string] const char *oldpath, [in, string] const char *newpath);
int u_chmod_ocall([out] int *error, [in, string] const char *path, uint32_t mode);
Expand All @@ -54,6 +56,7 @@ enclave {
char *u_realpath_ocall([out] int *error, [in, string] const char *pathname);
int u_mkdir_ocall([out] int *error, [in, string] const char *pathname, uint32_t mode);
int u_rmdir_ocall([out] int *error, [in, string] const char *pathname);
void *u_fdopendir_ocall([out] int *error, int fd);
void *u_opendir_ocall([out] int *error, [in, string] const char *pathname);
int u_readdir64_r_ocall([user_check] void *dirp, [in, out] struct dirent64_t *entry, [out] struct dirent64_t **result);
int u_closedir_ocall([out] int *error, [user_check] void *dirp);
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2021-11-01
nightly-2022-02-23
2 changes: 2 additions & 0 deletions samplecode/backtrace/enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", features =
sgx_backtrace = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
sgx_alloc = { path = "../../../sgx_alloc" }
sgx_backtrace = { path = "../../../sgx_backtrace" }
sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
Expand All @@ -24,6 +25,7 @@ sgx_cov = { path = "../../../sgx_cov" }
sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
sgx_demangle = { path = "../../../sgx_demangle" }
sgx_libc = { path = "../../../sgx_libc" }
sgx_no_tstd = { path = "../../../sgx_no_tstd" }
sgx_rand = { path = "../../../sgx_rand" }
sgx_rand_derive = { path = "../../../sgx_rand_derive" }
sgx_serialize = { path = "../../../sgx_serialize" }
Expand Down
1 change: 1 addition & 0 deletions samplecode/backtrace/enclave/Xargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ stage = 7
[dependencies.sgx_cov]
path = "../../../sgx_cov"
stage = 7

[dependencies.sgx_signal]
path = "../../../sgx_signal"
stage = 7
11 changes: 9 additions & 2 deletions samplecode/backtrace/enclave/x86_64-unknown-linux-sgx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"arch": "x86_64",
"cpu": "x86-64",
"crt-static-respected": true,
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"dynamic-linking": true,
"env": "sgx",
"exe-allocation-crate": "alloc_system",
"executables": true,
"has-elf-tls": true,
"has-rpath": true,
"has-thread-local": true,
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "x86_64-unknown-linux-gnu",
Expand All @@ -30,6 +30,13 @@
1
]
},
"supported-sanitizers": [
"address",
"cfi",
"leak",
"memory",
"thread"
],
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "unix",
Expand Down
6 changes: 4 additions & 2 deletions samplecode/crypto/enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tcrypto = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
sgx_alloc = { path = "../../../sgx_alloc" }
sgx_backtrace = { path = "../../../sgx_backtrace" }
sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
Expand All @@ -25,6 +26,7 @@ sgx_cov = { path = "../../../sgx_cov" }
sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
sgx_demangle = { path = "../../../sgx_demangle" }
sgx_libc = { path = "../../../sgx_libc" }
sgx_no_tstd = { path = "../../../sgx_no_tstd" }
sgx_rand = { path = "../../../sgx_rand" }
sgx_rand_derive = { path = "../../../sgx_rand_derive" }
sgx_serialize = { path = "../../../sgx_serialize" }
Expand All @@ -41,6 +43,6 @@ sgx_tseal = { path = "../../../sgx_tseal" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
sgx_ucrypto = { path = "../../../sgx_ucrypto" }
#sgx_ucrypto = { path = "../../../sgx_ucrypto" }
sgx_unwind = { path = "../../../sgx_unwind" }
sgx_urts = { path = "../../../sgx_urts" }
#sgx_urts = { path = "../../../sgx_urts" }
11 changes: 9 additions & 2 deletions samplecode/crypto/enclave/x86_64-unknown-linux-sgx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"arch": "x86_64",
"cpu": "x86-64",
"crt-static-respected": true,
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"dynamic-linking": true,
"env": "sgx",
"exe-allocation-crate": "alloc_system",
"executables": true,
"has-elf-tls": true,
"has-rpath": true,
"has-thread-local": true,
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "x86_64-unknown-linux-gnu",
Expand All @@ -30,6 +30,13 @@
1
]
},
"supported-sanitizers": [
"address",
"cfi",
"leak",
"memory",
"thread"
],
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "unix",
Expand Down
4 changes: 3 additions & 1 deletion samplecode/db-proxy/db-proxy/enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_align_struct_attribute = { path = "../../../../sgx_align_struct_attribute" }
sgx_alloc = { path = "../../../../sgx_alloc" }
sgx_backtrace = { path = "../../../../sgx_backtrace" }
sgx_backtrace_sys = { path = "../../../../sgx_backtrace_sys" }
Expand All @@ -23,6 +24,7 @@ sgx_cov = { path = "../../../../sgx_cov" }
sgx_crypto_helper = { path = "../../../../sgx_crypto_helper" }
sgx_demangle = { path = "../../../../sgx_demangle" }
sgx_libc = { path = "../../../../sgx_libc" }
sgx_no_tstd = { path = "../../../../sgx_no_tstd" }
sgx_rand = { path = "../../../../sgx_rand" }
sgx_rand_derive = { path = "../../../../sgx_rand_derive" }
sgx_serialize = { path = "../../../../sgx_serialize" }
Expand All @@ -41,4 +43,4 @@ sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
#sgx_ucrypto = { path = "../../../../sgx_ucrypto" }
sgx_unwind = { path = "../../../../sgx_unwind" }
#sgx_urts = { path = "../../../../sgx_urts" }
#sgx_urts = { path = "../../../../sgx_urts" }
11 changes: 9 additions & 2 deletions samplecode/db-proxy/db-proxy/enclave/x86_64-unknown-linux-sgx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"arch": "x86_64",
"cpu": "x86-64",
"crt-static-respected": true,
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"dynamic-linking": true,
"env": "sgx",
"exe-allocation-crate": "alloc_system",
"executables": true,
"has-elf-tls": true,
"has-rpath": true,
"has-thread-local": true,
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "x86_64-unknown-linux-gnu",
Expand All @@ -30,6 +30,13 @@
1
]
},
"supported-sanitizers": [
"address",
"cfi",
"leak",
"memory",
"thread"
],
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "unix",
Expand Down
11 changes: 9 additions & 2 deletions samplecode/dcap-pckretrieval/enclave/x86_64-unknown-linux-sgx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"arch": "x86_64",
"cpu": "x86-64",
"crt-static-respected": true,
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"dynamic-linking": true,
"env": "sgx",
"exe-allocation-crate": "alloc_system",
"executables": true,
"has-elf-tls": true,
"has-rpath": true,
"has-thread-local": true,
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "x86_64-unknown-linux-gnu",
Expand All @@ -30,6 +30,13 @@
1
]
},
"supported-sanitizers": [
"address",
"cfi",
"leak",
"memory",
"thread"
],
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "unix",
Expand Down
2 changes: 2 additions & 0 deletions samplecode/file/enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ sgx_rand_derive = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_serialize_derive = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
sgx_alloc = { path = "../../../sgx_alloc" }
sgx_backtrace = { path = "../../../sgx_backtrace" }
sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
Expand All @@ -28,6 +29,7 @@ sgx_cov = { path = "../../../sgx_cov" }
sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
sgx_demangle = { path = "../../../sgx_demangle" }
sgx_libc = { path = "../../../sgx_libc" }
sgx_no_tstd = { path = "../../../sgx_no_tstd" }
sgx_rand = { path = "../../../sgx_rand" }
sgx_rand_derive = { path = "../../../sgx_rand_derive" }
sgx_serialize = { path = "../../../sgx_serialize" }
Expand Down
11 changes: 9 additions & 2 deletions samplecode/file/enclave/x86_64-unknown-linux-sgx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"arch": "x86_64",
"cpu": "x86-64",
"crt-static-respected": true,
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"dynamic-linking": true,
"env": "sgx",
"exe-allocation-crate": "alloc_system",
"executables": true,
"has-elf-tls": true,
"has-rpath": true,
"has-thread-local": true,
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "x86_64-unknown-linux-gnu",
Expand All @@ -30,6 +30,13 @@
1
]
},
"supported-sanitizers": [
"address",
"cfi",
"leak",
"memory",
"thread"
],
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "unix",
Expand Down
2 changes: 2 additions & 0 deletions samplecode/hello-regex/enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
sgx_alloc = { path = "../../../sgx_alloc" }
sgx_backtrace = { path = "../../../sgx_backtrace" }
sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
Expand All @@ -26,6 +27,7 @@ sgx_cov = { path = "../../../sgx_cov" }
sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
sgx_demangle = { path = "../../../sgx_demangle" }
sgx_libc = { path = "../../../sgx_libc" }
sgx_no_tstd = { path = "../../../sgx_no_tstd" }
sgx_rand = { path = "../../../sgx_rand" }
sgx_rand_derive = { path = "../../../sgx_rand_derive" }
sgx_serialize = { path = "../../../sgx_serialize" }
Expand Down
11 changes: 9 additions & 2 deletions samplecode/hello-regex/enclave/x86_64-unknown-linux-sgx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"arch": "x86_64",
"cpu": "x86-64",
"crt-static-respected": true,
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"dynamic-linking": true,
"env": "sgx",
"exe-allocation-crate": "alloc_system",
"executables": true,
"has-elf-tls": true,
"has-rpath": true,
"has-thread-local": true,
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "x86_64-unknown-linux-gnu",
Expand All @@ -30,6 +30,13 @@
1
]
},
"supported-sanitizers": [
"address",
"cfi",
"leak",
"memory",
"thread"
],
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "unix",
Expand Down
26 changes: 0 additions & 26 deletions samplecode/hello-rust-vscode-debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,3 @@ members = [
"app",
"enclave",
]

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_alloc = { path = "../../sgx_alloc" }
sgx_build_helper = { path = "../../sgx_build_helper" }
sgx_cov = { path = "../../sgx_cov" }
sgx_crypto_helper = { path = "../../sgx_crypto_helper" }
sgx_libc = { path = "../../sgx_libc" }
sgx_rand = { path = "../../sgx_rand" }
sgx_rand_derive = { path = "../../sgx_rand_derive" }
sgx_serialize = { path = "../../sgx_serialize" }
sgx_serialize_derive = { path = "../../sgx_serialize_derive" }
sgx_serialize_derive_internals = { path = "../../sgx_serialize_derive_internals" }
sgx_tcrypto = { path = "../../sgx_tcrypto" }
sgx_tcrypto_helper = { path = "../../sgx_tcrypto_helper" }
sgx_tdh = { path = "../../sgx_tdh" }
sgx_tkey_exchange = { path = "../../sgx_tkey_exchange" }
sgx_tprotected_fs = { path = "../../sgx_tprotected_fs" }
sgx_trts = { path = "../../sgx_trts" }
sgx_tse = { path = "../../sgx_tse" }
sgx_tseal = { path = "../../sgx_tseal" }
sgx_tstd = { path = "../../sgx_tstd" }
sgx_tunittest = { path = "../../sgx_tunittest" }
sgx_types = { path = "../../sgx_types" }
sgx_ucrypto = { path = "../../sgx_ucrypto" }
sgx_unwind = { path = "../../sgx_unwind" }
sgx_urts = { path = "../../sgx_urts" }
2 changes: 2 additions & 0 deletions samplecode/hello-rust-vscode-debug/enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
sgx_alloc = { path = "../../../sgx_alloc" }
sgx_backtrace = { path = "../../../sgx_backtrace" }
sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
Expand All @@ -23,6 +24,7 @@ sgx_cov = { path = "../../../sgx_cov" }
sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
sgx_demangle = { path = "../../../sgx_demangle" }
sgx_libc = { path = "../../../sgx_libc" }
sgx_no_tstd = { path = "../../../sgx_no_tstd" }
sgx_rand = { path = "../../../sgx_rand" }
sgx_rand_derive = { path = "../../../sgx_rand_derive" }
sgx_serialize = { path = "../../../sgx_serialize" }
Expand Down
Loading