Skip to content
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

Jump to bottom

order the data directory like the src directory #20

Merged
merged 2 commits into from
May 22, 2021
Merged

order the data directory like the src directory #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c2de3b
order the data directory like the src directory
stlankes May 22, 2021
2203245
rename directory to aarch64
stlankes May 22, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ jobs:
if: ${{ matrix.os == 'windows-latest' }}
- name: Test loader
run:
qemu-system-x86_64 -display none -smp 1 -m 64M -serial stdio -kernel target/x86_64-unknown-hermit-loader/debug/rusty-loader -initrd data/hello_world -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr,rdrand
qemu-system-x86_64 -display none -smp 1 -m 64M -serial stdio -kernel target/x86_64-unknown-hermit-loader/debug/rusty-loader -initrd data/x86_64/hello_world -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr,rdrand
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ endif
# Todo - make this feature toggleable
ifeq ($(arch), aarch64)
opt += --features "aarch64-qemu-stdout"
export HERMIT_APP ?= $(PWD)/data/hello_world_aarch64
export HERMIT_APP ?= $(PWD)/data/$(arch)/hello_world
endif

CONVERT :=
Expand Down
0 data/hello_world_aarch64 → data/aarch64/hello_world
View file
Open in desktop
File renamed without changes.
0 data/hello_world → data/x86_64/hello_world
View file
Open in desktop
File renamed without changes.