Use aarch64-unknown-none target when enable fp_simd

kunyuanxu-star · May 11, 2024 · 8e7daf6 · 8e7daf6
1 parent 4e41da5
commit 8e7daf6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
       with:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, clippy, rustfmt
-        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat
     - name: Check rust version
       run: rustc --version --verbose
     - name: Clippy for the default target
@@ -47,7 +47,7 @@ jobs:
       with:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, llvm-tools
-        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
     - run: cargo install cargo-binutils
     - name: Build helloworld
@@ -122,7 +122,7 @@ jobs:
       with:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, llvm-tools
-        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
     - run: cargo install cargo-binutils
     - uses: ./.github/workflows/actions/setup-musl

diff --git a/Makefile b/Makefile
@@ -68,7 +68,7 @@ else
   APP_TYPE := c
 endif
 
-# Architecture, platform and target
+# Architecture and platform
 ifneq ($(filter $(MAKECMDGOALS),unittest unittest_no_fail_fast),)
   PLATFORM_NAME :=
 else ifneq ($(PLATFORM),)
@@ -97,20 +97,33 @@ ifeq ($(ARCH), x86_64)
   # Don't enable kvm for WSL/WSL2.
   ACCEL ?= $(if $(findstring -microsoft, $(shell uname -r | tr '[:upper:]' '[:lower:]')),n,y)
   PLATFORM_NAME ?= x86_64-qemu-q35
-  TARGET := x86_64-unknown-none
   BUS := pci
 else ifeq ($(ARCH), riscv64)
   ACCEL ?= n
   PLATFORM_NAME ?= riscv64-qemu-virt
-  TARGET := riscv64gc-unknown-none-elf
 else ifeq ($(ARCH), aarch64)
   ACCEL ?= n
   PLATFORM_NAME ?= aarch64-qemu-virt
-  TARGET := aarch64-unknown-none-softfloat
 else
   $(error "ARCH" must be one of "x86_64", "riscv64", or "aarch64")
 endif
 
+# Feature parsing
+include scripts/make/features.mk
+
+# Target
+ifeq ($(ARCH), x86_64)
+  TARGET := x86_64-unknown-none
+else ifeq ($(ARCH), riscv64)
+  TARGET := riscv64gc-unknown-none-elf
+else ifeq ($(ARCH), aarch64)
+  ifeq ($(findstring fp_simd,$(FEATURES)),)
+    TARGET := aarch64-unknown-none-softfloat
+  else
+    TARGET := aarch64-unknown-none
+  endif
+endif
+
 export AX_ARCH=$(ARCH)
 export AX_PLATFORM=$(PLATFORM_NAME)
 export AX_SMP=$(SMP)

diff --git a/modules/axhal/src/platform/aarch64_common/boot.rs b/modules/axhal/src/platform/aarch64_common/boot.rs
@@ -117,9 +117,9 @@ unsafe extern "C" fn _start() -> ! {
         mov     sp, x8
 
         bl      {switch_to_el1}         // switch to EL1
+        bl      {enable_fp}             // enable fp/neon
         bl      {init_boot_page_table}
         bl      {init_mmu}              // setup MMU
-        bl      {enable_fp}             // enable fp/neon
 
         mov     x8, {phys_virt_offset}  // set SP to the high address
         add     sp, sp, x8

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
 profile = "minimal"
 channel = "nightly-2024-01-19"
-components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]
-targets = ["x86_64-unknown-none", "riscv64gc-unknown-none-elf", "aarch64-unknown-none-softfloat"]
+components = ["rust-src", "llvm-tools", "rustfmt", "clippy"]
+targets = ["x86_64-unknown-none", "riscv64gc-unknown-none-elf", "aarch64-unknown-none", "aarch64-unknown-none-softfloat"]
diff --git a/scripts/make/build.mk b/scripts/make/build.mk
@@ -1,7 +1,6 @@
 # Main building script
 
 include scripts/make/cargo.mk
-include scripts/make/features.mk
 
 ifeq ($(APP_TYPE), c)
   include scripts/make/build_c.mk

diff --git a/scripts/make/build_c.mk b/scripts/make/build_c.mk
@@ -38,7 +38,7 @@ ifeq ($(findstring fp_simd,$(FEATURES)),)
     CFLAGS += -mgeneral-regs-only
   endif
 else
-  ifeq ($(ARCH), riscv64)
+  ifneq ($(filter $(ARCH),riscv64 aarch64),)
     # for compiler-rt fallbacks like `__divtf3`, `__multf3`, ...
     libgcc := $(shell $(CC) -print-libgcc-file-name)
   endif