From dabbc5e472f7029b01d2d463b48baa28f7007466 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Thu, 10 Sep 2026 22:17:48 +0100
Subject: [PATCH] ci: first steps to fix x86_64-unknown-redox target

---
 .github/workflows/ci.yaml                 | 2 +-
 ci/docker/x86_64-unknown-redox/Dockerfile | 4 +++-
 src/unix/redox/mod.rs                     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3ac963f56bd31..644d33bd88876 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -244,7 +244,7 @@ jobs:
           - target: x86_64-unknown-linux-musl
             env: { TEST_MUSL_V1_2: 1 }
             artifact-tag: new-musl
-          # FIXME: It seems some items in `src/unix/mod.rs` aren't defined on redox actually.
+          # FIXME: https://github.com/rust-lang/libc/issues/5520
           # - target: x86_64-unknown-redox
 
           # FIXME(ppc): SIGILL running tests, see
diff --git a/ci/docker/x86_64-unknown-redox/Dockerfile b/ci/docker/x86_64-unknown-redox/Dockerfile
index 91b0cbabdc0b6..17e493bb2432b 100644
--- a/ci/docker/x86_64-unknown-redox/Dockerfile
+++ b/ci/docker/x86_64-unknown-redox/Dockerfile
@@ -2,7 +2,9 @@ FROM redoxos/redoxer
 
 RUN mv /root/.redoxer /.redoxer
 
-ENV PATH=$PATH:/.redoxer/toolchain/bin:/rust/bin \
+RUN ln -sf /root/.redoxer ~/.redoxer
+
+ENV PATH=$PATH:$HOME/.redoxer/x86_64-unknown-redox/toolchain/bin \
     AR_x86_64_unknown_redox="x86_64-unknown-redox-ar" \
     CC_x86_64_unknown_redox="x86_64-unknown-redox-gcc" \
     CARGO_TARGET_X86_64_UNKNOWN_REDOX_LINKER="x86_64-unknown-redox-gcc" \
diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs
index ae795a14a3112..34fe98016ba3c 100644
--- a/src/unix/redox/mod.rs
+++ b/src/unix/redox/mod.rs
@@ -1018,8 +1018,8 @@ pub const OLCUC: crate::tcflag_t = 0o000_004;
 pub const OCRNL: crate::tcflag_t = 0o000_010;
 pub const ONOCR: crate::tcflag_t = 0o000_020;
 pub const ONLRET: crate::tcflag_t = 0o000_040;
-pub const OFILL: crate::tcflag_t = 0o0000_100;
-pub const OFDEL: crate::tcflag_t = 0o0000_200;
+pub const OFILL: crate::tcflag_t = 0o0_000_100;
+pub const OFDEL: crate::tcflag_t = 0o0_000_200;
 
 pub const B0: speed_t = 0o000_000;
 pub const B50: speed_t = 0o000_001;