Define linker memory origin flags in the target .json

diff --git a/Makefile b/Makefile
index ec74fc8bbcb1e3093dfec27aa9c15a6290faaef7..4e7ca340ea9fe5f4815951a18ab7d0bec3981925 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +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 -- -C link-arg=-Ttext=0x7e00 -C link-arg=-Tdata=0x7e00 -C link-arg=--oformat=binary
+       cd stage2 && cargo build --release
 
 nothing.img: magic.bin stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin
        dd if=/dev/zero of=nothing.img bs=32M count=1

diff --git a/stage2/x86-loadnothing.json b/stage2/x86-loadnothing.json
index 556f46e0946f6cd1714b1e63c2872fd8cd7cf2cb..973ff9080aa36b2fc56572e6cff37aba1e9af373 100644 (file)
--- a/stage2/x86-loadnothing.json
+++ b/stage2/x86-loadnothing.json
@@ -13,5 +13,12 @@
        "disable-redzone": true,
        "features": "-mmx,-sse,+soft-float",
        "cpu": "pentium",
-       "relocation-model": "static"
+       "relocation-model": "static",
+       "pre-link-args": {
+               "ld.lld": [
+                       "-Ttext=0x7e00",
+                       "-Tdata=0x7e00",
+                       "--oformat=binary"
+               ]
+       }
 }