From c24540d263c6190ad48eee313079dd5d36bed1d6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 1 Jan 2021 14:56:26 -0700 Subject: [PATCH] std.debug: adjust panic message also extern "c" instead of extern "pthread" --- lib/std/c/freebsd.zig | 2 +- lib/std/debug.zig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/std/c/freebsd.zig b/lib/std/c/freebsd.zig index 0eae010d2e..a8d11b95b2 100644 --- a/lib/std/c/freebsd.zig +++ b/lib/std/c/freebsd.zig @@ -13,7 +13,7 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize; pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int; pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize; -pub extern "pthread" fn pthread_getthreadid_np() c_int; +pub extern "c" fn pthread_getthreadid_np() c_int; pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int; pub extern "c" fn malloc_usable_size(?*const c_void) usize; diff --git a/lib/std/debug.zig b/lib/std/debug.zig index d67a597031..57a0e20d2e 100644 --- a/lib/std/debug.zig +++ b/lib/std/debug.zig @@ -263,10 +263,10 @@ pub fn panicExtra(trace: ?*const builtin.StackTrace, first_trace_addr: ?usize, c const stderr = io.getStdErr().writer(); if (builtin.single_threaded) { - stderr.print("main thread panicked: ", .{}) catch os.abort(); + stderr.print("panic: ", .{}) catch os.abort(); } else { const current_thread_id = std.Thread.getCurrentThreadId(); - stderr.print("thread {d} panicked: ", .{current_thread_id}) catch os.abort(); + stderr.print("thread {d} panic: ", .{current_thread_id}) catch os.abort(); } stderr.print(format ++ "\n", args) catch os.abort(); if (trace) |t| {