Commit 36060a4a authored by Martin Kröning's avatar Martin Kröning 🦀
Browse files

Complete migration of kernel target

I noticed this due to failing docs CI [1]
The rename began in 18dd15f5.
It seems that the repository-local json target specifications are not used, so I removed those.

[1] https://github.com/hermitcore/libhermit-rs/runs/2889060428
parent e30332a5
......@@ -8,5 +8,5 @@ rustflags = [
"-Zmutable-noalias=no"
]
[target.x86_64-unknown-hermit-kernel]
[target.x86_64-unknown-none-hermitkernel]
runner = "tests/hermit_test_runner.py"
......@@ -20,7 +20,7 @@ jobs:
run: cargo doc
- name: Generate index.html
run: |
cat > target/x86_64-unknown-hermit-kernel/doc/index.html <<EOL
cat > target/x86_64-unknown-none-hermitkernel/doc/index.html <<EOL
<!doctype html>
<html>
<head>
......@@ -37,6 +37,6 @@ jobs:
uses: crazy-max/ghaction-github-pages@v2
with:
target_branch: gh-pages
build_dir: target/x86_64-unknown-hermit-kernel/doc
build_dir: target/x86_64-unknown-none-hermitkernel/doc
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
project(librs C)
# Add the Cargo project to build the Rust library.
set(HERMIT_RS "${CMAKE_BINARY_DIR}/hermit_rs/${HERMIT_ARCH}-unknown-hermit-kernel/${CARGO_BUILDTYPE_OUTPUT}/libhermit.a")
set(HERMIT_RS "${CMAKE_BINARY_DIR}/hermit_rs/${HERMIT_ARCH}-unknown-none-hermitkernel/${CARGO_BUILDTYPE_OUTPUT}/libhermit.a")
add_custom_target(hermit_rs
COMMAND
${CMAKE_COMMAND} -E env CARGO_TARGET_DIR=${CMAKE_BINARY_DIR}/hermit_rs RUST_TARGET_PATH=${HERMIT_ROOT}/librs
cargo build ${CARGO_BUILDTYPE_PARAMETER} -Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-mem --target ${HERMIT_ARCH}-unknown-hermit-kernel.json --no-default-features --features pci,acpi,smp,newlib
cargo build ${CARGO_BUILDTYPE_PARAMETER} -Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-mem --target ${HERMIT_ARCH}-unknown-none-hermitkernel --no-default-features --features pci,acpi,smp,newlib
WORKING_DIRECTORY
${CMAKE_CURRENT_LIST_DIR})
......
......@@ -30,10 +30,10 @@ rustup component add rust-src llvm-tools-preview
You can then build `libhermit-rs` with the following command
```sh
cargo build -Z build-std=core,alloc,panic_abort --target x86_64-unknown-hermit-kernel
cargo build -Z build-std=core,alloc,panic_abort --target x86_64-unknown-none-hermitkernel
```
The resulting library then can be found in `target/x86_64-unknown-hermit-kernel/debug/libhermit.a`
The resulting library then can be found in `target/x86_64-unknown-none-hermitkernel/debug/libhermit.a`
### Control the kernel messages verbosity
......@@ -44,7 +44,7 @@ You can change it by setting it at compile time to a string matching the name of
If the variable is not set, or the name doesn't match, then `LevelFilter::Info` is used by default.
```sh
$ HERMIT_LOG_LEVEL_FILTER=Debug cargo build -Z build-std=core,alloc,panic_abort --target x86_64-unknown-hermit-kernel
$ HERMIT_LOG_LEVEL_FILTER=Debug cargo build -Z build-std=core,alloc,panic_abort --target x86_64-unknown-none-hermitkernel
```
## Credits
......
{
"llvm-target": "aarch64-unknown-none",
"linker-flavor": "gcc",
"target-endian": "little",
"target-pointer-width": "64",
"target-c-int-width" : "32",
"os": "hermit",
"arch": "aarch64",
"data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
"pre-link-args": {
"gcc": ["-m64"]
},
"features": "+a53,+strict-align,-fp-armv8",
"disable-redzone": true,
"eliminate-frame-pointer": true,
"linker-is-gnu": true,
"no-compiler-rt": true,
"archive-format": "gnu",
"code-model": "large",
"relocation-model": "static",
"panic-strategy": "abort"
}
{
"llvm-target": "x86_64-unknown-none",
"linker-flavor": "gcc",
"target-endian": "little",
"target-pointer-width": "64",
"target-c-int-width" : "32",
"os": "hermit",
"arch": "x86_64",
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"pre-link-args": {
"gcc": ["-m64"]
},
"cpu": "x86-64",
"features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float",
"disable-redzone": true,
"eliminate-frame-pointer": true,
"linker-is-gnu": true,
"no-compiler-rt": true,
"archive-format": "gnu",
"code-model": "kernel",
"relocation-model": "static",
"panic-strategy": "abort"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment