Skip to content

Commit a13f0bf

Browse files
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.
1 parent 152a988 commit a13f0bf

File tree

18 files changed

+0
-120
lines changed

18 files changed

+0
-120
lines changed

lib/std/os/linux/aarch64.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,4 @@ pub const VDSO = struct {
143143
pub const CGT_VER = "LINUX_2.6.39";
144144
};
145145

146-
pub const blksize_t = i32;
147-
pub const nlink_t = u32;
148146
pub const time_t = i64;
149-
pub const mode_t = u32;
150-
pub const off_t = i64;
151-
pub const ino_t = u64;
152-
pub const dev_t = u64;
153-
pub const blkcnt_t = i64;

lib/std/os/linux/arm.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,4 @@ pub const HWCAP = struct {
179179
pub const EVTSTRM = 1 << 21;
180180
};
181181

182-
pub const blksize_t = i32;
183-
pub const nlink_t = u32;
184182
pub const time_t = i32;
185-
pub const mode_t = u32;
186-
pub const off_t = i64;
187-
pub const ino_t = u64;
188-
pub const dev_t = u64;
189-
pub const blkcnt_t = i64;

lib/std/os/linux/hexagon.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,6 @@ pub fn clone() callconv(.naked) u32 {
119119
);
120120
}
121121

122-
pub const blksize_t = i32;
123-
pub const nlink_t = u32;
124122
pub const time_t = i64;
125-
pub const mode_t = u32;
126-
pub const off_t = i64;
127-
pub const ino_t = u64;
128-
pub const dev_t = u64;
129-
pub const blkcnt_t = i64;
130123

131124
pub const VDSO = void;

lib/std/os/linux/loongarch64.zig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,7 @@ pub fn clone() callconv(.naked) u64 {
125125
);
126126
}
127127

128-
pub const nlink_t = u32;
129128
pub const time_t = i64;
130-
pub const off_t = i64;
131-
pub const ino_t = u64;
132-
pub const dev_t = u32;
133-
pub const blkcnt_t = i64;
134129

135130
pub const VDSO = struct {
136131
pub const CGT_SYM = "__vdso_clock_gettime";

lib/std/os/linux/m68k.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,7 @@ pub fn restore_rt() callconv(.naked) noreturn {
142142
);
143143
}
144144

145-
pub const blksize_t = i32;
146-
pub const nlink_t = u32;
147145
pub const time_t = i32;
148-
pub const mode_t = u32;
149-
pub const off_t = i64;
150-
pub const ino_t = u64;
151-
pub const dev_t = u64;
152-
pub const blkcnt_t = i64;
153146

154147
// No VDSO used as of glibc 112a0ae18b831bf31f44d81b82666980312511d6.
155148
pub const VDSO = void;

lib/std/os/linux/mips.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,4 @@ pub const VDSO = struct {
230230
pub const CGT_VER = "LINUX_2.6";
231231
};
232232

233-
pub const blksize_t = u32;
234-
pub const nlink_t = u32;
235233
pub const time_t = i32;
236-
pub const mode_t = u32;
237-
pub const off_t = i64;
238-
pub const ino_t = u64;
239-
pub const dev_t = u64;
240-
pub const blkcnt_t = i64;

lib/std/os/linux/mips64.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,4 @@ pub const VDSO = struct {
184184
pub const CGT_VER = "LINUX_2.6";
185185
};
186186

187-
pub const blksize_t = u32;
188-
pub const nlink_t = u32;
189187
pub const time_t = i32;
190-
pub const mode_t = u32;
191-
pub const off_t = i64;
192-
pub const ino_t = u64;
193-
pub const dev_t = u64;
194-
pub const blkcnt_t = i64;

lib/std/os/linux/mipsn32.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,4 @@ pub const VDSO = struct {
184184
pub const CGT_VER = "LINUX_2.6";
185185
};
186186

187-
pub const blksize_t = u32;
188-
pub const nlink_t = u32;
189187
pub const time_t = i32;
190-
pub const mode_t = u32;
191-
pub const off_t = i64;
192-
pub const ino_t = u64;
193-
pub const dev_t = u64;
194-
pub const blkcnt_t = i64;

lib/std/os/linux/or1k.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,4 @@ pub fn clone() callconv(.naked) u32 {
131131

132132
pub const VDSO = void;
133133

134-
pub const blksize_t = u32;
135-
pub const nlink_t = u32;
136134
pub const time_t = i32;
137-
pub const mode_t = u32;
138-
pub const off_t = i64;
139-
pub const ino_t = u64;
140-
pub const dev_t = u64;
141-
pub const blkcnt_t = i64;

lib/std/os/linux/powerpc.zig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,4 @@ pub const VDSO = struct {
255255
pub const CGT_VER = "LINUX_2.6.15";
256256
};
257257

258-
pub const blksize_t = i32;
259-
pub const nlink_t = u32;
260258
pub const time_t = i32;
261-
pub const mode_t = u32;
262-
pub const off_t = i64;
263-
pub const ino_t = u64;
264-
pub const dev_t = u64;

0 commit comments

Comments
 (0)