From 854ab48c851e77701fda3586ab4e5b46ce1b5cf4 Mon Sep 17 00:00:00 2001
From: Akshit Gaur <akshitgaur@proton.me>
Date: Mon, 23 Mar 2026 21:14:41 +0530
Subject: [PATCH] Use local syscall and libredox

---
 Cargo.lock           |  8 ++++++++
 Cargo.toml           |  4 ++++
 bootstrap/Cargo.lock | 23 +++++++++--------------
 bootstrap/Cargo.toml |  7 ++++++-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 91185a1f01..aa91bbecf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2951,3 +2951,11 @@ name = "zmij"
 version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+
+[[patch.unused]]
+name = "libredox"
+version = "0.1.16"
+
+[[patch.unused]]
+name = "redox_syscall"
+version = "0.7.4"
diff --git a/Cargo.toml b/Cargo.toml
index 63e2b9a6b2..29b04e62bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -115,3 +115,7 @@ precedence = "deny"
 
 [patch."https://gitlab.redox-os.org/redox-os/relibc.git"]
 #redox-ioctl = { path = "../../relibc/source/redox-ioctl" }
+
+[patch.crates-io]
+redox_syscall = { path = "../../redox_syscall" }
+libredox = { path = "../../libredox" }
diff --git a/bootstrap/Cargo.lock b/bootstrap/Cargo.lock
index 8a49dff49c..17ea6522ef 100644
--- a/bootstrap/Cargo.lock
+++ b/bootstrap/Cargo.lock
@@ -41,13 +41,12 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 [[package]]
 name = "generic-rt"
 version = "0.1.0"
-source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#fccd849d2230b23e5fbb2cb5b24e5237d37eb8f1"
 
 [[package]]
 name = "goblin"
-version = "0.7.1"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134"
+checksum = "983a6aafb3b12d4c41ea78d39e189af4298ce747353945ff5105b54a056e5cd9"
 dependencies = [
  "log",
  "plain",
@@ -77,9 +76,7 @@ checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5"
 
 [[package]]
 name = "libredox"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
+version = "0.1.16"
 dependencies = [
  "bitflags",
  "libc",
@@ -151,12 +148,12 @@ checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717"
 [[package]]
 name = "redox-rt"
 version = "0.1.0"
-source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#fccd849d2230b23e5fbb2cb5b24e5237d37eb8f1"
 dependencies = [
  "bitflags",
  "generic-rt",
  "goblin",
  "ioslice",
+ "libredox",
  "plain",
  "redox-path",
  "redox_syscall",
@@ -174,9 +171,7 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
+version = "0.7.4"
 dependencies = [
  "bitflags",
 ]
@@ -189,18 +184,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scroll"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
+checksum = "c1257cd4248b4132760d6524d6dda4e053bc648c9070b960929bf50cfb1e7add"
 dependencies = [
  "scroll_derive",
 ]
 
 [[package]]
 name = "scroll_derive"
-version = "0.11.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
+checksum = "ed76efe62313ab6610570951494bdaa81568026e0318eaa55f167de70eeea67d"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/bootstrap/Cargo.toml b/bootstrap/Cargo.toml
index a9f2864422..96b078accc 100644
--- a/bootstrap/Cargo.toml
+++ b/bootstrap/Cargo.toml
@@ -23,7 +23,8 @@ slab = { version = "0.4.9", default-features = false }
 arrayvec = { version = "0.7.6", default-features = false }
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-features = false }
+#redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-features = false }
+redox-rt = { path = "../../../relibc/source/redox-rt", default-features = false }
 
 [profile.release]
 panic = "abort"
@@ -33,3 +34,7 @@ opt-level = "s"
 [profile.dev]
 panic = "abort"
 opt-level = "s"
+
+[patch.crates-io]
+redox_syscall = { path = "../../../redox_syscall" }
+libredox = { path = "../../../libredox" }