diff options
| author | Andrei Homescu <ahomescu@google.com> | 2024-03-21 00:53:18 +0000 |
|---|---|---|
| committer | Andrei Homescu <ahomescu@google.com> | 2024-03-21 01:22:52 +0000 |
| commit | dd6bdd0e13500367714e04be009d96ca844d0487 (patch) | |
| tree | 0b79af22f42952b3c0b08fb42beb2e4569e717c3 | |
| parent | e09494bbcbc98fcbda046b3892848fadcd260e31 (diff) | |
| download | common-dd6bdd0e13500367714e04be009d96ca844d0487.tar.gz | |
arch: arm64: Add Rust target file for the kernel
Bug: 304850822
Change-Id: Iee9bda4c3288ce01dc4303f7d92926d7500ddb31
| -rw-r--r-- | arch/arm64/aarch64-unknown-trusty-kernel.json | 21 | ||||
| -rw-r--r-- | arch/arm64/toolchain.mk | 4 |
2 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm64/aarch64-unknown-trusty-kernel.json b/arch/arm64/aarch64-unknown-trusty-kernel.json new file mode 100644 index 00000000..e0f01b94 --- /dev/null +++ b/arch/arm64/aarch64-unknown-trusty-kernel.json @@ -0,0 +1,21 @@ +{ + "arch": "aarch64", + "crt-objects-fallback": "musl", + "crt-static-default": false, + "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", + "dynamic-linking": false, + "env": "musl", + "features": "-neon,-fp-armv8,+reserve-x18", + "has-rpath": false, + "linker-flavor": "gnu-cc", + "llvm-target": "aarch64-unknown-unknown-musl", + "max-atomic-width": 128, + "os": "trusty", + "panic-strategy": "abort", + "plt-by-default": false, + "relro-level": "full", + "static-position-independent-executables": true, + "supported-sanitizers": [], + "target-mcount": "\u0001_mcount", + "target-pointer-width": "64" +} diff --git a/arch/arm64/toolchain.mk b/arch/arm64/toolchain.mk index f47150e1..bf251be3 100644 --- a/arch/arm64/toolchain.mk +++ b/arch/arm64/toolchain.mk @@ -30,4 +30,8 @@ ARCH_arm64_COMPILEFLAGS += -target aarch64-$(CLANG_ARM64_TARGET_SYS)-$(CLANG_ARM # Set Rust target to match clang target ARCH_arm64_SUPPORTS_RUST := true +ifeq (true,$(call TOBOOL,$(TRUSTY_USERSPACE))) ARCH_arm64_RUSTFLAGS := --target=aarch64-unknown-trusty +else +ARCH_arm64_RUSTFLAGS := --target=$(LOCAL_DIR)/aarch64-unknown-trusty-kernel.json +endif |