From 34831727ead40fd0bdc10c7ad174dd05af5158a2 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Sat, 1 Aug 2026 17:42:18 +0100
Subject: [PATCH] ci: enable target x86_64-unknown-redox

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e84160cb802ef..2efef5cfb8dd2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -244,8 +244,7 @@ jobs:
           - target: x86_64-unknown-linux-musl
             env: { TEST_MUSL_V1_2_3: 1 }
             artifact-tag: new-musl
-          # FIXME: It seems some items in `src/unix/mod.rs` aren't defined on redox actually.
-          # - target: x86_64-unknown-redox
+          - target: x86_64-unknown-redox
 
           # FIXME(ppc): SIGILL running tests, see
           # https://github.com/rust-lang/libc/pull/4254#issuecomment-2636288713
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 1c327cabd1728..f07b1fd5ad1c9 100644
--- a/src/unix/redox/mod.rs
+++ b/src/unix/redox/mod.rs
@@ -906,8 +906,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;