This is an automated email from the ASF dual-hosted git repository. yuanz pushed a commit to branch no-std in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit dafac72683ac7228853d2c2494bf669dbcd3a027 Author: Sumit Garg <[email protected]> AuthorDate: Thu Dec 28 15:35:13 2023 +0530 Drop downstream OP-TEE toolchain target support Downstream OP-TEE toolchain is not needed to no_std TAs, hence drop it. Along with that drop xargo support as we no longer require custom sysroot setup for TAs to be built under no_std environment. Signed-off-by: Sumit Garg <[email protected]> --- .licenserc.yaml | 5 ----- Dockerfile | 5 +---- aarch64-unknown-optee-trustzone.json | 20 -------------------- arm-unknown-optee-trustzone.json | 21 --------------------- optee-utee/Xargo.toml | 25 ------------------------- rust-toolchain.toml | 1 - setup.sh | 34 ---------------------------------- 7 files changed, 1 insertion(+), 110 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index c65f735..0f46f77 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -27,10 +27,5 @@ header: - 'LICENSE' - 'NOTICE' - '**/Cargo.lock' - - '**/*.lds' - - 'aarch64-unknown-optee-trustzone.json' - - 'arm-unknown-optee-trustzone.json' - 'KEYS' - 'DISCLAIMER-WIP' - - '.gitmodules' - - 'examples/tls_server-rs/ta/test-ca/**' diff --git a/Dockerfile b/Dockerfile index 1e1cd58..7e2e647 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,10 +88,7 @@ RUN apt-get install -y software-properties-common && \ # Install Rust RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \ . $HOME/.cargo/env && \ - rustup default nightly-2021-09-20 && \ - rustup component add rust-src && \ rustup target install aarch64-unknown-linux-gnu && \ - rustup default 1.44.0 && cargo +1.44.0 install xargo && \ - rustup default nightly-2021-09-20 + rustup default nightly-2023-12-18 ENV PATH="/root/.cargo/bin:$PATH" diff --git a/aarch64-unknown-optee-trustzone.json b/aarch64-unknown-optee-trustzone.json deleted file mode 100644 index 160e45a..0000000 --- a/aarch64-unknown-optee-trustzone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "arch": "aarch64", - "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", - "env": "trustzone", - "dynamic-linking": false, - "executables": true, - "has-rpath": true, - "linker-flavor": "ld", - "linker-is-gnu": true, - "llvm-target": "aarch64-unknown-linux-gnu", - "max-atomic-width": 128, - "os": "optee", - "position-independent-executables": true, - "relro-level": "full", - "target-c-int-width": "32", - "target-endian": "little", - "target-pointer-width": "64", - "vendor": "unknown", - "panic-strategy": "abort" -} diff --git a/arm-unknown-optee-trustzone.json b/arm-unknown-optee-trustzone.json deleted file mode 100644 index d271a94..0000000 --- a/arm-unknown-optee-trustzone.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "arch": "arm", - "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", - "dynamic-linking": false, - "env": "trustzone", - "executables": true, - "features": "+strict-align,+v6,+vfp2", - "has-rpath": true, - "linker-flavor": "ld", - "linker-is-gnu": true, - "llvm-target": "arm-unknown-linux-gnueabihf", - "max-atomic-width": 64, - "os": "optee", - "position-independent-executables": true, - "relro-level": "full", - "target-c-int-width": "32", - "target-endian": "little", - "target-pointer-width": "32", - "vendor": "unknown", - "panic-strategy": "abort" -} diff --git a/optee-utee/Xargo.toml b/optee-utee/Xargo.toml deleted file mode 100644 index e5b0856..0000000 --- a/optee-utee/Xargo.toml +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -[dependencies.std] -path = "../rust/rust/library/std" - -[patch.crates-io] -libc = { path = "../rust/libc" } -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/rust-toolchain.toml b/rust-toolchain.toml index b131b12..4663e2f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -19,5 +19,4 @@ [toolchain] channel = "nightly-2023-12-18" -components = ["rust-src"] targets = ["aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabihf"] diff --git a/setup.sh b/setup.sh index 50030b9..fda0e08 100755 --- a/setup.sh +++ b/setup.sh @@ -39,9 +39,6 @@ fi # "cargo --version" since it has no other effect. cargo --version >/dev/null -# install Xargo -cargo +stable install xargo - ######################################################## # initialize submodules: optee_os / optee_client / build OPTEE_RELEASE_VERSION=3.20.0 @@ -90,34 +87,3 @@ then else echo "OPTEE_DIR has been set, omit to download optee submodules" fi - - -######################################################## -# initialize submodules: rust / compiler-builtins / libc -RUST_COMMIT_ID=cb8a61693c80ebc615c2b66f40f0789cd16e699a -COMPILER_BUILTINS_COMMIT_ID=45a2e4996fe732172004b292b07397f9a02265ab -LIBC_COMMIT_ID=1ddfbbbc190bec0f5ec32b08e97585b34d0c6b09 - -if [ -d rust/ ] -then - rm -r rust/ -fi - -mkdir rust && cd rust - -git clone https://github.com/mesalock-linux/rust.git && \ - (cd rust && \ - git checkout "$RUST_COMMIT_ID" && \ - git submodule update --init library/stdarch && \ - git submodule update --init library/backtrace) - -git clone https://github.com/mesalock-linux/compiler-builtins.git && \ - (cd compiler-builtins && \ - git checkout "$COMPILER_BUILTINS_COMMIT_ID" && \ - git submodule update --init libm) - -git clone https://github.com/mesalock-linux/libc.git && \ - (cd libc && \ - git checkout "$LIBC_COMMIT_ID") - -echo "Rust submodules initialized" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
