This is an automated email from the ASF dual-hosted git repository. yuanz pushed a commit to branch release-v0.3.0 in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit d8d296c613c0b789bb346a1044000cc300e3503a Author: Yuan Zhuang <[email protected]> AuthorDate: Tue Jun 18 09:02:25 2024 +0000 remove customized compiler_builtins --- examples/acipher-rs/ta/Xargo.toml | 2 +- examples/aes-rs/ta/Xargo.toml | 2 +- examples/authentication-rs/ta/Xargo.toml | 2 +- examples/big_int-rs/ta/Xargo.toml | 2 +- examples/diffie_hellman-rs/ta/Xargo.toml | 2 +- examples/digest-rs/ta/Xargo.toml | 2 +- examples/hello_world-rs/ta/Cargo.toml | 2 +- examples/hello_world-rs/ta/Xargo.toml | 2 +- examples/hotp-rs/ta/Xargo.toml | 2 +- examples/message_passing_interface-rs/ta/Xargo.toml | 2 +- examples/random-rs/ta/Xargo.toml | 2 +- examples/secure_storage-rs/ta/Xargo.toml | 2 +- examples/serde-rs/ta/Xargo.toml | 2 +- examples/signature_verification-rs/ta/Xargo.toml | 2 +- examples/supp_plugin-rs/ta/Xargo.toml | 2 +- examples/tcp_client-rs/ta/Xargo.toml | 2 +- examples/time-rs/ta/Xargo.toml | 2 +- examples/tls_client-rs/ta/Xargo.toml | 2 +- examples/tls_server-rs/ta/Xargo.toml | 2 +- examples/udp_socket-rs/ta/Xargo.toml | 2 +- optee-utee/Xargo.toml | 2 +- setup.sh | 12 ++++++------ 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/acipher-rs/ta/Xargo.toml b/examples/acipher-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/acipher-rs/ta/Xargo.toml +++ b/examples/acipher-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/aes-rs/ta/Xargo.toml b/examples/aes-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/aes-rs/ta/Xargo.toml +++ b/examples/aes-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/authentication-rs/ta/Xargo.toml b/examples/authentication-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/authentication-rs/ta/Xargo.toml +++ b/examples/authentication-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/big_int-rs/ta/Xargo.toml b/examples/big_int-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/big_int-rs/ta/Xargo.toml +++ b/examples/big_int-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/diffie_hellman-rs/ta/Xargo.toml b/examples/diffie_hellman-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/diffie_hellman-rs/ta/Xargo.toml +++ b/examples/diffie_hellman-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/digest-rs/ta/Xargo.toml b/examples/digest-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/digest-rs/ta/Xargo.toml +++ b/examples/digest-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/hello_world-rs/ta/Cargo.toml b/examples/hello_world-rs/ta/Cargo.toml index 4fb0927..a426986 100644 --- a/examples/hello_world-rs/ta/Cargo.toml +++ b/examples/hello_world-rs/ta/Cargo.toml @@ -36,4 +36,4 @@ proto = { path = "../proto" } [profile.release] lto = false -#opt-level = 1 +opt-level = 1 diff --git a/examples/hello_world-rs/ta/Xargo.toml b/examples/hello_world-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/hello_world-rs/ta/Xargo.toml +++ b/examples/hello_world-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/hotp-rs/ta/Xargo.toml b/examples/hotp-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/hotp-rs/ta/Xargo.toml +++ b/examples/hotp-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/message_passing_interface-rs/ta/Xargo.toml b/examples/message_passing_interface-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/message_passing_interface-rs/ta/Xargo.toml +++ b/examples/message_passing_interface-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/random-rs/ta/Xargo.toml b/examples/random-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/random-rs/ta/Xargo.toml +++ b/examples/random-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/secure_storage-rs/ta/Xargo.toml b/examples/secure_storage-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/secure_storage-rs/ta/Xargo.toml +++ b/examples/secure_storage-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/serde-rs/ta/Xargo.toml b/examples/serde-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/serde-rs/ta/Xargo.toml +++ b/examples/serde-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/signature_verification-rs/ta/Xargo.toml b/examples/signature_verification-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/signature_verification-rs/ta/Xargo.toml +++ b/examples/signature_verification-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/supp_plugin-rs/ta/Xargo.toml b/examples/supp_plugin-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/supp_plugin-rs/ta/Xargo.toml +++ b/examples/supp_plugin-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/tcp_client-rs/ta/Xargo.toml b/examples/tcp_client-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/tcp_client-rs/ta/Xargo.toml +++ b/examples/tcp_client-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/time-rs/ta/Xargo.toml b/examples/time-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/time-rs/ta/Xargo.toml +++ b/examples/time-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/tls_client-rs/ta/Xargo.toml b/examples/tls_client-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/tls_client-rs/ta/Xargo.toml +++ b/examples/tls_client-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/tls_server-rs/ta/Xargo.toml b/examples/tls_server-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/tls_server-rs/ta/Xargo.toml +++ b/examples/tls_server-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/examples/udp_socket-rs/ta/Xargo.toml b/examples/udp_socket-rs/ta/Xargo.toml index c9ed04e..7c09142 100644 --- a/examples/udp_socket-rs/ta/Xargo.toml +++ b/examples/udp_socket-rs/ta/Xargo.toml @@ -20,6 +20,6 @@ path = "../../../rust/rust/library/std" [patch.crates-io] libc = { path = "../../../rust/libc" } -compiler_builtins = { path = "../../../rust/compiler-builtins" } +#compiler_builtins = { path = "../../../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/optee-utee/Xargo.toml b/optee-utee/Xargo.toml index e5b0856..80ec80d 100644 --- a/optee-utee/Xargo.toml +++ b/optee-utee/Xargo.toml @@ -20,6 +20,6 @@ path = "../rust/rust/library/std" [patch.crates-io] libc = { path = "../rust/libc" } -compiler_builtins = { path = "../rust/compiler-builtins" } +#compiler_builtins = { path = "../rust/compiler-builtins" } rustc-std-workspace-core = { path = "../rust/rust/library/rustc-std-workspace-core" } rustc-std-workspace-alloc = { path = "../rust/rust/library/rustc-std-workspace-alloc" } diff --git a/setup.sh b/setup.sh index 77c2547..375cbc1 100755 --- a/setup.sh +++ b/setup.sh @@ -94,8 +94,8 @@ fi ######################################################## # initialize submodules: rust / compiler-builtins / libc -RUST_COMMIT_ID=036938275b5f1e6c75037df00fdc2a3187711b43 -COMPILER_BUILTINS_COMMIT_ID=42284ae2bc0937440ab1c1edd08981107b6a976c +RUST_COMMIT_ID=7af4c8ab9ea24a3679ba0f5ba71495391fa135b6 +#COMPILER_BUILTINS_COMMIT_ID=42284ae2bc0937440ab1c1edd08981107b6a976c LIBC_COMMIT_ID=4fa30318ed3175f6ebe22da8f167f9f9b34567c3 if [ -d rust/ ] @@ -111,10 +111,10 @@ git clone https://github.com/DemesneGH/rust.git && \ git submodule update --init library/stdarch && \ git submodule update --init library/backtrace) -git clone https://github.com/DemesneGH/compiler-builtins.git && \ - (cd compiler-builtins && \ - git checkout "$COMPILER_BUILTINS_COMMIT_ID" && \ - git submodule update --init libm) +# git clone https://github.com/DemesneGH/compiler-builtins.git && \ +# (cd compiler-builtins && \ +# git checkout "$COMPILER_BUILTINS_COMMIT_ID" && \ +# git submodule update --init libm) git clone https://github.com/DemesneGH/libc.git && \ (cd libc && \ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
