Unverified Commit 36911f3f authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #20



20: order the data directory like the src directory r=stlankes a=stlankes

- using separate dirctories for the different architectures
Co-authored-by: Stefan Lankes's avatarStefan Lankes <slankes@eonerc.rwth-aachen.de>
parents 85567c8e 2203245d
Pipeline #472919 failed with stages
in 1 minute and 18 seconds
......@@ -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
......@@ -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 :=
......
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