From 800c5de2ae527cdefaa5567720dab2f899244897 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 10 Sep 2020 14:40:33 -0700 Subject: [PATCH] update the stack trace test case for lines added to start.zig --- lib/std/os/bits/linux/powerpc64.zig | 6 +++--- test/stack_traces.zig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/std/os/bits/linux/powerpc64.zig b/lib/std/os/bits/linux/powerpc64.zig index a6884aa024..adc6c87c1a 100644 --- a/lib/std/os/bits/linux/powerpc64.zig +++ b/lib/std/os/bits/linux/powerpc64.zig @@ -26,7 +26,7 @@ pub const SYS = extern enum(usize) { mknod = 14, chmod = 15, lchown = 16, - sys_break = 17, // sys_ prepended to avoid clashing with keyword + @"break" = 17, oldstat = 18, lseek = 19, getpid = 20, @@ -574,7 +574,7 @@ pub const vrregset = extern struct { _pad1: [2]u32, vscr_word_be: u32, vrsave: u32, - _pad2: [3]u32 + _pad2: [3]u32, }; pub const vrregset_t = vrregset; @@ -588,7 +588,7 @@ pub const mcontext_t = extern struct { gp_regs: gregset_t, fp_regs: fpregset_t, v_regs: *vrregset_t, - vmx_reserve: [34+34+32+1]i64, + vmx_reserve: [34 + 34 + 32 + 1]i64, }; pub const ucontext_t = extern struct { diff --git a/test/stack_traces.zig b/test/stack_traces.zig index 2ab022e6ec..496be05138 100644 --- a/test/stack_traces.zig +++ b/test/stack_traces.zig @@ -282,10 +282,10 @@ pub fn addCases(cases: *tests.StackTracesContext) void { \\source.zig:10:8: [address] in main (test) \\ foo(); \\ ^ - \\start.zig:254:29: [address] in std.start.posixCallMainAndExit (test) + \\start.zig:269:29: [address] in std.start.posixCallMainAndExit (test) \\ return root.main(); \\ ^ - \\start.zig:128:5: [address] in std.start._start (test) + \\start.zig:143:5: [address] in std.start._start (test) \\ @call(.{ .modifier = .never_inline }, posixCallMainAndExit, .{}); \\ ^ \\ @@ -294,7 +294,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void { switch (std.Target.current.cpu.arch) { .aarch64 => "", // TODO disabled; results in segfault else => - \\start.zig:128:5: [address] in std.start._start (test) + \\start.zig:143:5: [address] in std.start._start (test) \\ @call(.{ .modifier = .never_inline }, posixCallMainAndExit, .{}); \\ ^ \\