From d79425564654f59349e18dfcede74f9074661328 Mon Sep 17 00:00:00 2001
From: HimbeerserverDE <himbeerserverde@gmail.com>
Date: Sun, 11 Sep 2022 19:53:14 +0200
Subject: [PATCH] nop stage 2

---
 Makefile                       |  8 ++++----
 stage2/.cargo/config.toml      |  6 ++++++
 stage2/x86_64-loadnothing.json | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 stage2/.cargo/config.toml
 create mode 100644 stage2/x86_64-loadnothing.json

diff --git a/Makefile b/Makefile
index 65f4596..a1082ca 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ stage1/boot.bin: stage1/boot.asm
 magic.bin:
 	echo -en "\x55\xAA" > magic.bin
 
-stage2/target/x86_64-unknown-none/debug/stage2:
-	cd stage2 && cargo build --target x86_64-unknown-none
+stage2/target/x86_64-loadnothing/debug/stage2:
+	cd stage2 && cargo build
 
-nothing.img: magic.bin stage1/boot.bin stage2/target/x86_64-unknown-none/debug/stage2
+nothing.img: magic.bin stage1/boot.bin stage2/target/x86_64-loadnothing/debug/stage2
 	dd if=/dev/zero of=nothing.img bs=2M count=1
 	parted -s nothing.img mklabel msdos
 	parted -s -a optimal nothing.img mkpart primary fat32 1M 100%
@@ -19,7 +19,7 @@ nothing.img: magic.bin stage1/boot.bin stage2/target/x86_64-unknown-none/debug/s
 	doas losetup -d /dev/loop1
 	dd if=stage1/boot.bin of=nothing.img bs=1 count=446 conv=notrunc
 	dd if=magic.bin of=nothing.img bs=1 seek=510 count=2 conv=notrunc
-	dd if=stage2/target/x86_64-unknown-none/debug/stage2 of=nothing.img bs=1 seek=512 conv=notrunc
+	dd if=stage2/target/x86_64-loadnothing/debug/stage2 of=nothing.img bs=1 seek=512 conv=notrunc
 
 vm: clean nothing.img
 	qemu-system-x86_64 -hda nothing.img
diff --git a/stage2/.cargo/config.toml b/stage2/.cargo/config.toml
new file mode 100644
index 0000000..845acf4
--- /dev/null
+++ b/stage2/.cargo/config.toml
@@ -0,0 +1,6 @@
+[unstable]
+build-std = ["core", "compiler_builtins"]
+build-std-features = ["compiler-builtins-mem"]
+
+[build]
+target = "x86_64-loadnothing.json"
diff --git a/stage2/x86_64-loadnothing.json b/stage2/x86_64-loadnothing.json
new file mode 100644
index 0000000..1972d9b
--- /dev/null
+++ b/stage2/x86_64-loadnothing.json
@@ -0,0 +1,15 @@
+{
+	"llvm-target": "x86_64-unknown-none",
+	"data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+	"arch": "x86_64",
+	"target-endian": "little",
+	"target-pointer-width": "64",
+	"target-c-int-width": "32",
+	"os": "none",
+	"executables": true,
+	"linker-flavor": "ld.lld",
+	"linker": "rust-lld",
+	"panic-strategy": "abort",
+	"disable-redzone": true,
+	"features": "-mmx,-sse,+soft-float"
+}
-- 
2.44.0