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-09-05 14:54:30+02:00
log372b13b9de9e06afc6682859950fbeee75767722
treeb9b6758d08c7247457a3a1250a2f03bbe9707d68
parentf8b64ff2fb65ebd9f27a694ce3a99793723392ab
signaturebadge-check 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");
......@@ -78,10 +77,6 @@ fn wmemset(dest: [*]wchar_t, elem: wchar_t, len: usize) callconv(.c) [*]wchar_t
7877 return dest;
7978}
8079
81fn wcslen(str: [*:0]const wchar_t) callconv(.c) usize {
82 return wcsnlen(str, std.math.maxInt(usize));
83}
84
8580fn wcsnlen(str: [*:0]const wchar_t, max: usize) callconv(.c) usize {
8681 return std.mem.findScalar(wchar_t, str[0..max], 0) orelse max;
8782}
......@@ -193,7 +188,7 @@ fn wcswcs(noalias haystack: [*:0]const wchar_t, noalias needle: [*:0]const wchar
193188}
194189
195190fn wcsdup(str: [*:0]const wchar_t) callconv(.c) ?[*:0]wchar_t {
196 const len = wcslen(str);
191 const len = c.wcslen(str);
197192 const size = (len + 1) * @sizeOf(wchar_t);
198193 const d_opaque = c.malloc(size) orelse return null;
199194 const d: [*]wchar_t = @ptrCast(@alignCast(d_opaque));
lib/compiler_rt.zig+5
......@@ -174,6 +174,7 @@ comptime {
174174 symbol(&bcmp, "bcmp");
175175 _ = @import("compiler_rt/ssp.zig");
176176 symbol(&strlen, "strlen");
177 symbol(&wcslen, "wcslen");
177178 }
178179
179180 // Temporarily used for uefi until https://github.com/ziglang/zig/issues/21630 is addressed.
......@@ -188,6 +189,10 @@ fn strlen(s: [*:0]const c_char) callconv(.c) usize {
188189 return std.mem.len(s);
189190}
190191
192fn wcslen(s: [*:0]const std.c.wchar_t) callconv(.c) usize {
193 return std.mem.len(s);
194}
195
191196fn memcmp(vl: [*]const u8, vr: [*]const u8, n: usize) callconv(.c) c_int {
192197 var i: usize = 0;
193198 while (i < n) : (i += 1) {
lib/std/c.zig+2
......@@ -11214,6 +11214,8 @@ pub extern "c" fn div(a: c_int, b: c_int) div_t;
1121411214pub extern "c" fn ldiv(a: c_long, b: c_long) ldiv_t;
1121511215pub extern "c" fn lldiv(a: c_longlong, b: c_longlong) lldiv_t;
1121611216
11217pub extern "c" fn wcslen(s: [*:0]const wchar_t) usize;
11218
1121711219pub extern "c" fn atoi(str: [*:0]const c_char) c_int;
1121811220pub extern "c" fn atol(str: [*:0]const c_char) c_long;
1121911221pub extern "c" fn atoll(str: [*:0]const c_char) c_longlong;