summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Randhawa <robin.randhawa@arm.com>2021-01-15 12:20:50 +0000
committerJeremy Soller <jeremy@system76.com>2021-01-15 06:14:33 -0700
commitafb509a6e9cacef22b0fd4085f417ec30b2adb28 (patch)
treeab16e97ba0f77b6ccbb2681ffdd99a00c6effdbd
parent816895cf513b46f73f10b3d8f2a64c7a9dee24ac (diff)
mk/kernel.mk: aarch64: Use full path to target JSON spec
In that JSON spec file, we now use target-features to specify the use of the tpidr_el1 instruction for kernel side TLS accesses. This means we can step aside from the unfortunate LLVM requirement to use the kernel code model in order for tpidr_el1 instructions to be emitted. In addition, we suppress generation of NEON instructions for the kernel.
-rw-r--r--mk/kernel.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/kernel.mk b/mk/kernel.mk
index ae0321a..b6634bd 100644
--- a/mk/kernel.mk
+++ b/mk/kernel.mk
@@ -2,7 +2,7 @@ build/libkernel.a: kernel/Cargo.lock kernel/Cargo.toml kernel/src/* kernel/src/*
export PATH="$(PREFIX_PATH):$$PATH" && \
export INITFS_FOLDER=$(ROOT)/build/initfs && \
cd kernel && \
- cargo rustc --lib --target=$(KTARGET) --release -Z build-std=core,alloc -- -C code-model=kernel -C soft-float -C debuginfo=2 -C lto --emit link=../$@
+ cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release -Z build-std=core,alloc -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@
build/libkernel_coreboot.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* kernel/src/*/*/*/* build/initfs_coreboot.tag
export PATH="$(PREFIX_PATH):$$PATH" && \