--- mingw-w64-crt/lib-common/msvcrt.def.in.orig	2023-10-01 18:43:09.652692600 +0100
+++ mingw-w64-crt/lib-common/msvcrt.def.in	2023-10-04 18:18:31.151504154 +0100
@@ -1037,16 +1037,16 @@
 _strtime
 ; _strtime_s replaced by emu
 _strtod_l
-_strtoi64
-strtoll == _strtoi64
-strtoimax == _strtoi64
+F_NON_I386(_strtoi64)
+F_NON_I386(strtoll == _strtoi64)
+F_NON_I386(strtoimax == _strtoi64)
 _strtoi64_l
 _strtoll_l == _strtoi64_l
 _strtoimax_l == _strtoi64_l
 _strtol_l
-_strtoui64
-strtoull == _strtoui64
-strtoumax == _strtoui64
+F_NON_I386(_strtoui64)
+F_NON_I386(strtoull == _strtoui64)
+F_NON_I386(strtoumax == _strtoui64)
 _strtoui64_l
 _strtoull_l == _strtoui64_l
 _strtoumax_l == _strtoui64_l
--- mingw-w64-crt/Makefile.am.orig	2023-10-01 18:43:09.652692600 +0100
+++ mingw-w64-crt/Makefile.am	2023-10-04 18:11:11.721505738 +0100
@@ -292,6 +292,8 @@
   misc/imaxabs.c \
   misc/lc_locale_func.c \
   misc/seterrno.c \
+  misc/strtoimax.c \
+  misc/strtoumax.c \
   misc/wassert.c \
   stdio/_scprintf.c \
   stdio/_vscprintf.c