Skip to content

Fix rust example bitrot + add x86_64 support to hierarchy and passive_server #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dreamliner787-9 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix rust example bitrot + add x86_64 support to hierarchy and passive_server #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f152031
example/rust: fix bitrot
dreamliner787-9 Mar 11, 2026
a7d3888
example/hierarchy: add x86_64 support
dreamliner787-9 Mar 11, 2026
dc42dde
example/passive_server: add x86_64 support
dreamliner787-9 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ members = [
"tool/microkit",
"initialiser",
]
exclude = [
"example/rust"
]
Copy link
Contributor

@midnightveil midnightveil Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think adding

[workspace]
# Empty [workspace] tells cargo this is not part of the microkit workspace

to the microkit/example/rust/Cargo.toml makes more sense.


[workspace.dependencies.sel4-capdl-initializer]
git = "https://github.com/seL4/rust-sel4"
Expand Down
3 changes: 3 additions & 0 deletions example/hierarchy/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ ifeq ($(ARCH),aarch64)
else ifeq ($(ARCH),riscv64)
TARGET_TRIPLE := riscv64-unknown-elf
CFLAGS_ARCH := -march=rv64imafdc_zicsr_zifencei -mabi=lp64d
else ifeq ($(ARCH),x86_64)
TARGET_TRIPLE := x86_64-linux-gnu
CFLAGS_ARCH := -march=x86-64 -mtune=generic
else
$(error Unsupported ARCH)
endif
Expand Down
3 changes: 3 additions & 0 deletions example/passive_server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ ifeq ($(ARCH),aarch64)
else ifeq ($(ARCH),riscv64)
TARGET_TRIPLE := riscv64-unknown-elf
CFLAGS_ARCH := -march=rv64imafdc_zicsr_zifencei -mabi=lp64d
else ifeq ($(ARCH),x86_64)
TARGET_TRIPLE := x86_64-linux-gnu
CFLAGS_ARCH := -march=x86-64 -mtune=generic
else
$(error Unsupported ARCH)
endif
Expand Down
Loading
Loading