From 9326e122138285bf7e6cf4e7eeb92d1be7071681 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 1 Nov 2025 14:46:53 +0100
Subject: [PATCH 1/6] Remove no longer necessary targets dir

All target specs we use are now built into rustc.
---
 mk/prefix.mk                         |  1 -
 targets/README                       |  3 --
 targets/i686-unknown-redox.json      | 49 ----------------------------
 targets/riscv64gc-unknown-redox.json | 41 -----------------------
 4 files changed, 94 deletions(-)
 delete mode 100644 targets/README
 delete mode 100644 targets/i686-unknown-redox.json
 delete mode 100644 targets/riscv64gc-unknown-redox.json

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 9634a7530..561572113 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -241,7 +241,6 @@ else
 	export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \
 	export CARGO="env -u CARGO -u RUSTUP_TOOLCHAIN cargo" && \
 	export CC_$(subst -,_,$(TARGET))="$(GNU_TARGET)-gcc -isystem $(ROOT)/$@.partial/$(GNU_TARGET)/include" && \
-	export RUST_TARGET_PATH="$(ROOT)/targets" && \
 	$(MAKE) clean && \
 	$(MAKE) -j 1 all && \
 	$(MAKE) -j 1 install DESTDIR="$(ROOT)/$@.partial/$(GNU_TARGET)"
diff --git a/targets/README b/targets/README
deleted file mode 100644
index 0b172dc89..000000000
--- a/targets/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This contains a target definition for targets that Redox supports but have not
-yet been added to the upstream rust, specifically for compiling relibc in
-freestanding mode.
diff --git a/targets/i686-unknown-redox.json b/targets/i686-unknown-redox.json
deleted file mode 100644
index 889e1eeb9..000000000
--- a/targets/i686-unknown-redox.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "arch": "x86",
-  "cpu": "pentiumpro",
-  "crt-objects-fallback": "false",
-  "crt-static-allows-dylibs": true,
-  "crt-static-default": true,
-  "crt-static-respected": true,
-  "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",
-  "dynamic-linking": true,
-  "env": "relibc",
-  "has-rpath": true,
-  "has-thread-local": true,
-  "late-link-args": {
-    "gnu-cc": [
-      "-lgcc"
-    ],
-    "gnu-lld-cc": [
-      "-lgcc"
-    ]
-  },
-  "linker-flavor": "gnu-cc",
-  "llvm-target": "i686-unknown-redox",
-  "max-atomic-width": 64,
-  "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
-  },
-  "os": "redox",
-  "plt-by-default": false,
-  "position-independent-executables": true,
-  "pre-link-args": {
-    "gnu-cc": [
-      "-m32"
-    ],
-    "gnu-lld-cc": [
-      "-m32"
-    ]
-  },
-  "relro-level": "full",
-  "stack-probes": {
-    "kind": "call"
-  },
-  "target-family": [
-    "unix"
-  ],
-  "target-pointer-width": 32
-}
diff --git a/targets/riscv64gc-unknown-redox.json b/targets/riscv64gc-unknown-redox.json
deleted file mode 100644
index 97d191578..000000000
--- a/targets/riscv64gc-unknown-redox.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "arch": "riscv64",
-  "code-model": "medium",
-  "cpu": "generic-rv64",
-  "crt-objects-fallback": "false",
-  "crt-static-allows-dylibs": true,
-  "crt-static-default": true,
-  "crt-static-respected": true,
-  "data-layout": "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128",
-  "dynamic-linking": true,
-  "env": "relibc",
-  "features": "+m,+a,+f,+d,+c",
-  "has-rpath": true,
-  "has-thread-local": true,
-  "late-link-args": {
-    "gnu-cc": [
-      "-lgcc"
-    ],
-    "gnu-lld-cc": [
-      "-lgcc"
-    ]
-  },
-  "linker-flavor": "gnu-cc",
-  "llvm-abiname": "lp64d",
-  "llvm-target": "riscv64-unknown-redox",
-  "max-atomic-width": 64,
-  "metadata": {
-    "description": null,
-    "host_tools": null,
-    "std": null,
-    "tier": null
-  },
-  "os": "redox",
-  "plt-by-default": false,
-  "position-independent-executables": true,
-  "relro-level": "full",
-  "target-family": [
-    "unix"
-  ],
-  "target-pointer-width": 64
-}

From 18f2025931857015f2e68fdb2c16cdd2c9f9e83b Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 1 Nov 2025 19:44:14 +0100
Subject: [PATCH 2/6] Refactor TARGET calculation in preparation for
 i586-unknown-redox

---
 mk/config.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mk/config.mk b/mk/config.mk
index 93b57e66c..519167735 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -112,11 +112,15 @@ ROOT=$(CURDIR)
 export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt
 
 ## Userspace variables
-export TARGET=$(ARCH)-unknown-redox
 ifeq ($(ARCH),riscv64gc)
+	export TARGET=riscv64gc-unknown-redox
 	export GNU_TARGET=riscv64-unknown-redox
+else ifeq ($(ARCH),i686)
+	export TARGET=i686-unknown-redox # FIXME change to i586 before the next prefix rebuild
+	export GNU_TARGET=i686-unknown-redox
 else
-	export GNU_TARGET=$(TARGET)
+	export TARGET=$(ARCH)-unknown-redox
+	export GNU_TARGET=$(ARCH)-unknown-redox
 endif
 BUILD=build/$(ARCH)/$(CONFIG_NAME)
 MOUNT_DIR=$(BUILD)/filesystem

From 1fd8525ef7221daeb548856809b59f1316655d25 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 1 Nov 2025 19:44:45 +0100
Subject: [PATCH 3/6] Remove longer relevant make target fetch

---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index 714cb0712..f744aa9b2 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,6 @@ pull:
 	git submodule sync --recursive
 	git submodule update --recursive --init
 
-fetch: $(BUILD)/fetch.tag
-
 repo: $(BUILD)/repo.tag
 
 # Podman build recipes and vars

From c79eb734543219cb59db3a80e1f7f0a2d10fde7e Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 1 Nov 2025 19:48:20 +0100
Subject: [PATCH 4/6] Update installer

---
 installer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer b/installer
index 97dd77918..bb9fa4ec7 160000
--- a/installer
+++ b/installer
@@ -1 +1 @@
-Subproject commit 97dd77918e7027c6c57d537b7eb732bbd22739af
+Subproject commit bb9fa4ec7c324b2e1cd82a7679c6f3d8dfd5f86f

From a9529a628157b046959d4c2477cfeddc00abc406 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 1 Nov 2025 20:02:00 +0100
Subject: [PATCH 5/6] Update cookbook

---
 cookbook | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook b/cookbook
index c0feb7ecd..3a573a871 160000
--- a/cookbook
+++ b/cookbook
@@ -1 +1 @@
-Subproject commit c0feb7ecdac6d0c0a374356634107b8644d1b64f
+Subproject commit 3a573a8714973ded66f1e8ef0f3d95479797bf13

From 8e8ced1f91b2d93ac5757cae416a315fa507655c Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 1 Nov 2025 20:41:50 +0100
Subject: [PATCH 6/6] Fix comment syntax in makefile

---
 mk/config.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mk/config.mk b/mk/config.mk
index 519167735..13c61d3c8 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -116,7 +116,8 @@ ifeq ($(ARCH),riscv64gc)
 	export TARGET=riscv64gc-unknown-redox
 	export GNU_TARGET=riscv64-unknown-redox
 else ifeq ($(ARCH),i686)
-	export TARGET=i686-unknown-redox # FIXME change to i586 before the next prefix rebuild
+# FIXME change TARGET to i586 before the next prefix rebuild
+	export TARGET=i686-unknown-redox
 	export GNU_TARGET=i686-unknown-redox
 else
 	export TARGET=$(ARCH)-unknown-redox