From: HimbeerserverDE Date: Fri, 16 Sep 2022 13:58:53 +0000 (+0200) Subject: Fix stage 2 linkage X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a86519bd437e840d05748c903bb1b274b8468f41;p=loadnothing.git Fix stage 2 linkage Yay! We can finally write stage 2 now! --- diff --git a/Makefile b/Makefile index 4c6632e..360f67c 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,7 @@ magic.bin: echo -en "\x55\xAA" > magic.bin stage2/target/x86-loadnothing/release/stage2: stage2/src/main.rs - cd stage2 && cargo rustc --release -- --emit=obj - ld -T linker.ld -m elf_i386 -o stage2/target/x86-loadnothing/release/stage2.bin --oformat binary stage2/target/x86-loadnothing/release/stage2 -Ttext=0x7e00 - mv stage2/target/x86-loadnothing/release/stage2.bin stage2/target/x86-loadnothing/release/stage2 + cd stage2 && cargo rustc --release -- --emit=obj -C link-arg=-Ttext=0x7e00 -C link-arg=-Tdata=0x7e00 -C link-arg=--oformat=binary nothing.img: magic.bin stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin dd if=/dev/zero of=nothing.img bs=32M count=1