From 93b5ff9eab5b867ad0b754636c32da2ff40fd142 Mon Sep 17 00:00:00 2001
From: David Senoner <seda18@rolmail.net>
Date: Thu, 15 May 2025 14:44:16 +0200
Subject: [PATCH 1/7] libc: implement common `abs` for various integer sizes

---
 lib/c.zig                          |  1 +
 lib/c/stdlib.zig                   | 29 +++++++++++++++++++++++++++++
 lib/libc/musl/src/stdlib/abs.c     |  6 ------
 lib/libc/musl/src/stdlib/imaxabs.c |  6 ------
 lib/libc/musl/src/stdlib/labs.c    |  6 ------
 lib/libc/musl/src/stdlib/llabs.c   |  6 ------
 src/libs/musl.zig                  |  4 ----
 src/libs/wasi_libc.zig             |  4 ----
 8 files changed, 30 insertions(+), 32 deletions(-)
 create mode 100644 lib/c/stdlib.zig
 delete mode 100644 lib/libc/musl/src/stdlib/abs.c
 delete mode 100644 lib/libc/musl/src/stdlib/imaxabs.c
 delete mode 100644 lib/libc/musl/src/stdlib/labs.c
 delete mode 100644 lib/libc/musl/src/stdlib/llabs.c

diff --git a/lib/c.zig b/lib/c.zig
index 39684264ce28..91ccbbc369ff 100644
--- a/lib/c.zig
+++ b/lib/c.zig
@@ -16,6 +16,7 @@ else
 comptime {
     if (builtin.target.isMuslLibC() or builtin.target.isWasiLibC()) {
         // Files specific to musl and wasi-libc.
+        _ = @import("c/stdlib.zig");
         _ = @import("c/string.zig");
         _ = @import("c/strings.zig");
     }
diff --git a/lib/c/stdlib.zig b/lib/c/stdlib.zig
new file mode 100644
index 000000000000..7c6dfbdf6d40
--- /dev/null
+++ b/lib/c/stdlib.zig
@@ -0,0 +1,29 @@
+const std = @import("std");
+const common = @import("common.zig");
+const c = @cImport({
+    @cInclude("stdint.h");
+});
+const c_intmax_t = c.intmax_t;
+
+comptime {
+    @export(&abs, .{ .name = "abs", .linkage = common.linkage, .visibility = common.visibility });
+    @export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
+    @export(&labs, .{ .name = "labs", .linkage = common.linkage, .visibility = common.visibility });
+    @export(&llabs, .{ .name = "llabs", .linkage = common.linkage, .visibility = common.visibility });
+}
+
+fn abs(a: c_int) callconv(.c) c_int {
+    return if (a > 0) a else -a;
+}
+
+fn imaxabs(a: c_intmax_t) callconv(.c) c_intmax_t {
+    return if (a > 0) a else -a;
+}
+
+fn labs(a: c_long) callconv(.c) c_long {
+    return if (a > 0) a else -a;
+}
+
+fn llabs(a: c_longlong) callconv(.c) c_longlong {
+    return if (a > 0) a else -a;
+}
diff --git a/lib/libc/musl/src/stdlib/abs.c b/lib/libc/musl/src/stdlib/abs.c
deleted file mode 100644
index e721fdc2b17e..000000000000
--- a/lib/libc/musl/src/stdlib/abs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdlib.h>
-
-int abs(int a)
-{
-	return a>0 ? a : -a;
-}
diff --git a/lib/libc/musl/src/stdlib/imaxabs.c b/lib/libc/musl/src/stdlib/imaxabs.c
deleted file mode 100644
index 8100181930e6..000000000000
--- a/lib/libc/musl/src/stdlib/imaxabs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <inttypes.h>
-
-intmax_t imaxabs(intmax_t a)
-{
-	return a>0 ? a : -a;
-}
diff --git a/lib/libc/musl/src/stdlib/labs.c b/lib/libc/musl/src/stdlib/labs.c
deleted file mode 100644
index 83ddb1475c2d..000000000000
--- a/lib/libc/musl/src/stdlib/labs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdlib.h>
-
-long labs(long a)
-{
-	return a>0 ? a : -a;
-}
diff --git a/lib/libc/musl/src/stdlib/llabs.c b/lib/libc/musl/src/stdlib/llabs.c
deleted file mode 100644
index 9dfaf5cf766d..000000000000
--- a/lib/libc/musl/src/stdlib/llabs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdlib.h>
-
-long long llabs(long long a)
-{
-	return a>0 ? a : -a;
-}
diff --git a/src/libs/musl.zig b/src/libs/musl.zig
index 4ae86f0214c3..299ececaea57 100644
--- a/src/libs/musl.zig
+++ b/src/libs/musl.zig
@@ -1809,7 +1809,6 @@ const src_files = [_][]const u8{
     "musl/src/stdio/vwscanf.c",
     "musl/src/stdio/wprintf.c",
     "musl/src/stdio/wscanf.c",
-    "musl/src/stdlib/abs.c",
     "musl/src/stdlib/atof.c",
     "musl/src/stdlib/atoi.c",
     "musl/src/stdlib/atol.c",
@@ -1819,11 +1818,8 @@ const src_files = [_][]const u8{
     "musl/src/stdlib/ecvt.c",
     "musl/src/stdlib/fcvt.c",
     "musl/src/stdlib/gcvt.c",
-    "musl/src/stdlib/imaxabs.c",
     "musl/src/stdlib/imaxdiv.c",
-    "musl/src/stdlib/labs.c",
     "musl/src/stdlib/ldiv.c",
-    "musl/src/stdlib/llabs.c",
     "musl/src/stdlib/lldiv.c",
     "musl/src/stdlib/qsort.c",
     "musl/src/stdlib/qsort_nr.c",
diff --git a/src/libs/wasi_libc.zig b/src/libs/wasi_libc.zig
index f718f397937c..0d1242f351b3 100644
--- a/src/libs/wasi_libc.zig
+++ b/src/libs/wasi_libc.zig
@@ -1024,7 +1024,6 @@ const libc_top_half_src_files = [_][]const u8{
     "musl/src/stdio/vwscanf.c",
     "musl/src/stdio/wprintf.c",
     "musl/src/stdio/wscanf.c",
-    "musl/src/stdlib/abs.c",
     "musl/src/stdlib/atof.c",
     "musl/src/stdlib/atoi.c",
     "musl/src/stdlib/atol.c",
@@ -1034,11 +1033,8 @@ const libc_top_half_src_files = [_][]const u8{
     "musl/src/stdlib/ecvt.c",
     "musl/src/stdlib/fcvt.c",
     "musl/src/stdlib/gcvt.c",
-    "musl/src/stdlib/imaxabs.c",
     "musl/src/stdlib/imaxdiv.c",
-    "musl/src/stdlib/labs.c",
     "musl/src/stdlib/ldiv.c",
-    "musl/src/stdlib/llabs.c",
     "musl/src/stdlib/lldiv.c",
     "musl/src/stdlib/qsort.c",
     "musl/src/stdlib/qsort_nr.c",

From 58f1637d89f2836dc36fc7ba4c35a1b1fadd7f11 Mon Sep 17 00:00:00 2001
From: David Senoner <seda18@rolmail.net>
Date: Fri, 16 May 2025 16:28:16 +0200
Subject: [PATCH 2/7] libc: move imaxabs to inttypes.zig and don't use cInclude

---
 lib/c.zig          |  1 +
 lib/c/inttypes.zig | 11 +++++++++++
 lib/c/stdlib.zig   |  9 ---------
 lib/std/c.zig      |  3 +++
 4 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 lib/c/inttypes.zig

diff --git a/lib/c.zig b/lib/c.zig
index 91ccbbc369ff..7168c16632a0 100644
--- a/lib/c.zig
+++ b/lib/c.zig
@@ -16,6 +16,7 @@ else
 comptime {
     if (builtin.target.isMuslLibC() or builtin.target.isWasiLibC()) {
         // Files specific to musl and wasi-libc.
+        _ = @import("c/inttypes.zig");
         _ = @import("c/stdlib.zig");
         _ = @import("c/string.zig");
         _ = @import("c/strings.zig");
diff --git a/lib/c/inttypes.zig b/lib/c/inttypes.zig
new file mode 100644
index 000000000000..db207f03c5f8
--- /dev/null
+++ b/lib/c/inttypes.zig
@@ -0,0 +1,11 @@
+const std = @import("std");
+const common = @import("common.zig");
+const intmax_t = std.c.intmax_t;
+
+comptime {
+    @export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
+}
+
+fn imaxabs(a: intmax_t) callconv(.c) intmax_t {
+    return if (a > 0) a else -a;
+}
diff --git a/lib/c/stdlib.zig b/lib/c/stdlib.zig
index 7c6dfbdf6d40..9e5341ec5adb 100644
--- a/lib/c/stdlib.zig
+++ b/lib/c/stdlib.zig
@@ -1,13 +1,8 @@
 const std = @import("std");
 const common = @import("common.zig");
-const c = @cImport({
-    @cInclude("stdint.h");
-});
-const c_intmax_t = c.intmax_t;
 
 comptime {
     @export(&abs, .{ .name = "abs", .linkage = common.linkage, .visibility = common.visibility });
-    @export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
     @export(&labs, .{ .name = "labs", .linkage = common.linkage, .visibility = common.visibility });
     @export(&llabs, .{ .name = "llabs", .linkage = common.linkage, .visibility = common.visibility });
 }
@@ -16,10 +11,6 @@ fn abs(a: c_int) callconv(.c) c_int {
     return if (a > 0) a else -a;
 }
 
-fn imaxabs(a: c_intmax_t) callconv(.c) c_intmax_t {
-    return if (a > 0) a else -a;
-}
-
 fn labs(a: c_long) callconv(.c) c_long {
     return if (a > 0) a else -a;
 }
diff --git a/lib/std/c.zig b/lib/std/c.zig
index e61c8990c3e7..1cfd44107247 100644
--- a/lib/std/c.zig
+++ b/lib/std/c.zig
@@ -10822,6 +10822,9 @@ else
         b: c_longdouble,
     };
 
+pub const intmax_t = i64;
+pub const uintmax_t = u64;
+
 pub extern "c" fn pthread_getthreadid_np() c_int;
 pub extern "c" fn pthread_set_name_np(thread: pthread_t, name: [*:0]const u8) void;
 pub extern "c" fn pthread_get_name_np(thread: pthread_t, name: [*:0]u8, len: usize) void;

From 060e06613e1773a5ee55d521e42a6b6c874abf4d Mon Sep 17 00:00:00 2001
From: David Senoner <seda18@rolmail.net>
Date: Sat, 17 May 2025 08:33:57 +0200
Subject: [PATCH 3/7] libc: delete `fabs` c implementations because already
 implemented in compiler_rt

---
 lib/libc/mingw/math/fabsf.c              | 18 ---------------
 lib/libc/mingw/math/fabsl.c              | 18 ---------------
 lib/libc/musl/src/math/aarch64/fabs.c    |  7 ------
 lib/libc/musl/src/math/aarch64/fabsf.c   |  7 ------
 lib/libc/musl/src/math/arm/fabs.c        | 15 ------------
 lib/libc/musl/src/math/arm/fabsf.c       | 15 ------------
 lib/libc/musl/src/math/fabs.c            |  9 --------
 lib/libc/musl/src/math/fabsf.c           |  9 --------
 lib/libc/musl/src/math/fabsl.c           | 15 ------------
 lib/libc/musl/src/math/i386/fabs.c       |  7 ------
 lib/libc/musl/src/math/i386/fabsf.c      |  7 ------
 lib/libc/musl/src/math/i386/fabsl.c      |  7 ------
 lib/libc/musl/src/math/mips/fabs.c       | 16 -------------
 lib/libc/musl/src/math/mips/fabsf.c      | 16 -------------
 lib/libc/musl/src/math/powerpc/fabs.c    | 15 ------------
 lib/libc/musl/src/math/powerpc/fabsf.c   | 15 ------------
 lib/libc/musl/src/math/powerpc64/fabs.c  |  7 ------
 lib/libc/musl/src/math/powerpc64/fabsf.c |  7 ------
 lib/libc/musl/src/math/riscv32/fabs.c    | 15 ------------
 lib/libc/musl/src/math/riscv32/fabsf.c   | 15 ------------
 lib/libc/musl/src/math/riscv64/fabs.c    | 15 ------------
 lib/libc/musl/src/math/riscv64/fabsf.c   | 15 ------------
 lib/libc/musl/src/math/s390x/fabs.c      | 15 ------------
 lib/libc/musl/src/math/s390x/fabsf.c     | 15 ------------
 lib/libc/musl/src/math/s390x/fabsl.c     | 15 ------------
 lib/libc/musl/src/math/x32/fabs.s        |  9 --------
 lib/libc/musl/src/math/x32/fabsf.s       |  7 ------
 lib/libc/musl/src/math/x32/fabsl.s       |  6 -----
 lib/libc/musl/src/math/x86_64/fabs.c     | 10 --------
 lib/libc/musl/src/math/x86_64/fabsf.c    | 10 --------
 lib/libc/musl/src/math/x86_64/fabsl.c    |  7 ------
 src/libs/mingw.zig                       |  2 --
 src/libs/musl.zig                        | 29 ------------------------
 src/libs/wasi_libc.zig                   |  1 -
 34 files changed, 396 deletions(-)
 delete mode 100644 lib/libc/mingw/math/fabsf.c
 delete mode 100644 lib/libc/mingw/math/fabsl.c
 delete mode 100644 lib/libc/musl/src/math/aarch64/fabs.c
 delete mode 100644 lib/libc/musl/src/math/aarch64/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/arm/fabs.c
 delete mode 100644 lib/libc/musl/src/math/arm/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/fabs.c
 delete mode 100644 lib/libc/musl/src/math/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/fabsl.c
 delete mode 100644 lib/libc/musl/src/math/i386/fabs.c
 delete mode 100644 lib/libc/musl/src/math/i386/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/i386/fabsl.c
 delete mode 100644 lib/libc/musl/src/math/mips/fabs.c
 delete mode 100644 lib/libc/musl/src/math/mips/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/powerpc/fabs.c
 delete mode 100644 lib/libc/musl/src/math/powerpc/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/powerpc64/fabs.c
 delete mode 100644 lib/libc/musl/src/math/powerpc64/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/riscv32/fabs.c
 delete mode 100644 lib/libc/musl/src/math/riscv32/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/riscv64/fabs.c
 delete mode 100644 lib/libc/musl/src/math/riscv64/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/s390x/fabs.c
 delete mode 100644 lib/libc/musl/src/math/s390x/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/s390x/fabsl.c
 delete mode 100644 lib/libc/musl/src/math/x32/fabs.s
 delete mode 100644 lib/libc/musl/src/math/x32/fabsf.s
 delete mode 100644 lib/libc/musl/src/math/x32/fabsl.s
 delete mode 100644 lib/libc/musl/src/math/x86_64/fabs.c
 delete mode 100644 lib/libc/musl/src/math/x86_64/fabsf.c
 delete mode 100644 lib/libc/musl/src/math/x86_64/fabsl.c

diff --git a/lib/libc/mingw/math/fabsf.c b/lib/libc/mingw/math/fabsf.c
deleted file mode 100644
index e7e9d8fa7ae8..000000000000
--- a/lib/libc/mingw/math/fabsf.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-float fabsf (float x);
-
-float
-fabsf (float x)
-{
-#if defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
-  return __builtin_fabsf (x);
-#elif defined(__i386__) || defined(_X86_)
-  float res = 0.0F;
-  asm volatile ("fabs;" : "=t" (res) : "0" (x));
-  return res;
-#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */
-}
diff --git a/lib/libc/mingw/math/fabsl.c b/lib/libc/mingw/math/fabsl.c
deleted file mode 100644
index 1df48cfa9c71..000000000000
--- a/lib/libc/mingw/math/fabsl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-long double fabsl (long double x);
-
-long double
-fabsl (long double x)
-{
-#if defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_)
-  long double res = 0.0L;
-  asm volatile ("fabs;" : "=t" (res) : "0" (x));
-  return res;
-#elif defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
-  return __builtin_fabsl (x);
-#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */
-}
diff --git a/lib/libc/musl/src/math/aarch64/fabs.c b/lib/libc/musl/src/math/aarch64/fabs.c
deleted file mode 100644
index 5c3ecaf44b1d..000000000000
--- a/lib/libc/musl/src/math/aarch64/fabs.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-double fabs(double x)
-{
-	__asm__ ("fabs %d0, %d1" : "=w"(x) : "w"(x));
-	return x;
-}
diff --git a/lib/libc/musl/src/math/aarch64/fabsf.c b/lib/libc/musl/src/math/aarch64/fabsf.c
deleted file mode 100644
index 7fde9817931c..000000000000
--- a/lib/libc/musl/src/math/aarch64/fabsf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-float fabsf(float x)
-{
-	__asm__ ("fabs %s0, %s1" : "=w"(x) : "w"(x));
-	return x;
-}
diff --git a/lib/libc/musl/src/math/arm/fabs.c b/lib/libc/musl/src/math/arm/fabs.c
deleted file mode 100644
index 6e1d367d3d6a..000000000000
--- a/lib/libc/musl/src/math/arm/fabs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if __ARM_PCS_VFP && __ARM_FP&8
-
-double fabs(double x)
-{
-	__asm__ ("vabs.f64 %P0, %P1" : "=w"(x) : "w"(x));
-	return x;
-}
-
-#else
-
-#include "../fabs.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/arm/fabsf.c b/lib/libc/musl/src/math/arm/fabsf.c
deleted file mode 100644
index 4a217c98899d..000000000000
--- a/lib/libc/musl/src/math/arm/fabsf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if __ARM_PCS_VFP && !BROKEN_VFP_ASM
-
-float fabsf(float x)
-{
-	__asm__ ("vabs.f32 %0, %1" : "=t"(x) : "t"(x));
-	return x;
-}
-
-#else
-
-#include "../fabsf.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/fabs.c b/lib/libc/musl/src/math/fabs.c
deleted file mode 100644
index e8258cfdbcf1..000000000000
--- a/lib/libc/musl/src/math/fabs.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-#include <stdint.h>
-
-double fabs(double x)
-{
-	union {double f; uint64_t i;} u = {x};
-	u.i &= -1ULL/2;
-	return u.f;
-}
diff --git a/lib/libc/musl/src/math/fabsf.c b/lib/libc/musl/src/math/fabsf.c
deleted file mode 100644
index 4efc8d686dcc..000000000000
--- a/lib/libc/musl/src/math/fabsf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-#include <stdint.h>
-
-float fabsf(float x)
-{
-	union {float f; uint32_t i;} u = {x};
-	u.i &= 0x7fffffff;
-	return u.f;
-}
diff --git a/lib/libc/musl/src/math/fabsl.c b/lib/libc/musl/src/math/fabsl.c
deleted file mode 100644
index c4f36ec2810c..000000000000
--- a/lib/libc/musl/src/math/fabsl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "libm.h"
-#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-long double fabsl(long double x)
-{
-	return fabs(x);
-}
-#elif (LDBL_MANT_DIG == 64 || LDBL_MANT_DIG == 113) && LDBL_MAX_EXP == 16384
-long double fabsl(long double x)
-{
-	union ldshape u = {x};
-
-	u.i.se &= 0x7fff;
-	return u.f;
-}
-#endif
diff --git a/lib/libc/musl/src/math/i386/fabs.c b/lib/libc/musl/src/math/i386/fabs.c
deleted file mode 100644
index 39672786395f..000000000000
--- a/lib/libc/musl/src/math/i386/fabs.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-double fabs(double x)
-{
-	__asm__ ("fabs" : "+t"(x));
-	return x;
-}
diff --git a/lib/libc/musl/src/math/i386/fabsf.c b/lib/libc/musl/src/math/i386/fabsf.c
deleted file mode 100644
index d882eee34904..000000000000
--- a/lib/libc/musl/src/math/i386/fabsf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-float fabsf(float x)
-{
-	__asm__ ("fabs" : "+t"(x));
-	return x;
-}
diff --git a/lib/libc/musl/src/math/i386/fabsl.c b/lib/libc/musl/src/math/i386/fabsl.c
deleted file mode 100644
index cc1c9ed9c73f..000000000000
--- a/lib/libc/musl/src/math/i386/fabsl.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-long double fabsl(long double x)
-{
-	__asm__ ("fabs" : "+t"(x));
-	return x;
-}
diff --git a/lib/libc/musl/src/math/mips/fabs.c b/lib/libc/musl/src/math/mips/fabs.c
deleted file mode 100644
index 0a5aa3b1d4cc..000000000000
--- a/lib/libc/musl/src/math/mips/fabs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#if !defined(__mips_soft_float) && defined(__mips_abs2008)
-
-#include <math.h>
-
-double fabs(double x)
-{
-	double r;
-	__asm__("abs.d %0,%1" : "=f"(r) : "f"(x));
-	return r;
-}
-
-#else
-
-#include "../fabs.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/mips/fabsf.c b/lib/libc/musl/src/math/mips/fabsf.c
deleted file mode 100644
index 35307be6abae..000000000000
--- a/lib/libc/musl/src/math/mips/fabsf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#if !defined(__mips_soft_float) && defined(__mips_abs2008)
-
-#include <math.h>
-
-float fabsf(float x)
-{
-	float r;
-	__asm__("abs.s %0,%1" : "=f"(r) : "f"(x));
-	return r;
-}
-
-#else
-
-#include "../fabsf.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/powerpc/fabs.c b/lib/libc/musl/src/math/powerpc/fabs.c
deleted file mode 100644
index 9453a3aa981f..000000000000
--- a/lib/libc/musl/src/math/powerpc/fabs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if defined(_SOFT_FLOAT) || defined(__NO_FPRS__) || defined(BROKEN_PPC_D_ASM)
-
-#include "../fabs.c"
-
-#else
-
-double fabs(double x)
-{
-	__asm__ ("fabs %0, %1" : "=d"(x) : "d"(x));
-	return x;
-}
-
-#endif
diff --git a/lib/libc/musl/src/math/powerpc/fabsf.c b/lib/libc/musl/src/math/powerpc/fabsf.c
deleted file mode 100644
index 2e9da588dd65..000000000000
--- a/lib/libc/musl/src/math/powerpc/fabsf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if defined(_SOFT_FLOAT) || defined(__NO_FPRS__)
-
-#include "../fabsf.c"
-
-#else
-
-float fabsf(float x)
-{
-	__asm__ ("fabs %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#endif
diff --git a/lib/libc/musl/src/math/powerpc64/fabs.c b/lib/libc/musl/src/math/powerpc64/fabs.c
deleted file mode 100644
index 6123c7535c6d..000000000000
--- a/lib/libc/musl/src/math/powerpc64/fabs.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-double fabs(double x)
-{
-	__asm__ ("fabs %0, %1" : "=d"(x) : "d"(x));
-	return x;
-}
diff --git a/lib/libc/musl/src/math/powerpc64/fabsf.c b/lib/libc/musl/src/math/powerpc64/fabsf.c
deleted file mode 100644
index e9e45643d28e..000000000000
--- a/lib/libc/musl/src/math/powerpc64/fabsf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-float fabsf(float x)
-{
-	__asm__ ("fabs %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
diff --git a/lib/libc/musl/src/math/riscv32/fabs.c b/lib/libc/musl/src/math/riscv32/fabs.c
deleted file mode 100644
index 5290b6f093fd..000000000000
--- a/lib/libc/musl/src/math/riscv32/fabs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if __riscv_flen >= 64
-
-double fabs(double x)
-{
-	__asm__ ("fabs.d %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#else
-
-#include "../fabs.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/riscv32/fabsf.c b/lib/libc/musl/src/math/riscv32/fabsf.c
deleted file mode 100644
index f5032e354d59..000000000000
--- a/lib/libc/musl/src/math/riscv32/fabsf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if __riscv_flen >= 32
-
-float fabsf(float x)
-{
-	__asm__ ("fabs.s %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#else
-
-#include "../fabsf.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/riscv64/fabs.c b/lib/libc/musl/src/math/riscv64/fabs.c
deleted file mode 100644
index 5290b6f093fd..000000000000
--- a/lib/libc/musl/src/math/riscv64/fabs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if __riscv_flen >= 64
-
-double fabs(double x)
-{
-	__asm__ ("fabs.d %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#else
-
-#include "../fabs.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/riscv64/fabsf.c b/lib/libc/musl/src/math/riscv64/fabsf.c
deleted file mode 100644
index f5032e354d59..000000000000
--- a/lib/libc/musl/src/math/riscv64/fabsf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if __riscv_flen >= 32
-
-float fabsf(float x)
-{
-	__asm__ ("fabs.s %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#else
-
-#include "../fabsf.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/s390x/fabs.c b/lib/libc/musl/src/math/s390x/fabs.c
deleted file mode 100644
index 9bb51cb5ffa5..000000000000
--- a/lib/libc/musl/src/math/s390x/fabs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if defined(__HTM__) || __ARCH__ >= 9
-
-double fabs(double x)
-{
-	__asm__ ("lpdbr %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#else
-
-#include "../fabs.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/s390x/fabsf.c b/lib/libc/musl/src/math/s390x/fabsf.c
deleted file mode 100644
index 9fd96bc9d2aa..000000000000
--- a/lib/libc/musl/src/math/s390x/fabsf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if defined(__HTM__) || __ARCH__ >= 9
-
-float fabsf(float x)
-{
-	__asm__ ("lpebr %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#else
-
-#include "../fabsf.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/s390x/fabsl.c b/lib/libc/musl/src/math/s390x/fabsl.c
deleted file mode 100644
index 65f1005d4e93..000000000000
--- a/lib/libc/musl/src/math/s390x/fabsl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-
-#if defined(__HTM__) || __ARCH__ >= 9
-
-long double fabsl(long double x)
-{
-	__asm__ ("lpxbr %0, %1" : "=f"(x) : "f"(x));
-	return x;
-}
-
-#else
-
-#include "../fabsl.c"
-
-#endif
diff --git a/lib/libc/musl/src/math/x32/fabs.s b/lib/libc/musl/src/math/x32/fabs.s
deleted file mode 100644
index 5715005e330a..000000000000
--- a/lib/libc/musl/src/math/x32/fabs.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.global fabs
-.type fabs,@function
-fabs:
-	xor %eax,%eax
-	dec %rax
-	shr %rax
-	movq %rax,%xmm1
-	andpd %xmm1,%xmm0
-	ret
diff --git a/lib/libc/musl/src/math/x32/fabsf.s b/lib/libc/musl/src/math/x32/fabsf.s
deleted file mode 100644
index 501a1f17550a..000000000000
--- a/lib/libc/musl/src/math/x32/fabsf.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global fabsf
-.type fabsf,@function
-fabsf:
-	mov $0x7fffffff,%eax
-	movq %rax,%xmm1
-	andps %xmm1,%xmm0
-	ret
diff --git a/lib/libc/musl/src/math/x32/fabsl.s b/lib/libc/musl/src/math/x32/fabsl.s
deleted file mode 100644
index 4f215df5c637..000000000000
--- a/lib/libc/musl/src/math/x32/fabsl.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.global fabsl
-.type fabsl,@function
-fabsl:
-	fldt 8(%esp)
-	fabs
-	ret
diff --git a/lib/libc/musl/src/math/x86_64/fabs.c b/lib/libc/musl/src/math/x86_64/fabs.c
deleted file mode 100644
index 1656247770f7..000000000000
--- a/lib/libc/musl/src/math/x86_64/fabs.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-
-double fabs(double x)
-{
-	double t;
-	__asm__ ("pcmpeqd %0, %0" : "=x"(t));          // t = ~0
-	__asm__ ("psrlq   $1, %0" : "+x"(t));          // t >>= 1
-	__asm__ ("andps   %1, %0" : "+x"(x) : "x"(t)); // x &= t
-	return x;
-}
diff --git a/lib/libc/musl/src/math/x86_64/fabsf.c b/lib/libc/musl/src/math/x86_64/fabsf.c
deleted file mode 100644
index 36ea7481fc40..000000000000
--- a/lib/libc/musl/src/math/x86_64/fabsf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-
-float fabsf(float x)
-{
-	float t;
-	__asm__ ("pcmpeqd %0, %0" : "=x"(t));          // t = ~0
-	__asm__ ("psrld   $1, %0" : "+x"(t));          // t >>= 1
-	__asm__ ("andps   %1, %0" : "+x"(x) : "x"(t)); // x &= t
-	return x;
-}
diff --git a/lib/libc/musl/src/math/x86_64/fabsl.c b/lib/libc/musl/src/math/x86_64/fabsl.c
deleted file mode 100644
index cc1c9ed9c73f..000000000000
--- a/lib/libc/musl/src/math/x86_64/fabsl.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-long double fabsl(long double x)
-{
-	__asm__ ("fabs" : "+t"(x));
-	return x;
-}
diff --git a/src/libs/mingw.zig b/src/libs/mingw.zig
index 640ed908f5b6..59c4cd0e4aa8 100644
--- a/src/libs/mingw.zig
+++ b/src/libs/mingw.zig
@@ -574,7 +574,6 @@ const mingw32_generic_src = [_][]const u8{
     "gdtoa" ++ path.sep_str ++ "sum.c",
     "gdtoa" ++ path.sep_str ++ "ulp.c",
     "math" ++ path.sep_str ++ "coshl.c",
-    "math" ++ path.sep_str ++ "fabsl.c",
     "math" ++ path.sep_str ++ "fp_consts.c",
     "math" ++ path.sep_str ++ "fp_constsf.c",
     "math" ++ path.sep_str ++ "fp_constsl.c",
@@ -946,7 +945,6 @@ const mingw32_x86_src = [_][]const u8{
     "math" ++ path.sep_str ++ "x86" ++ path.sep_str ++ "sinl_internal.S",
     "math" ++ path.sep_str ++ "x86" ++ path.sep_str ++ "tanl.S",
     // ucrtbase
-    "math" ++ path.sep_str ++ "fabsf.c",
     "math" ++ path.sep_str ++ "nextafterl.c",
     "math" ++ path.sep_str ++ "nexttoward.c",
     "math" ++ path.sep_str ++ "nexttowardf.c",
diff --git a/src/libs/musl.zig b/src/libs/musl.zig
index 299ececaea57..e9d213b485b2 100644
--- a/src/libs/musl.zig
+++ b/src/libs/musl.zig
@@ -825,8 +825,6 @@ const src_files = [_][]const u8{
     "musl/src/malloc/replaced.c",
     "musl/src/math/aarch64/ceil.c",
     "musl/src/math/aarch64/ceilf.c",
-    "musl/src/math/aarch64/fabs.c",
-    "musl/src/math/aarch64/fabsf.c",
     "musl/src/math/aarch64/floor.c",
     "musl/src/math/aarch64/floorf.c",
     "musl/src/math/aarch64/fma.c",
@@ -859,8 +857,6 @@ const src_files = [_][]const u8{
     "musl/src/math/acoshf.c",
     "musl/src/math/acoshl.c",
     "musl/src/math/acosl.c",
-    "musl/src/math/arm/fabs.c",
-    "musl/src/math/arm/fabsf.c",
     "musl/src/math/arm/fma.c",
     "musl/src/math/arm/fmaf.c",
     "musl/src/math/arm/sqrt.c",
@@ -917,9 +913,6 @@ const src_files = [_][]const u8{
     "musl/src/math/expm1l.c",
     "musl/src/math/__expo2.c",
     "musl/src/math/__expo2f.c",
-    "musl/src/math/fabs.c",
-    "musl/src/math/fabsf.c",
-    "musl/src/math/fabsl.c",
     "musl/src/math/fdim.c",
     "musl/src/math/fdimf.c",
     "musl/src/math/fdiml.c",
@@ -968,9 +961,6 @@ const src_files = [_][]const u8{
     "musl/src/math/i386/exp_ld.s",
     "musl/src/math/i386/expl.s",
     "musl/src/math/i386/expm1l.s",
-    "musl/src/math/i386/fabs.c",
-    "musl/src/math/i386/fabsf.c",
-    "musl/src/math/i386/fabsl.c",
     "musl/src/math/i386/floorf.s",
     "musl/src/math/i386/floorl.s",
     "musl/src/math/i386/floor.s",
@@ -1083,8 +1073,6 @@ const src_files = [_][]const u8{
     "musl/src/math/__math_uflowf.c",
     "musl/src/math/__math_xflow.c",
     "musl/src/math/__math_xflowf.c",
-    "musl/src/math/mips/fabs.c",
-    "musl/src/math/mips/fabsf.c",
     "musl/src/math/mips/sqrt.c",
     "musl/src/math/mips/sqrtf.c",
     "musl/src/math/modf.c",
@@ -1107,8 +1095,6 @@ const src_files = [_][]const u8{
     "musl/src/math/pow_data.c",
     "musl/src/math/powerpc64/ceil.c",
     "musl/src/math/powerpc64/ceilf.c",
-    "musl/src/math/powerpc64/fabs.c",
-    "musl/src/math/powerpc64/fabsf.c",
     "musl/src/math/powerpc64/floor.c",
     "musl/src/math/powerpc64/floorf.c",
     "musl/src/math/powerpc64/fma.c",
@@ -1127,8 +1113,6 @@ const src_files = [_][]const u8{
     "musl/src/math/powerpc64/sqrtf.c",
     "musl/src/math/powerpc64/trunc.c",
     "musl/src/math/powerpc64/truncf.c",
-    "musl/src/math/powerpc/fabs.c",
-    "musl/src/math/powerpc/fabsf.c",
     "musl/src/math/powerpc/fma.c",
     "musl/src/math/powerpc/fmaf.c",
     "musl/src/math/powerpc/sqrt.c",
@@ -1151,8 +1135,6 @@ const src_files = [_][]const u8{
     "musl/src/math/rintl.c",
     "musl/src/math/riscv32/copysign.c",
     "musl/src/math/riscv32/copysignf.c",
-    "musl/src/math/riscv32/fabs.c",
-    "musl/src/math/riscv32/fabsf.c",
     "musl/src/math/riscv32/fma.c",
     "musl/src/math/riscv32/fmaf.c",
     "musl/src/math/riscv32/fmax.c",
@@ -1163,8 +1145,6 @@ const src_files = [_][]const u8{
     "musl/src/math/riscv32/sqrtf.c",
     "musl/src/math/riscv64/copysign.c",
     "musl/src/math/riscv64/copysignf.c",
-    "musl/src/math/riscv64/fabs.c",
-    "musl/src/math/riscv64/fabsf.c",
     "musl/src/math/riscv64/fma.c",
     "musl/src/math/riscv64/fmaf.c",
     "musl/src/math/riscv64/fmax.c",
@@ -1179,9 +1159,6 @@ const src_files = [_][]const u8{
     "musl/src/math/s390x/ceil.c",
     "musl/src/math/s390x/ceilf.c",
     "musl/src/math/s390x/ceill.c",
-    "musl/src/math/s390x/fabs.c",
-    "musl/src/math/s390x/fabsf.c",
-    "musl/src/math/s390x/fabsl.c",
     "musl/src/math/s390x/floor.c",
     "musl/src/math/s390x/floorf.c",
     "musl/src/math/s390x/floorl.c",
@@ -1255,9 +1232,6 @@ const src_files = [_][]const u8{
     "musl/src/math/x32/exp2l.s",
     "musl/src/math/x32/expl.s",
     "musl/src/math/x32/expm1l.s",
-    "musl/src/math/x32/fabsf.s",
-    "musl/src/math/x32/fabsl.s",
-    "musl/src/math/x32/fabs.s",
     "musl/src/math/x32/floorl.s",
     "musl/src/math/x32/fma.c",
     "musl/src/math/x32/fmaf.c",
@@ -1287,9 +1261,6 @@ const src_files = [_][]const u8{
     "musl/src/math/x86_64/exp2l.s",
     "musl/src/math/x86_64/expl.s",
     "musl/src/math/x86_64/expm1l.s",
-    "musl/src/math/x86_64/fabs.c",
-    "musl/src/math/x86_64/fabsf.c",
-    "musl/src/math/x86_64/fabsl.c",
     "musl/src/math/x86_64/floorl.s",
     "musl/src/math/x86_64/fma.c",
     "musl/src/math/x86_64/fmaf.c",
diff --git a/src/libs/wasi_libc.zig b/src/libs/wasi_libc.zig
index 0d1242f351b3..302a47c623d5 100644
--- a/src/libs/wasi_libc.zig
+++ b/src/libs/wasi_libc.zig
@@ -751,7 +751,6 @@ const libc_top_half_src_files = [_][]const u8{
     "musl/src/math/expm1.c",
     "musl/src/math/expm1f.c",
     "musl/src/math/expm1l.c",
-    "musl/src/math/fabsl.c",
     "musl/src/math/fdim.c",
     "musl/src/math/fdimf.c",
     "musl/src/math/fdiml.c",

From b30db238ef70d2145c461cfca2d9d6c664d41c80 Mon Sep 17 00:00:00 2001
From: David Senoner <seda18@rolmail.net>
Date: Mon, 19 May 2025 12:27:38 +0200
Subject: [PATCH 4/7] libc: export functions depending on the target libc

Previously all the functions that were exported were handled equally,
though some may exist and some not inside the same file. Moving the
checks inside the file allows handling different functions differently
---
 lib/c.zig          |  5 +++--
 lib/c/inttypes.zig | 18 +++++++++++++++++-
 lib/c/stdlib.zig   | 22 +++++++++++++++++++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/lib/c.zig b/lib/c.zig
index 7168c16632a0..dec072e4092a 100644
--- a/lib/c.zig
+++ b/lib/c.zig
@@ -14,10 +14,11 @@ else
     std.debug.no_panic;
 
 comptime {
+    _ = @import("c/inttypes.zig");
+    _ = @import("c/stdlib.zig");
+
     if (builtin.target.isMuslLibC() or builtin.target.isWasiLibC()) {
         // Files specific to musl and wasi-libc.
-        _ = @import("c/inttypes.zig");
-        _ = @import("c/stdlib.zig");
         _ = @import("c/string.zig");
         _ = @import("c/strings.zig");
     }
diff --git a/lib/c/inttypes.zig b/lib/c/inttypes.zig
index db207f03c5f8..1c51baf762c9 100644
--- a/lib/c/inttypes.zig
+++ b/lib/c/inttypes.zig
@@ -1,9 +1,25 @@
 const std = @import("std");
 const common = @import("common.zig");
+const builtin = @import("builtin");
 const intmax_t = std.c.intmax_t;
 
 comptime {
-    @export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
+    if (builtin.target.isMuslLibC() or builtin.target.isWasiLibC()) {
+        // Functions specific to musl and wasi-libc.
+        @export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
+    }
+
+    if (builtin.target.isMuslLibC()) {
+        // Functions specific to musl.
+    }
+
+    if (builtin.target.isWasiLibC()) {
+        // Functions specific to wasi-libc.
+    }
+
+    if (builtin.target.isMinGW()) {
+        // Functions specific to MinGW-w64.
+    }
 }
 
 fn imaxabs(a: intmax_t) callconv(.c) intmax_t {
diff --git a/lib/c/stdlib.zig b/lib/c/stdlib.zig
index 9e5341ec5adb..99bddd64768b 100644
--- a/lib/c/stdlib.zig
+++ b/lib/c/stdlib.zig
@@ -1,10 +1,26 @@
 const std = @import("std");
 const common = @import("common.zig");
+const builtin = @import("builtin");
 
 comptime {
-    @export(&abs, .{ .name = "abs", .linkage = common.linkage, .visibility = common.visibility });
-    @export(&labs, .{ .name = "labs", .linkage = common.linkage, .visibility = common.visibility });
-    @export(&llabs, .{ .name = "llabs", .linkage = common.linkage, .visibility = common.visibility });
+    if (builtin.target.isMuslLibC() or builtin.target.isWasiLibC()) {
+        // Functions specific to musl and wasi-libc.
+        @export(&abs, .{ .name = "abs", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&labs, .{ .name = "labs", .linkage = common.linkage, .visibility = common.visibility });
+        @export(&llabs, .{ .name = "llabs", .linkage = common.linkage, .visibility = common.visibility });
+    }
+
+    if (builtin.target.isMuslLibC()) {
+        // Functions specific to musl.
+    }
+
+    if (builtin.target.isWasiLibC()) {
+        // Functions specific to wasi-libc.
+    }
+
+    if (builtin.target.isMinGW()) {
+        // Functions specific to MinGW-w64.
+    }
 }
 
 fn abs(a: c_int) callconv(.c) c_int {

From d682fa567226a3208f24c8ea8177141cf66ddd17 Mon Sep 17 00:00:00 2001
From: David <seda18@rolmail.net>
Date: Mon, 19 May 2025 21:14:39 +0200
Subject: [PATCH 5/7] remove empty ifs in inttypes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alex Rønne Petersen <alex@alexrp.com>
---
 lib/c/inttypes.zig | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/c/inttypes.zig b/lib/c/inttypes.zig
index 1c51baf762c9..b00e596a13e7 100644
--- a/lib/c/inttypes.zig
+++ b/lib/c/inttypes.zig
@@ -8,18 +8,6 @@ comptime {
         // Functions specific to musl and wasi-libc.
         @export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
     }
-
-    if (builtin.target.isMuslLibC()) {
-        // Functions specific to musl.
-    }
-
-    if (builtin.target.isWasiLibC()) {
-        // Functions specific to wasi-libc.
-    }
-
-    if (builtin.target.isMinGW()) {
-        // Functions specific to MinGW-w64.
-    }
 }
 
 fn imaxabs(a: intmax_t) callconv(.c) intmax_t {

From c9a33d417ec6f9b6ff86ed25aa0a51fe680451dc Mon Sep 17 00:00:00 2001
From: David <seda18@rolmail.net>
Date: Mon, 19 May 2025 21:14:51 +0200
Subject: [PATCH 6/7] remove empty ifs in stdlib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alex Rønne Petersen <alex@alexrp.com>
---
 lib/c/stdlib.zig | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/c/stdlib.zig b/lib/c/stdlib.zig
index 99bddd64768b..fb1910da3917 100644
--- a/lib/c/stdlib.zig
+++ b/lib/c/stdlib.zig
@@ -9,18 +9,6 @@ comptime {
         @export(&labs, .{ .name = "labs", .linkage = common.linkage, .visibility = common.visibility });
         @export(&llabs, .{ .name = "llabs", .linkage = common.linkage, .visibility = common.visibility });
     }
-
-    if (builtin.target.isMuslLibC()) {
-        // Functions specific to musl.
-    }
-
-    if (builtin.target.isWasiLibC()) {
-        // Functions specific to wasi-libc.
-    }
-
-    if (builtin.target.isMinGW()) {
-        // Functions specific to MinGW-w64.
-    }
 }
 
 fn abs(a: c_int) callconv(.c) c_int {

From 18a2714fda05cbc42c0fae3badda9900a6b83dc4 Mon Sep 17 00:00:00 2001
From: David Senoner <seda18@rolmail.net>
Date: Tue, 20 May 2025 08:31:01 +0200
Subject: [PATCH 7/7] libc: use `@abs` for the absolute value calculation

---
 lib/c/inttypes.zig |  7 ++++++-
 lib/c/stdlib.zig   | 21 ++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/c/inttypes.zig b/lib/c/inttypes.zig
index b00e596a13e7..34de671d0cfe 100644
--- a/lib/c/inttypes.zig
+++ b/lib/c/inttypes.zig
@@ -11,5 +11,10 @@ comptime {
 }
 
 fn imaxabs(a: intmax_t) callconv(.c) intmax_t {
-    return if (a > 0) a else -a;
+    return @intCast(@abs(a));
+}
+
+test imaxabs {
+    const val: intmax_t = -10;
+    try std.testing.expectEqual(10, imaxabs(val));
 }
diff --git a/lib/c/stdlib.zig b/lib/c/stdlib.zig
index fb1910da3917..e427771640d0 100644
--- a/lib/c/stdlib.zig
+++ b/lib/c/stdlib.zig
@@ -12,13 +12,28 @@ comptime {
 }
 
 fn abs(a: c_int) callconv(.c) c_int {
-    return if (a > 0) a else -a;
+    return @intCast(@abs(a));
 }
 
 fn labs(a: c_long) callconv(.c) c_long {
-    return if (a > 0) a else -a;
+    return @intCast(@abs(a));
 }
 
 fn llabs(a: c_longlong) callconv(.c) c_longlong {
-    return if (a > 0) a else -a;
+    return @intCast(@abs(a));
+}
+
+test abs {
+    const val: c_int = -10;
+    try std.testing.expectEqual(10, abs(val));
+}
+
+test labs {
+    const val: c_long = -10;
+    try std.testing.expectEqual(10, labs(val));
+}
+
+test llabs {
+    const val: c_longlong = -10;
+    try std.testing.expectEqual(10, llabs(val));
 }