Skip to content

Commit

Permalink
Merge #414
Browse files Browse the repository at this point in the history
414: Targets: Use none-elf instead of hermit llvm-target r=stlankes a=mkroening

As discussed in hermit-os/hermit-rs#197 (comment), this way the kernel's `libhermit.a` has `OS/ABI: UNIX - System V` and the resulting application has `OS/ABI: <unknown: ff>`. This works for the Rust-toolchain as well as the C-toolchain.

Co-authored-by: Martin Kröning <mkroening@posteo.net>
  • Loading branch information
bors[bot] and mkroening authored Apr 21, 2022
2 parents 378a911 + 8276199 commit 22ec5a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion targets/aarch64-unknown-none-hermitkernel.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"features": "+strict-align,-neon,-fp-armv8",
"linker": "rust-lld",
"linker-flavor": "ld.lld",
"llvm-target": "aarch64-unknown-hermit",
"llvm-target": "aarch64-unknown-none-elf",
"max-atomic-width": 128,
"panic-strategy": "abort",
"position-independent-executables": true,
Expand Down
2 changes: 1 addition & 1 deletion targets/x86_64-unknown-none-hermitkernel.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float",
"linker": "rust-lld",
"linker-flavor": "ld.lld",
"llvm-target": "x86_64-unknown-hermit",
"llvm-target": "x86_64-unknown-none-elf",
"max-atomic-width": 64,
"panic-strategy": "abort",
"position-independent-executables": true,
Expand Down

0 comments on commit 22ec5a1

Please sign in to comment.