From 55848363fd5c88bd6313880e770515a9c548c0df Mon Sep 17 00:00:00 2001
From: David <seda18@rolmail.net>
Date: Wed, 21 May 2025 00:57:38 +0200
Subject: [PATCH] libc: implement common `abs` for various integer sizes
 (#23893)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* libc: implement common `abs` for various integer sizes

* libc: move imaxabs to inttypes.zig and don't use cInclude

* libc: delete `fabs` c implementations because already implemented in compiler_rt

* 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

* remove empty ifs in inttypes

Co-authored-by: Alex Rønne Petersen <alex@alexrp.com>

* remove empty ifs in stdlib

Co-authored-by: Alex Rønne Petersen <alex@alexrp.com>

* libc: use `@abs` for the absolute value calculation

---------

Co-authored-by: Alex Rønne Petersen <alex@alexrp.com>
---
 lib/c.zig                                |  3 ++
 lib/c/inttypes.zig                       | 20 ++++++++++++
 lib/c/stdlib.zig                         | 39 ++++++++++++++++++++++++
 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 -----
 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 ----
 lib/std/c.zig                            |  3 ++
 src/libs/mingw.zig                       |  2 --
 src/libs/musl.zig                        | 33 --------------------
 src/libs/wasi_libc.zig                   |  5 ---
 42 files changed, 65 insertions(+), 428 deletions(-)
 create mode 100644 lib/c/inttypes.zig
 create mode 100644 lib/c/stdlib.zig
 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
 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 39684264ce28f317bd7c4516ce09df89eea70961..dec072e4092a5433e1d7aef825d39685df3deeb8 100644
--- a/lib/c.zig
+++ b/lib/c.zig
@@ -14,6 +14,9 @@ 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/string.zig");
diff --git a/lib/c/inttypes.zig b/lib/c/inttypes.zig
new file mode 100644
index 0000000000000000000000000000000000000000..34de671d0cfe96a046b120ee0dc8f9f9ac7442dd
--- /dev/null
+++ b/lib/c/inttypes.zig
@@ -0,0 +1,20 @@
+const std = @import("std");
+const common = @import("common.zig");
+const builtin = @import("builtin");
+const intmax_t = std.c.intmax_t;
+
+comptime {
+    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 });
+    }
+}
+
+fn imaxabs(a: intmax_t) callconv(.c) intmax_t {
+    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
new file mode 100644
index 0000000000000000000000000000000000000000..e427771640d00d96c7799d408378ca6a3ddaa811
--- /dev/null
+++ b/lib/c/stdlib.zig
@@ -0,0 +1,39 @@
+const std = @import("std");
+const common = @import("common.zig");
+const builtin = @import("builtin");
+
+comptime {
+    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 });
+    }
+}
+
+fn abs(a: c_int) callconv(.c) c_int {
+    return @intCast(@abs(a));
+}
+
+fn labs(a: c_long) callconv(.c) c_long {
+    return @intCast(@abs(a));
+}
+
+fn llabs(a: c_longlong) callconv(.c) c_longlong {
+    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));
+}
diff --git a/lib/libc/mingw/math/fabsf.c b/lib/libc/mingw/math/fabsf.c
deleted file mode 100644
index e7e9d8fa7ae816ebfe47a26ac58ba779ef70a0cd..0000000000000000000000000000000000000000
--- 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 1df48cfa9c715e4244022be65b43fd54d23934b7..0000000000000000000000000000000000000000
--- 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 5c3ecaf44b1d53718cbeb2ca21aec1fa4b65694a..0000000000000000000000000000000000000000
--- 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 7fde9817931cb55803607b96e06e96d6ab6ff415..0000000000000000000000000000000000000000
--- 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 6e1d367d3d6ad580798b3fb19ce6f8a070cf65e3..0000000000000000000000000000000000000000
--- 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 4a217c98899d579831ba7d0e32036568fd09171e..0000000000000000000000000000000000000000
--- 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 e8258cfdbcf1a751621a69bac02f0f0f9b22b1cf..0000000000000000000000000000000000000000
--- 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 4efc8d686dcc49e9c4d1c1af5159f042bf5a90d5..0000000000000000000000000000000000000000
--- 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 c4f36ec2810ce50a7f7129800fbaf6f398139f5f..0000000000000000000000000000000000000000
--- 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 39672786395ffbbda7f34c12b7fb27c2d225fb07..0000000000000000000000000000000000000000
--- 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 d882eee3490437369e4b242562e2a4606285707a..0000000000000000000000000000000000000000
--- 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 cc1c9ed9c73ff1d555accc5d1df2db2a146ad08b..0000000000000000000000000000000000000000
--- 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 0a5aa3b1d4ccb2a3405102ff2d85b479cd4a5010..0000000000000000000000000000000000000000
--- 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 35307be6abae62c3d39a4d9e6ac564bb12e0d071..0000000000000000000000000000000000000000
--- 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 9453a3aa981ffcc70343a355a41a758fe3070b1d..0000000000000000000000000000000000000000
--- 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 2e9da588dd65bed4f08e8a70cef491feb41b6d3a..0000000000000000000000000000000000000000
--- 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 6123c7535c6d6726cc0cbf311c57521b6900cdd5..0000000000000000000000000000000000000000
--- 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 e9e45643d28eba3f37b4d69c37061d1066ab0561..0000000000000000000000000000000000000000
--- 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 5290b6f093fd0f60ba353e4f69c7c2fe93c57bba..0000000000000000000000000000000000000000
--- 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 f5032e354d59aaf1d24036cd8b75b30494b7c947..0000000000000000000000000000000000000000
--- 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 5290b6f093fd0f60ba353e4f69c7c2fe93c57bba..0000000000000000000000000000000000000000
--- 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 f5032e354d59aaf1d24036cd8b75b30494b7c947..0000000000000000000000000000000000000000
--- 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 9bb51cb5ffa523c7510d77d7c9d7de8d269f853b..0000000000000000000000000000000000000000
--- 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 9fd96bc9d2aab5d7e6c56050d047f7cbf6f1a5f0..0000000000000000000000000000000000000000
--- 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 65f1005d4e9363ac41225b1e275a9611df0df084..0000000000000000000000000000000000000000
--- 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 5715005e330a64afd209121f36a8b70e51200913..0000000000000000000000000000000000000000
--- 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 501a1f17550a7ea040bcb1460ebeb3e03598c735..0000000000000000000000000000000000000000
--- 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 4f215df5c63739204c0e227e09971075ace8c063..0000000000000000000000000000000000000000
--- 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 1656247770f778aba56e0620adbc3e8241a3e8ea..0000000000000000000000000000000000000000
--- 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 36ea7481fc402a55075c59b9cbac36b6714712da..0000000000000000000000000000000000000000
--- 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 cc1c9ed9c73ff1d555accc5d1df2db2a146ad08b..0000000000000000000000000000000000000000
--- 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/lib/libc/musl/src/stdlib/abs.c b/lib/libc/musl/src/stdlib/abs.c
deleted file mode 100644
index e721fdc2b17e7917430eca885297b6e2d47986a1..0000000000000000000000000000000000000000
--- 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 8100181930e62701d1e8794b5d845980b762ceb0..0000000000000000000000000000000000000000
--- 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 83ddb1475c2df6ec9abdaece8a0031e0f24c7487..0000000000000000000000000000000000000000
--- 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 9dfaf5cf766d29bb950876339f3836ee31311416..0000000000000000000000000000000000000000
--- 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/lib/std/c.zig b/lib/std/c.zig
index e61c8990c3e78996bc5167b035273ef85cc023b0..1cfd44107247ab2ef987528fe2a960f0cf388c18 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;
diff --git a/src/libs/mingw.zig b/src/libs/mingw.zig
index 640ed908f5b6b8288fc523473a4c9f819169c7b1..59c4cd0e4aa81a805c60ca423eb2f9ab6a1178d8 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 4ae86f0214c3a0a784509918bd6b07a521cb0a1b..e9d213b485b27a37ac679a94003cd90562e6b0d1 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",
@@ -1809,7 +1780,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 +1789,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 f718f397937c924bdc61d902d75e019439bfe0ed..302a47c623d5c671bce77b0bf1edf3b531d95649 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",
@@ -1024,7 +1023,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 +1032,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",
-- 
2.54.0