authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-08-03 19:21:45+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-10-07 00:30:52+02:00
log964e93dc471a2b7b226112a609af482f6907e3fa
tree5cd7f9a584a564d4845ff8daad792ceb274ac555
parent45a40c4fa8609de2a1e2cd9c6366e7f31def4fd7
signature Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

move wcslen from libzigc to compiler-rt

Similar to strlen, LLVM 23+ will sometimes emit libcalls to this function even when libc isn't linked.

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

lib/c/wchar.zig+1-6
......@@ -14,7 +14,6 @@ comptime {
1414 symbol(&wmemcpy, "wmemcpy");
1515 symbol(&wmemmove, "wmemmove");
1616 symbol(&wmemset, "wmemset");
17 symbol(&wcslen, "wcslen");
1817 symbol(&wcsnlen, "wcsnlen");
1918 symbol(&wcscmp, "wcscmp");
2019 symbol(&wcsncmp, "wcsncmp");
......@@ -81,10 +80,6 @@ fn wmemset(dest: [*]wchar_t, elem: wchar_t, len: usize) callconv(.c) [*]wchar_t
8180 return dest;
8281}
8382
84fn wcslen(str: [*:0]const wchar_t) callconv(.c) usize {
85 return std.mem.len(str);
86}
87
8883fn wcsnlen(str: [*:0]const wchar_t, max: usize) callconv(.c) usize {
8984 for (0..max) |i| {
9085 if (str[i] == 0) return i;
......@@ -199,7 +194,7 @@ fn wcswcs(noalias haystack: [*:0]const wchar_t, noalias needle: [*:0]const wchar
199194}
200195
201196fn wcsdup(str: [*:0]const wchar_t) callconv(.c) ?[*:0]wchar_t {
202 const len = wcslen(str);
197 const len = c.wcslen(str);
203198 const size = (len + 1) * @sizeOf(wchar_t);
204199 const d_opaque = c.malloc(size) orelse return null;
205200 const d: [*]wchar_t = @ptrCast(@alignCast(d_opaque));
lib/compiler_rt.zig+5
......@@ -162,6 +162,7 @@ comptime {
162162 symbol(&bcmp, "bcmp");
163163 _ = @import("compiler_rt/ssp.zig");
164164 symbol(&strlen, "strlen");
165 symbol(&wcslen, "wcslen");
165166 }
166167
167168 _ = @import("compiler_rt/elf.zig");
......@@ -178,6 +179,10 @@ fn strlen(s: [*:0]const c_char) callconv(.c) usize {
178179 return std.mem.len(s);
179180}
180181
182fn wcslen(s: [*:0]const std.c.wchar_t) callconv(.c) usize {
183 return std.mem.len(s);
184}
185
181186fn memcmp(vl: [*]const u8, vr: [*]const u8, n: usize) callconv(.c) c_int {
182187 var i: usize = 0;
183188 while (i < n) : (i += 1) {
lib/std/c.zig+2
......@@ -11389,6 +11389,8 @@ pub extern "c" fn div(a: c_int, b: c_int) div_t;
1138911389pub extern "c" fn ldiv(a: c_long, b: c_long) ldiv_t;
1139011390pub extern "c" fn lldiv(a: c_longlong, b: c_longlong) lldiv_t;
1139111391
11392pub extern "c" fn wcslen(s: [*:0]const wchar_t) usize;
11393
1139211394pub extern "c" fn atoi(str: [*:0]const c_char) c_int;
1139311395pub extern "c" fn atol(str: [*:0]const c_char) c_long;
1139411396pub extern "c" fn atoll(str: [*:0]const c_char) c_longlong;