authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-10-17 01:01:27+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-10-17 01:20:33+02:00
logaa8e53908a355f42551b7fb51cf78b197bfbd851
treec02533db908fd2f541be40e8d58466a98294deff
parentdc1bc52dd6c10b99041f9e6189d6fd3541c714c4
signature Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

std.os.linux: clean up a bunch of dead consts


16 files changed, 153 insertions(+), 338 deletions(-)

lib/std/os/linux/aarch64.zig+10-22
......@@ -1,18 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const linux = std.os.linux;
5const SYS = linux.SYS;
6const socklen_t = linux.socklen_t;
7const sockaddr = linux.sockaddr;
8const iovec = std.posix.iovec;
9const iovec_const = std.posix.iovec_const;
10const uid_t = linux.uid_t;
11const gid_t = linux.gid_t;
12const pid_t = linux.pid_t;
13const stack_t = linux.stack_t;
14const sigset_t = linux.sigset_t;
15const timespec = std.os.linux.timespec;
3const SYS = std.os.linux.SYS;
164
175pub fn syscall0(number: SYS) u64 {
186 return asm volatile ("svc #0"
......@@ -135,7 +123,7 @@ pub fn clone() callconv(.naked) u64 {
135123pub const restore = restore_rt;
136124
137125pub fn restore_rt() callconv(.naked) noreturn {
138 switch (@import("builtin").zig_backend) {
126 switch (builtin.zig_backend) {
139127 .stage2_c => asm volatile (
140128 \\ mov x8, %[number]
141129 \\ svc #0
......@@ -170,28 +158,28 @@ pub const Stat = extern struct {
170158 ino: ino_t,
171159 mode: mode_t,
172160 nlink: nlink_t,
173 uid: uid_t,
174 gid: gid_t,
161 uid: std.os.linux.uid_t,
162 gid: std.os.linux.gid_t,
175163 rdev: dev_t,
176164 __pad: u64,
177165 size: off_t,
178166 blksize: blksize_t,
179167 __pad2: i32,
180168 blocks: blkcnt_t,
181 atim: timespec,
182 mtim: timespec,
183 ctim: timespec,
169 atim: std.os.linux.timespec,
170 mtim: std.os.linux.timespec,
171 ctim: std.os.linux.timespec,
184172 __unused: [2]u32,
185173
186 pub fn atime(self: @This()) timespec {
174 pub fn atime(self: @This()) std.os.linux.timespec {
187175 return self.atim;
188176 }
189177
190 pub fn mtime(self: @This()) timespec {
178 pub fn mtime(self: @This()) std.os.linux.timespec {
191179 return self.mtim;
192180 }
193181
194 pub fn ctime(self: @This()) timespec {
182 pub fn ctime(self: @This()) std.os.linux.timespec {
195183 return self.ctim;
196184 }
197185};
lib/std/os/linux/arm.zig+12-23
......@@ -1,17 +1,6 @@
1const builtin = @import("builtin");
12const std = @import("../../std.zig");
2const maxInt = std.math.maxInt;
3const linux = std.os.linux;
4const SYS = linux.SYS;
5const iovec = std.posix.iovec;
6const iovec_const = std.posix.iovec_const;
7const socklen_t = linux.socklen_t;
8const stack_t = linux.stack_t;
9const sigset_t = linux.sigset_t;
10const uid_t = linux.uid_t;
11const gid_t = linux.gid_t;
12const pid_t = linux.pid_t;
13const sockaddr = linux.sockaddr;
14const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
154
165pub fn syscall0(number: SYS) u32 {
176 return asm volatile ("svc #0"
......@@ -128,7 +117,7 @@ pub fn clone() callconv(.naked) u32 {
128117}
129118
130119pub fn restore() callconv(.naked) noreturn {
131 switch (@import("builtin").zig_backend) {
120 switch (builtin.zig_backend) {
132121 .stage2_c => asm volatile (
133122 \\ mov r7, %[number]
134123 \\ svc #0
......@@ -144,7 +133,7 @@ pub fn restore() callconv(.naked) noreturn {
144133}
145134
146135pub fn restore_rt() callconv(.naked) noreturn {
147 switch (@import("builtin").zig_backend) {
136 switch (builtin.zig_backend) {
148137 .stage2_c => asm volatile (
149138 \\ mov r7, %[number]
150139 \\ svc #0
......@@ -206,27 +195,27 @@ pub const Stat = extern struct {
206195 __ino_truncated: u32,
207196 mode: mode_t,
208197 nlink: nlink_t,
209 uid: uid_t,
210 gid: gid_t,
198 uid: std.os.linux.uid_t,
199 gid: std.os.linux.gid_t,
211200 rdev: dev_t,
212201 __rdev_padding: u32,
213202 size: off_t,
214203 blksize: blksize_t,
215204 blocks: blkcnt_t,
216 atim: timespec,
217 mtim: timespec,
218 ctim: timespec,
205 atim: std.os.linux.timespec,
206 mtim: std.os.linux.timespec,
207 ctim: std.os.linux.timespec,
219208 ino: ino_t,
220209
221 pub fn atime(self: @This()) timespec {
210 pub fn atime(self: @This()) std.os.linux.timespec {
222211 return self.atim;
223212 }
224213
225 pub fn mtime(self: @This()) timespec {
214 pub fn mtime(self: @This()) std.os.linux.timespec {
226215 return self.mtim;
227216 }
228217
229 pub fn ctime(self: @This()) timespec {
218 pub fn ctime(self: @This()) std.os.linux.timespec {
230219 return self.ctim;
231220 }
232221};
lib/std/os/linux/hexagon.zig+9-20
......@@ -1,17 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const iovec = std.posix.iovec;
4const iovec_const = std.posix.iovec_const;
5const linux = std.os.linux;
6const SYS = linux.SYS;
7const uid_t = std.os.linux.uid_t;
8const gid_t = std.os.linux.gid_t;
9const pid_t = std.os.linux.pid_t;
10const sockaddr = linux.sockaddr;
11const socklen_t = linux.socklen_t;
12const stack_t = linux.stack_t;
13const sigset_t = linux.sigset_t;
14const timespec = std.os.linux.timespec;
3const SYS = std.os.linux.SYS;
154
165pub fn syscall0(number: SYS) u32 {
176 return asm volatile ("trap0(#1)"
......@@ -145,28 +134,28 @@ pub const Stat = extern struct {
145134 ino: ino_t,
146135 mode: mode_t,
147136 nlink: nlink_t,
148 uid: uid_t,
149 gid: gid_t,
137 uid: std.os.linux.uid_t,
138 gid: std.os.linux.gid_t,
150139 rdev: dev_t,
151140 __pad: u32,
152141 size: off_t,
153142 blksize: blksize_t,
154143 __pad2: i32,
155144 blocks: blkcnt_t,
156 atim: timespec,
157 mtim: timespec,
158 ctim: timespec,
145 atim: std.os.linux.timespec,
146 mtim: std.os.linux.timespec,
147 ctim: std.os.linux.timespec,
159148 __unused: [2]u32,
160149
161 pub fn atime(self: @This()) timespec {
150 pub fn atime(self: @This()) std.os.linux.timespec {
162151 return self.atim;
163152 }
164153
165 pub fn mtime(self: @This()) timespec {
154 pub fn mtime(self: @This()) std.os.linux.timespec {
166155 return self.mtim;
167156 }
168157
169 pub fn ctime(self: @This()) timespec {
158 pub fn ctime(self: @This()) std.os.linux.timespec {
170159 return self.ctim;
171160 }
172161};
lib/std/os/linux/loongarch64.zig+9-19
......@@ -1,16 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const linux = std.os.linux;
4const SYS = linux.SYS;
5const iovec = std.posix.iovec;
6const iovec_const = std.posix.iovec_const;
7const uid_t = linux.uid_t;
8const gid_t = linux.gid_t;
9const stack_t = linux.stack_t;
10const sigset_t = linux.sigset_t;
11const sockaddr = linux.sockaddr;
12const socklen_t = linux.socklen_t;
13const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
144
155pub fn syscall0(number: SYS) u64 {
166 return asm volatile (
......@@ -150,28 +140,28 @@ pub const Stat = extern struct {
150140 ino: ino_t,
151141 mode: mode_t,
152142 nlink: nlink_t,
153 uid: uid_t,
154 gid: gid_t,
143 uid: std.os.linux.uid_t,
144 gid: std.os.linux.gid_t,
155145 rdev: dev_t,
156146 _pad1: u64,
157147 size: off_t,
158148 blksize: blksize_t,
159149 _pad2: i32,
160150 blocks: blkcnt_t,
161 atim: timespec,
162 mtim: timespec,
163 ctim: timespec,
151 atim: std.os.linux.timespec,
152 mtim: std.os.linux.timespec,
153 ctim: std.os.linux.timespec,
164154 _pad3: [2]u32,
165155
166 pub fn atime(self: @This()) timespec {
156 pub fn atime(self: @This()) std.os.linux.timespec {
167157 return self.atim;
168158 }
169159
170 pub fn mtime(self: @This()) timespec {
160 pub fn mtime(self: @This()) std.os.linux.timespec {
171161 return self.mtim;
172162 }
173163
174 pub fn ctime(self: @This()) timespec {
164 pub fn ctime(self: @This()) std.os.linux.timespec {
175165 return self.ctim;
176166 }
177167};
lib/std/os/linux/m68k.zig+9-18
......@@ -1,15 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const iovec = std.posix.iovec;
4const iovec_const = std.posix.iovec_const;
5const linux = std.os.linux;
6const SYS = linux.SYS;
7const uid_t = std.os.linux.uid_t;
8const gid_t = std.os.linux.uid_t;
9const pid_t = std.os.linux.pid_t;
10const sockaddr = linux.sockaddr;
11const socklen_t = linux.socklen_t;
12const timespec = std.os.linux.timespec;
3const SYS = std.os.linux.SYS;
134
145pub fn syscall0(number: SYS) u32 {
156 return asm volatile ("trap #0"
......@@ -166,27 +157,27 @@ pub const Stat = extern struct {
166157 __ino_truncated: i32,
167158 mode: mode_t,
168159 nlink: nlink_t,
169 uid: uid_t,
170 gid: gid_t,
160 uid: std.os.linux.uid_t,
161 gid: std.os.linux.gid_t,
171162 rdev: dev_t,
172163 __pad2: i16,
173164 size: off_t,
174165 blksize: blksize_t,
175166 blocks: blkcnt_t,
176 atim: timespec,
177 mtim: timespec,
178 ctim: timespec,
167 atim: std.os.linux.timespec,
168 mtim: std.os.linux.timespec,
169 ctim: std.os.linux.timespec,
179170 ino: ino_t,
180171
181 pub fn atime(self: @This()) timespec {
172 pub fn atime(self: @This()) std.os.linux.timespec {
182173 return self.atim;
183174 }
184175
185 pub fn mtime(self: @This()) timespec {
176 pub fn mtime(self: @This()) std.os.linux.timespec {
186177 return self.mtim;
187178 }
188179
189 pub fn ctime(self: @This()) timespec {
180 pub fn ctime(self: @This()) std.os.linux.timespec {
190181 return self.ctim;
191182 }
192183};
lib/std/os/linux/mips.zig+12-36
......@@ -1,18 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const linux = std.os.linux;
5const SYS = linux.SYS;
6const socklen_t = linux.socklen_t;
7const iovec = std.posix.iovec;
8const iovec_const = std.posix.iovec_const;
9const uid_t = linux.uid_t;
10const gid_t = linux.gid_t;
11const pid_t = linux.pid_t;
12const stack_t = linux.stack_t;
13const sigset_t = linux.sigset_t;
14const sockaddr = linux.sockaddr;
15const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
164
175pub fn syscall0(number: SYS) u32 {
186 return asm volatile (
......@@ -264,39 +252,27 @@ pub const Stat = extern struct {
264252 ino: ino_t,
265253 mode: mode_t,
266254 nlink: nlink_t,
267 uid: uid_t,
268 gid: gid_t,
255 uid: std.os.linux.uid_t,
256 gid: std.os.linux.gid_t,
269257 rdev: dev_t,
270258 __pad1: [2]u32,
271259 size: off_t,
272 atim: i32,
273 atim_nsec: i32,
274 mtim: i32,
275 mtim_nsec: i32,
276 ctim: i32,
277 ctim_nsec: i32,
260 atim: std.os.linux.timespec,
261 mtim: std.os.linux.timespec,
262 ctim: std.os.linux.timespec,
278263 blksize: blksize_t,
279264 __pad3: u32,
280265 blocks: blkcnt_t,
281266
282 pub fn atime(self: @This()) timespec {
283 return .{
284 .sec = self.atim,
285 .nsec = self.atim_nsec,
286 };
267 pub fn atime(self: @This()) std.os.linux.timespec {
268 return self.atim;
287269 }
288270
289 pub fn mtime(self: @This()) timespec {
290 return .{
291 .sec = self.mtim,
292 .nsec = self.mtim_nsec,
293 };
271 pub fn mtime(self: @This()) std.os.linux.timespec {
272 return self.mtim;
294273 }
295274
296 pub fn ctime(self: @This()) timespec {
297 return .{
298 .sec = self.ctim,
299 .nsec = self.ctim_nsec,
300 };
275 pub fn ctime(self: @This()) std.os.linux.timespec {
276 return self.ctim;
301277 }
302278};
lib/std/os/linux/mips64.zig+6-18
......@@ -1,18 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const linux = std.os.linux;
5const SYS = linux.SYS;
6const socklen_t = linux.socklen_t;
7const iovec = std.posix.iovec;
8const iovec_const = std.posix.iovec_const;
9const uid_t = linux.uid_t;
10const gid_t = linux.gid_t;
11const pid_t = linux.pid_t;
12const stack_t = linux.stack_t;
13const sigset_t = linux.sigset_t;
14const sockaddr = linux.sockaddr;
15const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
164
175pub fn syscall0(number: SYS) u64 {
186 return asm volatile (
......@@ -243,8 +231,8 @@ pub const Stat = extern struct {
243231 ino: ino_t,
244232 mode: mode_t,
245233 nlink: nlink_t,
246 uid: uid_t,
247 gid: gid_t,
234 uid: std.os.linux.uid_t,
235 gid: std.os.linux.gid_t,
248236 rdev: dev_t,
249237 __pad1: [2]u32, // -1 because our dev_t is u64 (kernel dev_t is really u32).
250238 size: off_t,
......@@ -258,21 +246,21 @@ pub const Stat = extern struct {
258246 __pad3: u32,
259247 blocks: blkcnt_t,
260248
261 pub fn atime(self: @This()) timespec {
249 pub fn atime(self: @This()) std.os.linux.timespec {
262250 return .{
263251 .sec = self.atim,
264252 .nsec = self.atim_nsec,
265253 };
266254 }
267255
268 pub fn mtime(self: @This()) timespec {
256 pub fn mtime(self: @This()) std.os.linux.timespec {
269257 return .{
270258 .sec = self.mtim,
271259 .nsec = self.mtim_nsec,
272260 };
273261 }
274262
275 pub fn ctime(self: @This()) timespec {
263 pub fn ctime(self: @This()) std.os.linux.timespec {
276264 return .{
277265 .sec = self.ctim,
278266 .nsec = self.ctim_nsec,
lib/std/os/linux/powerpc.zig+10-22
......@@ -1,18 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const linux = std.os.linux;
5const SYS = linux.SYS;
6const socklen_t = linux.socklen_t;
7const iovec = std.posix.iovec;
8const iovec_const = std.posix.iovec_const;
9const uid_t = linux.uid_t;
10const gid_t = linux.gid_t;
11const pid_t = linux.pid_t;
12const stack_t = linux.stack_t;
13const sigset_t = linux.sigset_t;
14const sockaddr = linux.sockaddr;
15const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
164
175pub fn syscall0(number: SYS) u32 {
186 // r0 is both an input register and a clobber. musl and glibc achieve this with
......@@ -247,7 +235,7 @@ pub fn clone() callconv(.naked) u32 {
247235pub const restore = restore_rt;
248236
249237pub fn restore_rt() callconv(.naked) noreturn {
250 switch (@import("builtin").zig_backend) {
238 switch (builtin.zig_backend) {
251239 .stage2_c => asm volatile (
252240 \\ li 0, %[number]
253241 \\ sc
......@@ -282,27 +270,27 @@ pub const Stat = extern struct {
282270 ino: ino_t,
283271 mode: mode_t,
284272 nlink: nlink_t,
285 uid: uid_t,
286 gid: gid_t,
273 uid: std.os.linux.uid_t,
274 gid: std.os.linux.gid_t,
287275 rdev: dev_t,
288276 __rdev_padding: i16,
289277 size: off_t,
290278 blksize: blksize_t,
291279 blocks: blkcnt_t,
292 atim: timespec,
293 mtim: timespec,
294 ctim: timespec,
280 atim: std.os.linux.timespec,
281 mtim: std.os.linux.timespec,
282 ctim: std.os.linux.timespec,
295283 __unused: [2]u32,
296284
297 pub fn atime(self: @This()) timespec {
285 pub fn atime(self: @This()) std.os.linux.timespec {
298286 return self.atim;
299287 }
300288
301 pub fn mtime(self: @This()) timespec {
289 pub fn mtime(self: @This()) std.os.linux.timespec {
302290 return self.mtim;
303291 }
304292
305 pub fn ctime(self: @This()) timespec {
293 pub fn ctime(self: @This()) std.os.linux.timespec {
306294 return self.ctim;
307295 }
308296};
lib/std/os/linux/powerpc64.zig+10-22
......@@ -1,18 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const linux = std.os.linux;
5const SYS = linux.SYS;
6const socklen_t = linux.socklen_t;
7const iovec = std.posix.iovec;
8const iovec_const = std.posix.iovec_const;
9const uid_t = linux.uid_t;
10const gid_t = linux.gid_t;
11const pid_t = linux.pid_t;
12const stack_t = linux.stack_t;
13const sigset_t = linux.sigset_t;
14const sockaddr = linux.sockaddr;
15const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
164
175pub fn syscall0(number: SYS) u64 {
186 // r0 is both an input register and a clobber. musl and glibc achieve this with
......@@ -232,7 +220,7 @@ pub fn clone() callconv(.naked) u64 {
232220pub const restore = restore_rt;
233221
234222pub fn restore_rt() callconv(.naked) noreturn {
235 switch (@import("builtin").zig_backend) {
223 switch (builtin.zig_backend) {
236224 .stage2_c => asm volatile (
237225 \\ li 0, %[number]
238226 \\ sc
......@@ -267,26 +255,26 @@ pub const Stat = extern struct {
267255 ino: ino_t,
268256 nlink: nlink_t,
269257 mode: mode_t,
270 uid: uid_t,
271 gid: gid_t,
258 uid: std.os.linux.uid_t,
259 gid: std.os.linux.gid_t,
272260 rdev: dev_t,
273261 size: off_t,
274262 blksize: blksize_t,
275263 blocks: blkcnt_t,
276 atim: timespec,
277 mtim: timespec,
278 ctim: timespec,
264 atim: std.os.linux.timespec,
265 mtim: std.os.linux.timespec,
266 ctim: std.os.linux.timespec,
279267 __unused: [3]u64,
280268
281 pub fn atime(self: @This()) timespec {
269 pub fn atime(self: @This()) std.os.linux.timespec {
282270 return self.atim;
283271 }
284272
285 pub fn mtime(self: @This()) timespec {
273 pub fn mtime(self: @This()) std.os.linux.timespec {
286274 return self.mtim;
287275 }
288276
289 pub fn ctime(self: @This()) timespec {
277 pub fn ctime(self: @This()) std.os.linux.timespec {
290278 return self.ctim;
291279 }
292280};
lib/std/os/linux/riscv32.zig+9-20
......@@ -1,17 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const iovec = std.posix.iovec;
4const iovec_const = std.posix.iovec_const;
5const linux = std.os.linux;
6const SYS = linux.SYS;
7const uid_t = std.os.linux.uid_t;
8const gid_t = std.os.linux.gid_t;
9const pid_t = std.os.linux.pid_t;
10const stack_t = linux.stack_t;
11const sigset_t = linux.sigset_t;
12const sockaddr = linux.sockaddr;
13const socklen_t = linux.socklen_t;
14const timespec = std.os.linux.timespec;
3const SYS = std.os.linux.SYS;
154
165pub fn syscall0(number: SYS) u32 {
176 return asm volatile ("ecall"
......@@ -150,28 +139,28 @@ pub const Stat = extern struct {
150139 ino: ino_t,
151140 mode: mode_t,
152141 nlink: nlink_t,
153 uid: uid_t,
154 gid: gid_t,
142 uid: std.os.linux.uid_t,
143 gid: std.os.linux.gid_t,
155144 rdev: dev_t,
156145 __pad: u32,
157146 size: off_t,
158147 blksize: blksize_t,
159148 __pad2: i32,
160149 blocks: blkcnt_t,
161 atim: timespec,
162 mtim: timespec,
163 ctim: timespec,
150 atim: std.os.linux.timespec,
151 mtim: std.os.linux.timespec,
152 ctim: std.os.linux.timespec,
164153 __unused: [2]u32,
165154
166 pub fn atime(self: @This()) timespec {
155 pub fn atime(self: @This()) std.os.linux.timespec {
167156 return self.atim;
168157 }
169158
170 pub fn mtime(self: @This()) timespec {
159 pub fn mtime(self: @This()) std.os.linux.timespec {
171160 return self.mtim;
172161 }
173162
174 pub fn ctime(self: @This()) timespec {
163 pub fn ctime(self: @This()) std.os.linux.timespec {
175164 return self.ctim;
176165 }
177166};
lib/std/os/linux/riscv64.zig+9-20
......@@ -1,17 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const iovec = std.posix.iovec;
4const iovec_const = std.posix.iovec_const;
5const linux = std.os.linux;
6const SYS = linux.SYS;
7const uid_t = std.os.linux.uid_t;
8const gid_t = std.os.linux.gid_t;
9const pid_t = std.os.linux.pid_t;
10const stack_t = linux.stack_t;
11const sigset_t = linux.sigset_t;
12const sockaddr = linux.sockaddr;
13const socklen_t = linux.socklen_t;
14const timespec = std.os.linux.timespec;
3const SYS = std.os.linux.SYS;
154
165pub fn syscall0(number: SYS) u64 {
176 return asm volatile ("ecall"
......@@ -150,28 +139,28 @@ pub const Stat = extern struct {
150139 ino: ino_t,
151140 mode: mode_t,
152141 nlink: nlink_t,
153 uid: uid_t,
154 gid: gid_t,
142 uid: std.os.linux.uid_t,
143 gid: std.os.linux.gid_t,
155144 rdev: dev_t,
156145 __pad: u64,
157146 size: off_t,
158147 blksize: blksize_t,
159148 __pad2: i32,
160149 blocks: blkcnt_t,
161 atim: timespec,
162 mtim: timespec,
163 ctim: timespec,
150 atim: std.os.linux.timespec,
151 mtim: std.os.linux.timespec,
152 ctim: std.os.linux.timespec,
164153 __unused: [2]u32,
165154
166 pub fn atime(self: @This()) timespec {
155 pub fn atime(self: @This()) std.os.linux.timespec {
167156 return self.atim;
168157 }
169158
170 pub fn mtime(self: @This()) timespec {
159 pub fn mtime(self: @This()) std.os.linux.timespec {
171160 return self.mtim;
172161 }
173162
174 pub fn ctime(self: @This()) timespec {
163 pub fn ctime(self: @This()) std.os.linux.timespec {
175164 return self.ctim;
176165 }
177166};
lib/std/os/linux/s390x.zig+9-20
......@@ -1,17 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const iovec = std.posix.iovec;
4const iovec_const = std.posix.iovec_const;
5const linux = std.os.linux;
6const SYS = linux.SYS;
7const uid_t = std.os.linux.uid_t;
8const gid_t = std.os.linux.gid_t;
9const pid_t = std.os.linux.pid_t;
10const sockaddr = linux.sockaddr;
11const socklen_t = linux.socklen_t;
12const timespec = std.os.linux.timespec;
13const stack_t = std.os.linux.stack_t;
14const sigset_t = std.os.linux.sigset_t;
3const SYS = std.os.linux.SYS;
154
165pub fn syscall0(number: SYS) u64 {
176 return asm volatile ("svc 0"
......@@ -172,26 +161,26 @@ pub const Stat = extern struct {
172161 ino: ino_t,
173162 nlink: nlink_t,
174163 mode: mode_t,
175 uid: uid_t,
176 gid: gid_t,
164 uid: std.os.linux.uid_t,
165 gid: std.os.linux.gid_t,
177166 rdev: dev_t,
178167 size: off_t,
179 atim: timespec,
180 mtim: timespec,
181 ctim: timespec,
168 atim: std.os.linux.timespec,
169 mtim: std.os.linux.timespec,
170 ctim: std.os.linux.timespec,
182171 blksize: blksize_t,
183172 blocks: blkcnt_t,
184173 __unused: [3]c_ulong,
185174
186 pub fn atime(self: @This()) timespec {
175 pub fn atime(self: @This()) std.os.linux.timespec {
187176 return self.atim;
188177 }
189178
190 pub fn mtime(self: @This()) timespec {
179 pub fn mtime(self: @This()) std.os.linux.timespec {
191180 return self.mtim;
192181 }
193182
194 pub fn ctime(self: @This()) timespec {
183 pub fn ctime(self: @This()) std.os.linux.timespec {
195184 return self.ctim;
196185 }
197186};
lib/std/os/linux/sparc64.zig+17-29
......@@ -1,19 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const pid_t = linux.pid_t;
5const uid_t = linux.uid_t;
6const clock_t = linux.clock_t;
7const stack_t = linux.stack_t;
8const sigset_t = linux.sigset_t;
9
10const linux = std.os.linux;
11const SYS = linux.SYS;
12const sockaddr = linux.sockaddr;
13const socklen_t = linux.socklen_t;
14const iovec = std.posix.iovec;
15const iovec_const = std.posix.iovec_const;
16const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
174
185pub fn syscall_pipe(fd: *[2]i32) u64 {
196 return asm volatile (
......@@ -252,34 +239,35 @@ pub const blkcnt_t = i64;
252239
253240// The `stat64` definition used by the kernel.
254241pub const Stat = extern struct {
255 dev: u64,
256 ino: u64,
257 nlink: u64,
242 dev: dev_t,
243 ino: ino_t,
244 nlink: nlink_t,
245 _pad: i32,
258246
259 mode: u32,
260 uid: u32,
261 gid: u32,
247 mode: mode_t,
248 uid: std.os.linux.uid_t,
249 gid: std.os.linux.gid_t,
262250 __pad0: u32,
263251
264 rdev: u64,
252 rdev: dev_t,
265253 size: i64,
266 blksize: i64,
267 blocks: i64,
254 blksize: blksize_t,
255 blocks: blkcnt_t,
268256
269 atim: timespec,
270 mtim: timespec,
271 ctim: timespec,
257 atim: std.os.linux.timespec,
258 mtim: std.os.linux.timespec,
259 ctim: std.os.linux.timespec,
272260 __unused: [3]u64,
273261
274 pub fn atime(self: @This()) timespec {
262 pub fn atime(self: @This()) std.os.linux.timespec {
275263 return self.atim;
276264 }
277265
278 pub fn mtime(self: @This()) timespec {
266 pub fn mtime(self: @This()) std.os.linux.timespec {
279267 return self.mtim;
280268 }
281269
282 pub fn ctime(self: @This()) timespec {
270 pub fn ctime(self: @This()) std.os.linux.timespec {
283271 return self.ctim;
284272 }
285273};
lib/std/os/linux/thumb.zig+1-2
......@@ -4,8 +4,7 @@
44//! Save and restore r7 around the syscall without touching the stack pointer not
55//! to break the frame chain.
66const std = @import("../../std.zig");
7const linux = std.os.linux;
8const SYS = linux.SYS;
7const SYS = std.os.linux.SYS;
98
109pub fn syscall0(number: SYS) u32 {
1110 var buf: [2]u32 = .{ @intFromEnum(number), undefined };
lib/std/os/linux/x86.zig+11-23
......@@ -1,18 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const linux = std.os.linux;
5const SYS = linux.SYS;
6const socklen_t = linux.socklen_t;
7const iovec = std.posix.iovec;
8const iovec_const = std.posix.iovec_const;
9const uid_t = linux.uid_t;
10const gid_t = linux.gid_t;
11const pid_t = linux.pid_t;
12const stack_t = linux.stack_t;
13const sigset_t = linux.sigset_t;
14const sockaddr = linux.sockaddr;
15const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
164
175pub fn syscall0(number: SYS) u32 {
186 return asm volatile ("int $0x80"
......@@ -169,7 +157,7 @@ pub fn clone() callconv(.naked) u32 {
169157}
170158
171159pub fn restore() callconv(.naked) noreturn {
172 switch (@import("builtin").zig_backend) {
160 switch (builtin.zig_backend) {
173161 .stage2_c => asm volatile (
174162 \\ movl %[number], %%eax
175163 \\ int $0x80
......@@ -185,7 +173,7 @@ pub fn restore() callconv(.naked) noreturn {
185173}
186174
187175pub fn restore_rt() callconv(.naked) noreturn {
188 switch (@import("builtin").zig_backend) {
176 switch (builtin.zig_backend) {
189177 .stage2_c => asm volatile (
190178 \\ movl %[number], %%eax
191179 \\ int $0x80
......@@ -221,27 +209,27 @@ pub const Stat = extern struct {
221209 __ino_truncated: u32,
222210 mode: mode_t,
223211 nlink: nlink_t,
224 uid: uid_t,
225 gid: gid_t,
212 uid: std.os.linux.uid_t,
213 gid: std.os.linux.gid_t,
226214 rdev: dev_t,
227215 __rdev_padding: u32,
228216 size: off_t,
229217 blksize: blksize_t,
230218 blocks: blkcnt_t,
231 atim: timespec,
232 mtim: timespec,
233 ctim: timespec,
219 atim: std.os.linux.timespec,
220 mtim: std.os.linux.timespec,
221 ctim: std.os.linux.timespec,
234222 ino: ino_t,
235223
236 pub fn atime(self: @This()) timespec {
224 pub fn atime(self: @This()) std.os.linux.timespec {
237225 return self.atim;
238226 }
239227
240 pub fn mtime(self: @This()) timespec {
228 pub fn mtime(self: @This()) std.os.linux.timespec {
241229 return self.mtim;
242230 }
243231
244 pub fn ctime(self: @This()) timespec {
232 pub fn ctime(self: @This()) std.os.linux.timespec {
245233 return self.ctim;
246234 }
247235};
lib/std/os/linux/x86_64.zig+10-24
......@@ -1,20 +1,6 @@
11const builtin = @import("builtin");
22const std = @import("../../std.zig");
3const maxInt = std.math.maxInt;
4const linux = std.os.linux;
5const SYS = linux.SYS;
6const iovec = std.posix.iovec;
7const iovec_const = std.posix.iovec_const;
8
9const pid_t = linux.pid_t;
10const uid_t = linux.uid_t;
11const gid_t = linux.gid_t;
12const clock_t = linux.clock_t;
13const stack_t = linux.stack_t;
14const sigset_t = linux.sigset_t;
15const sockaddr = linux.sockaddr;
16const socklen_t = linux.socklen_t;
17const timespec = linux.timespec;
3const SYS = std.os.linux.SYS;
184
195pub fn syscall0(number: SYS) u64 {
206 return asm volatile ("syscall"
......@@ -131,7 +117,7 @@ pub fn clone() callconv(.naked) u64 {
131117pub const restore = restore_rt;
132118
133119pub fn restore_rt() callconv(.naked) noreturn {
134 switch (@import("builtin").zig_backend) {
120 switch (builtin.zig_backend) {
135121 .stage2_c => asm volatile (
136122 \\ movl %[number], %%eax
137123 \\ syscall
......@@ -177,28 +163,28 @@ pub const Stat = extern struct {
177163 nlink: u64,
178164
179165 mode: u32,
180 uid: uid_t,
181 gid: gid_t,
166 uid: std.os.linux.uid_t,
167 gid: std.os.linux.gid_t,
182168 __pad0: u32,
183169 rdev: dev_t,
184170 size: off_t,
185171 blksize: i64,
186172 blocks: i64,
187173
188 atim: timespec,
189 mtim: timespec,
190 ctim: timespec,
174 atim: std.os.linux.timespec,
175 mtim: std.os.linux.timespec,
176 ctim: std.os.linux.timespec,
191177 __unused: [3]i64,
192178
193 pub fn atime(self: @This()) timespec {
179 pub fn atime(self: @This()) std.os.linux.timespec {
194180 return self.atim;
195181 }
196182
197 pub fn mtime(self: @This()) timespec {
183 pub fn mtime(self: @This()) std.os.linux.timespec {
198184 return self.mtim;
199185 }
200186
201 pub fn ctime(self: @This()) timespec {
187 pub fn ctime(self: @This()) std.os.linux.timespec {
202188 return self.ctim;
203189 }
204190};