Commit 6db190cf708d6ddb1c51d294c6f5a9416106277f | zig

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

3 files changed, 17 insertions(+), 8 deletions(-)

lib/std/os/linux.zig+12-7

 @@ -3222,16 +3222,21 @@ pub const epoll_data = extern union {
     @"u64": u64,
 };
-// On x86_64 the structure is packed so that it matches the definition of its
+pub const epoll_event = switch (builtin.zig_backend) {
-// 32bit counterpart
+    // stage1 crashes with the align(4) field so we have this workaround
-pub const epoll_event = switch (native_arch) {
+    .stage1 => switch (native_arch) {
-    .x86_64 => packed struct {
+        .x86_64 => packed struct {
-        events: u32,
+            events: u32,
-        data: epoll_data,
+            data: epoll_data,
+        },
+        else => extern struct {
+            events: u32,
+            data: epoll_data,
+        },
     },
     else => extern struct {
         events: u32,
-        data: epoll_data,
+        data: epoll_data align(4),
     },
 };

src/clang_options_data.zig+1-1

tools/update_clang_options.zig+4

 @@ -272,6 +272,10 @@ const known_options = [_]KnownOpt{
         .name = "v",
         .ident = "verbose",
     },
+    .{
+        .name = "verbose",
+        .ident = "verbose",
+    },
     .{
         .name = "L",
         .ident = "lib_dir",