| author |  Andrew Kelley <andrew@ziglang.org> 2022-07-03 22:27:21-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2022-07-03 22:27:21-07:00 |
| log | 6db190cf708d6ddb1c51d294c6f5a9416106277f |
| tree | 3d6a1e86f9e67c449ab0f2cb732d5c5f8ae2f5e0 |
| parent | fdc24e66084c40cfbdb6ed459799f77ea405c4ac |
| parent | 314ce5465dfdc9f4d1e2d178704b47666d541fc4 |
Merge remote-tracking branch 'origin/master' into llvm14
3 files changed, 17 insertions(+), 8 deletions(-)
lib- std
lib/std/os/linux.zig+12-7
| ... | ... | @@ -3222,16 +3222,21 @@ pub const epoll_data = extern union { |
| 3222 | 3222 | @"u64": u64, |
| 3223 | 3223 | }; |
| 3224 | 3224 | |
| 3225 | // On x86_64 the structure is packed so that it matches the definition of its | |
| 3226 | // 32bit counterpart | |
| 3227 | pub const epoll_event = switch (native_arch) { | |
| 3228 | .x86_64 => packed struct { | |
| 3229 | events: u32, | |
| 3230 | data: epoll_data, | |
| 3225 | pub const epoll_event = switch (builtin.zig_backend) { | |
| 3226 | // stage1 crashes with the align(4) field so we have this workaround | |
| 3227 | .stage1 => switch (native_arch) { | |
| 3228 | .x86_64 => packed struct { | |
| 3229 | events: u32, | |
| 3230 | data: epoll_data, | |
| 3231 | }, | |
| 3232 | else => extern struct { | |
| 3233 | events: u32, | |
| 3234 | data: epoll_data, | |
| 3235 | }, | |
| 3231 | 3236 | }, |
| 3232 | 3237 | else => extern struct { |
| 3233 | 3238 | events: u32, |
| 3234 | data: epoll_data, | |
| 3239 | data: epoll_data align(4), | |
| 3235 | 3240 | }, |
| 3236 | 3241 | }; |
| 3237 | 3242 |
src/clang_options_data.zig+1-1
| ... | ... | @@ -1991,7 +1991,7 @@ flagpsl("MT"), |
| 1991 | 1991 | .{ |
| 1992 | 1992 | .name = "verbose", |
| 1993 | 1993 | .syntax = .flag, |
| 1994 | .zig_equivalent = .other, | |
| 1994 | .zig_equivalent = .verbose, | |
| 1995 | 1995 | .pd1 = false, |
| 1996 | 1996 | .pd2 = true, |
| 1997 | 1997 | .psl = false, |
tools/update_clang_options.zig+4
| ... | ... | @@ -272,6 +272,10 @@ const known_options = [_]KnownOpt{ |
| 272 | 272 | .name = "v", |
| 273 | 273 | .ident = "verbose", |
| 274 | 274 | }, |
| 275 | .{ | |
| 276 | .name = "verbose", | |
| 277 | .ident = "verbose", | |
| 278 | }, | |
| 275 | 279 | .{ |
| 276 | 280 | .name = "L", |
| 277 | 281 | .ident = "lib_dir", |