From aec7bfb09219e32389ad666906166f690a158fbe Mon Sep 17 00:00:00 2001
From: Stephen Gregoratto <dev@sgregoratto.me>
Date: Mon, 20 Oct 2025 09:29:12 +1100
Subject: [PATCH] Linux: Dedupe generic decls

Commit #fc7a5f2 moved many of the `_t` types up a level, but didn't
remove them from arch_bits. Since `Stat` is gone, all but `time_t` can
be removed.
---
 lib/std/os/linux/aarch64.zig     | 7 -------
 lib/std/os/linux/arm.zig         | 7 -------
 lib/std/os/linux/hexagon.zig     | 7 -------
 lib/std/os/linux/loongarch64.zig | 5 -----
 lib/std/os/linux/m68k.zig        | 7 -------
 lib/std/os/linux/mips.zig        | 7 -------
 lib/std/os/linux/mips64.zig      | 7 -------
 lib/std/os/linux/mipsn32.zig     | 7 -------
 lib/std/os/linux/or1k.zig        | 7 -------
 lib/std/os/linux/powerpc.zig     | 6 ------
 lib/std/os/linux/powerpc64.zig   | 7 -------
 lib/std/os/linux/riscv32.zig     | 6 ------
 lib/std/os/linux/riscv64.zig     | 6 ------
 lib/std/os/linux/s390x.zig       | 6 ------
 lib/std/os/linux/sparc64.zig     | 7 -------
 lib/std/os/linux/x32.zig         | 7 -------
 lib/std/os/linux/x86.zig         | 7 -------
 lib/std/os/linux/x86_64.zig      | 7 -------
 18 files changed, 120 deletions(-)

diff --git a/lib/std/os/linux/aarch64.zig b/lib/std/os/linux/aarch64.zig
index 1f3d79a5c20c2d073ca232652a7c2a8d016de3f5..ddf1a61a253e650bdfffc32e92e6e9255f7d1d42 100644
--- a/lib/std/os/linux/aarch64.zig
+++ b/lib/std/os/linux/aarch64.zig
@@ -143,11 +143,4 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6.39";
 };
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i64;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/arm.zig b/lib/std/os/linux/arm.zig
index 167036ea7e3f6160e4515bb2fada35d7f64addcc..0bcdaaf319311a458e12de5a4220ac182e1751c2 100644
--- a/lib/std/os/linux/arm.zig
+++ b/lib/std/os/linux/arm.zig
@@ -179,11 +179,4 @@ pub const HWCAP = struct {
     pub const EVTSTRM = 1 << 21;
 };
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/hexagon.zig b/lib/std/os/linux/hexagon.zig
index 51252bb3b9894c647003b79e322b5a3109b55ec9..ff5331467d1510d1f60551625348e644d6c40462 100644
--- a/lib/std/os/linux/hexagon.zig
+++ b/lib/std/os/linux/hexagon.zig
@@ -119,13 +119,6 @@ pub fn clone() callconv(.naked) u32 {
     );
 }
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i64;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
 
 pub const VDSO = void;
diff --git a/lib/std/os/linux/loongarch64.zig b/lib/std/os/linux/loongarch64.zig
index 59cf8f6c1d35e3b5122eee4c0444504e180b0283..8e7677f276ffa7ec86119c8dbc96a9d81b18195a 100644
--- a/lib/std/os/linux/loongarch64.zig
+++ b/lib/std/os/linux/loongarch64.zig
@@ -125,12 +125,7 @@ pub fn clone() callconv(.naked) u64 {
     );
 }
 
-pub const nlink_t = u32;
 pub const time_t = i64;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u32;
-pub const blkcnt_t = i64;
 
 pub const VDSO = struct {
     pub const CGT_SYM = "__vdso_clock_gettime";
diff --git a/lib/std/os/linux/m68k.zig b/lib/std/os/linux/m68k.zig
index b782c456f1e62610ee5f226e3e0231a322bd8e26..2c5f13aa6321d3c65121deead7a629b3188a0c0d 100644
--- a/lib/std/os/linux/m68k.zig
+++ b/lib/std/os/linux/m68k.zig
@@ -142,14 +142,7 @@ pub fn restore_rt() callconv(.naked) noreturn {
     );
 }
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
 
 // No VDSO used as of glibc 112a0ae18b831bf31f44d81b82666980312511d6.
 pub const VDSO = void;
diff --git a/lib/std/os/linux/mips.zig b/lib/std/os/linux/mips.zig
index c28a884e1a3e729cde247617b5ef6c244a7eba91..bcca7d1ef205ded83f2125097605c613b27d371b 100644
--- a/lib/std/os/linux/mips.zig
+++ b/lib/std/os/linux/mips.zig
@@ -230,11 +230,4 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6";
 };
 
-pub const blksize_t = u32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/mips64.zig b/lib/std/os/linux/mips64.zig
index d96daaefa6b7119fef3433cfc477882c35014db4..ec5681b5138c217edc306abc3bff1f2aca00f579 100644
--- a/lib/std/os/linux/mips64.zig
+++ b/lib/std/os/linux/mips64.zig
@@ -184,11 +184,4 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6";
 };
 
-pub const blksize_t = u32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/mipsn32.zig b/lib/std/os/linux/mipsn32.zig
index 858db84a20f1128b4ce9a28a8a0515cec51006db..4f7c7d60fdfe2f305861c24f7872b3b17d20380a 100644
--- a/lib/std/os/linux/mipsn32.zig
+++ b/lib/std/os/linux/mipsn32.zig
@@ -184,11 +184,4 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6";
 };
 
-pub const blksize_t = u32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/or1k.zig b/lib/std/os/linux/or1k.zig
index d0a5d47d6001e686e3e9ea2983aab436ee6237cc..45352e4791eefe818173d6f21aab66c92b0d74d8 100644
--- a/lib/std/os/linux/or1k.zig
+++ b/lib/std/os/linux/or1k.zig
@@ -131,11 +131,4 @@ pub fn clone() callconv(.naked) u32 {
 
 pub const VDSO = void;
 
-pub const blksize_t = u32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/powerpc.zig b/lib/std/os/linux/powerpc.zig
index 4b998af0fd1ff4aac33244733be1f3f7cc4c391d..78c6aadda741dcaf87522c980057bc7572914196 100644
--- a/lib/std/os/linux/powerpc.zig
+++ b/lib/std/os/linux/powerpc.zig
@@ -269,10 +269,4 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6.15";
 };
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
diff --git a/lib/std/os/linux/powerpc64.zig b/lib/std/os/linux/powerpc64.zig
index a94611c98bde1976f8b5537db9cc0a12a50565c3..f4375a4545b7ad1f6ecb128e137929cfebe9d139 100644
--- a/lib/std/os/linux/powerpc64.zig
+++ b/lib/std/os/linux/powerpc64.zig
@@ -254,11 +254,4 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6.15";
 };
 
-pub const blksize_t = i64;
-pub const nlink_t = u64;
 pub const time_t = i64;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/riscv32.zig b/lib/std/os/linux/riscv32.zig
index d7223bde182a3db35279139562d86f2c2de66ba8..c1b216b38ede5ef2f8ee2cec955cba3802d027d2 100644
--- a/lib/std/os/linux/riscv32.zig
+++ b/lib/std/os/linux/riscv32.zig
@@ -124,13 +124,7 @@ pub fn clone() callconv(.naked) u32 {
     );
 }
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i64;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
 
 pub const VDSO = struct {
     pub const CGT_SYM = "__vdso_clock_gettime";
diff --git a/lib/std/os/linux/riscv64.zig b/lib/std/os/linux/riscv64.zig
index 59b12250ac0ff46263fdeacdfa5f592318ad6036..50a456836a16be78992138639a71c32d055157d0 100644
--- a/lib/std/os/linux/riscv64.zig
+++ b/lib/std/os/linux/riscv64.zig
@@ -124,13 +124,7 @@ pub fn clone() callconv(.naked) u64 {
     );
 }
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i64;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
 
 pub const VDSO = struct {
     pub const CGT_SYM = "__vdso_clock_gettime";
diff --git a/lib/std/os/linux/s390x.zig b/lib/std/os/linux/s390x.zig
index 13b1b5307ac84b25897888f8deef2c34fddb58ca..17a558e83d6e3a567c36444ec8834f487fa962a7 100644
--- a/lib/std/os/linux/s390x.zig
+++ b/lib/std/os/linux/s390x.zig
@@ -152,13 +152,7 @@ pub fn restore_rt() callconv(.naked) noreturn {
     );
 }
 
-pub const blksize_t = i64;
-pub const nlink_t = u64;
 pub const time_t = i64;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
 
 pub const VDSO = struct {
     pub const CGT_SYM = "__kernel_clock_gettime";
diff --git a/lib/std/os/linux/sparc64.zig b/lib/std/os/linux/sparc64.zig
index ad03d398b763c60d2f678847f1cd2d8cd66a744a..59880bba873d67fad775cb8597d3661a3cd5fd21 100644
--- a/lib/std/os/linux/sparc64.zig
+++ b/lib/std/os/linux/sparc64.zig
@@ -228,11 +228,4 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6";
 };
 
-pub const off_t = i64;
-pub const ino_t = u64;
 pub const time_t = i64;
-pub const mode_t = u32;
-pub const dev_t = u64;
-pub const nlink_t = u32;
-pub const blksize_t = i64;
-pub const blkcnt_t = i64;
diff --git a/lib/std/os/linux/x32.zig b/lib/std/os/linux/x32.zig
index 3ebebc1d8b77ca2957a1e7807dc8467c2745fd1e..97deb7640f13b04cfa907caa074f63d48116fb56 100644
--- a/lib/std/os/linux/x32.zig
+++ b/lib/std/os/linux/x32.zig
@@ -132,14 +132,7 @@ pub fn restore_rt() callconv(.naked) noreturn {
     }
 }
 
-pub const mode_t = u32;
 pub const time_t = i32;
-pub const nlink_t = u32;
-pub const blksize_t = i32;
-pub const blkcnt_t = i32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
 
 pub const VDSO = struct {
     pub const CGT_SYM = "__vdso_clock_gettime";
diff --git a/lib/std/os/linux/x86.zig b/lib/std/os/linux/x86.zig
index f40f4492d126fbbe319685b36aa2ea01193ec4fa..e95afe23a61bc94930169c7671bf49d4028e28a2 100644
--- a/lib/std/os/linux/x86.zig
+++ b/lib/std/os/linux/x86.zig
@@ -195,14 +195,7 @@ pub const VDSO = struct {
     pub const CGT_VER = "LINUX_2.6";
 };
 
-pub const blksize_t = i32;
-pub const nlink_t = u32;
 pub const time_t = i32;
-pub const mode_t = u32;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
-pub const blkcnt_t = i64;
 
 pub const user_desc = extern struct {
     entry_number: u32,
diff --git a/lib/std/os/linux/x86_64.zig b/lib/std/os/linux/x86_64.zig
index f3e31675141af3c903bc52da38cc512c61b3f144..cab71d03e059cdc53e2e95161dcfb82a4b1902cc 100644
--- a/lib/std/os/linux/x86_64.zig
+++ b/lib/std/os/linux/x86_64.zig
@@ -132,14 +132,7 @@ pub fn restore_rt() callconv(.naked) noreturn {
     }
 }
 
-pub const mode_t = u64;
 pub const time_t = i64;
-pub const nlink_t = u64;
-pub const blksize_t = i64;
-pub const blkcnt_t = i64;
-pub const off_t = i64;
-pub const ino_t = u64;
-pub const dev_t = u64;
 
 pub const VDSO = struct {
     pub const CGT_SYM = "__vdso_clock_gettime";
-- 
2.54.0