From aa32705d1e8c71a961847ea86c615d6e059257ca Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sat, 8 Jan 2022 09:49:51 +0100 Subject: [PATCH 1/3] removing kernel targets In #197 we discuss to use x86_64-unknown-none target instead of the special `kernel` target. Also the aarch64 port has to use aarch64-unknown-none-softfloat. The floating point unit should not use in the kernel space. --- hermit-sys/build.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hermit-sys/build.rs b/hermit-sys/build.rs index 494e2eafd..83b485f65 100644 --- a/hermit-sys/build.rs +++ b/hermit-sys/build.rs @@ -39,8 +39,8 @@ fn build_hermit(src_dir: &Path, target_dir_opt: Option<&Path>) { let mut cmd = Command::new("cargo"); let kernel_triple = match target_arch.as_str() { - "x86_64" => "x86_64-unknown-none-hermitkernel", - "aarch64" => "aarch64-unknown-hermit", + "x86_64" => "x86_64-unknown-none", + "aarch64" => "aarch64-unknown-none-softfloat", _ => panic!("Unsupported target arch: {}", target_arch), }; From e874597ff6c62eaa08883590669221c9f05d1cc6 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sat, 8 Jan 2022 12:36:14 +0100 Subject: [PATCH 2/3] build also aarch64 kernel --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6267b3755..aa0e8bd32 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -73,3 +73,8 @@ jobs: - name: Build httpd without DHCP support run: cargo build --package httpd + - name: Build aarch64 debug profile + run: + cargo build -p hello_world --target aarch64-unknown-hermit + - name: Build aarch64 release profile + cargo build -p hello_world --target aarch64-unknown-hermit --release From 9534bf750fa1a24cdfa6bdcbaf2cbe9da67537a0 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sat, 8 Jan 2022 12:51:52 +0100 Subject: [PATCH 3/3] remove typo --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa0e8bd32..b3748d89d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,4 +77,5 @@ jobs: run: cargo build -p hello_world --target aarch64-unknown-hermit - name: Build aarch64 release profile + run: cargo build -p hello_world --target aarch64-unknown-hermit --release