From b010c6a66f4a8e2937dae5ab7df6cca81032d1d0 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Mon, 17 Nov 2025 00:14:50 +0700
Subject: [PATCH] Fix i586 linker

---
 .cargo/config.toml               | 4 ++++
 config.sh                        | 2 --
 recipes/core/drivers/recipe.toml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 1c0e5fab..b3058a68 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -2,6 +2,10 @@
 linker = "aarch64-unknown-redox-gcc"
 rustflags = []
 
+[target.i586-unknown-redox]
+linker = "i586-unknown-redox-gcc"
+rustflags = []
+
 [target.i686-unknown-redox]
 linker = "i686-unknown-redox-gcc"
 rustflags = []
diff --git a/config.sh b/config.sh
index 2a86500d..8e980198 100755
--- a/config.sh
+++ b/config.sh
@@ -15,8 +15,6 @@ ARCH="${TARGET%%-*}"
 HOST="$TARGET"
 if [ x"${HOST}" == x"riscv64gc-unknown-redox" ] ; then
 	HOST="riscv64-unknown-redox"
-elif [ x"${HOST}" == x"i586-unknown-redox" ] ; then
-	HOST="i686-unknown-redox"
 fi
 
 # Cookbook requires correct CWD to work
diff --git a/recipes/core/drivers/recipe.toml b/recipes/core/drivers/recipe.toml
index df8ffe61..9a836091 100644
--- a/recipes/core/drivers/recipe.toml
+++ b/recipes/core/drivers/recipe.toml
@@ -26,7 +26,7 @@ BINS=(
 # Add additional drivers to the list to build, that are not in drivers-initfs
 # depending on the target architecture
 case "${TARGET}" in
-    i686-unknown-redox | x86_64-unknown-redox)
+    i586-unknown-redox | i686-unknown-redox | x86_64-unknown-redox)
         BINS+=(ac97d bgad sb16d vboxd)
         ;;
     *)