Skip to content

Commit

Permalink
remove customized compiler_builtins
Browse files Browse the repository at this point in the history
  • Loading branch information
@DemesneGH
DemesneGH committed Jun 18, 2024
1 parent db164d3 commit 9f5c62c
Show file tree
Hide file tree
Showing 22 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion examples/acipher-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/aes-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/authentication-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/big_int-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/diffie_hellman-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/digest-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/hello_world-rs/ta/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ proto = { path = "../proto" }

[profile.release]
lto = false
#opt-level = 1
opt-level = 1
2 changes: 1 addition & 1 deletion examples/hello_world-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/hotp-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/message_passing_interface-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/random-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/secure_storage-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/serde-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/signature_verification-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/supp_plugin-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/tcp_client-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/time-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/tls_client-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/tls_server-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion examples/udp_socket-rs/ta/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion optee-utee/Xargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
12 changes: 6 additions & 6 deletions setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/ ]
Expand All @@ -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 && \
Expand Down

0 comments on commit 9f5c62c

Please sign in to comment.