ntdllcrt: Use separated import library for ntdll.dll C runtime exports.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 0d10b17..2e942e0 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -7347,16 +7347,17 @@
 @LIB32_TRUE@	lib32/libndis.a lib32/libnetapi32.a \
 @LIB32_TRUE@	lib32/libnetjoin.a lib32/libnetutils.a \
 @LIB32_TRUE@	lib32/libnewdev.a lib32/libnormaliz.a \
-@LIB32_TRUE@	lib32/libntdll.a lib32/libntdsapi.a \
-@LIB32_TRUE@	lib32/libntmsapi.a lib32/libntoskrnl.a \
-@LIB32_TRUE@	lib32/libodbc32.a lib32/libodbccp32.a \
-@LIB32_TRUE@	lib32/libole32.a lib32/liboleacc.a \
-@LIB32_TRUE@	lib32/liboleaut32.a lib32/libolecli32.a \
-@LIB32_TRUE@	lib32/liboledlg.a lib32/libolepro32.a \
-@LIB32_TRUE@	lib32/libolesvr32.a lib32/libolethk32.a \
-@LIB32_TRUE@	lib32/libopengl32.a lib32/libp2p.a \
-@LIB32_TRUE@	lib32/libp2pcollab.a lib32/libp2pgraph.a \
-@LIB32_TRUE@	lib32/libpcwum.a lib32/libpdh.a lib32/libpdhui.a \
+@LIB32_TRUE@	lib32/libntdll.a lib32/libntdllcrt.a \
+@LIB32_TRUE@	lib32/libntdsapi.a lib32/libntmsapi.a \
+@LIB32_TRUE@	lib32/libntoskrnl.a lib32/libodbc32.a \
+@LIB32_TRUE@	lib32/libodbccp32.a lib32/libole32.a \
+@LIB32_TRUE@	lib32/liboleacc.a lib32/liboleaut32.a \
+@LIB32_TRUE@	lib32/libolecli32.a lib32/liboledlg.a \
+@LIB32_TRUE@	lib32/libolepro32.a lib32/libolesvr32.a \
+@LIB32_TRUE@	lib32/libolethk32.a lib32/libopengl32.a \
+@LIB32_TRUE@	lib32/libp2p.a lib32/libp2pcollab.a \
+@LIB32_TRUE@	lib32/libp2pgraph.a lib32/libpcwum.a \
+@LIB32_TRUE@	lib32/libpdh.a lib32/libpdhui.a \
 @LIB32_TRUE@	lib32/libpenwin32.a lib32/libpkpd32.a \
 @LIB32_TRUE@	lib32/libpowrprof.a lib32/libpsapi.a \
 @LIB32_TRUE@	lib32/libquartz.a lib32/libqutil.a \
@@ -7783,54 +7784,54 @@
 @LIB64_TRUE@	lib64/libnetui1.a lib64/libnetui2.a \
 @LIB64_TRUE@	lib64/libnewdev.a lib64/libnntpapi.a \
 @LIB64_TRUE@	lib64/libnpptools.a lib64/libnshipsec.a \
-@LIB64_TRUE@	lib64/libntdll.a lib64/libntdsapi.a \
-@LIB64_TRUE@	lib64/libntdsbcli.a lib64/libntlanman.a \
-@LIB64_TRUE@	lib64/libntlanui.a lib64/libntlsapi.a \
-@LIB64_TRUE@	lib64/libntmarta.a lib64/libntmsapi.a \
-@LIB64_TRUE@	lib64/libntoc.a lib64/libntprint.a \
-@LIB64_TRUE@	lib64/libntshrui.a lib64/libntvdm64.a \
-@LIB64_TRUE@	lib64/libnwprovau.a lib64/liboakley.a \
-@LIB64_TRUE@	lib64/liboccache.a lib64/libocgen.a \
-@LIB64_TRUE@	lib64/libocmanage.a lib64/libocmsn.a \
-@LIB64_TRUE@	lib64/libodbc32.a lib64/libodbc32gt.a \
-@LIB64_TRUE@	lib64/libodbcbcp.a lib64/libodbcconf.a \
-@LIB64_TRUE@	lib64/libodbccp32.a lib64/libodbccr32.a \
-@LIB64_TRUE@	lib64/libodbccu32.a lib64/libodbctrac.a \
-@LIB64_TRUE@	lib64/liboeimport.a lib64/liboemiglib.a \
-@LIB64_TRUE@	lib64/libole32.a lib64/liboleacc.a \
-@LIB64_TRUE@	lib64/liboleaut32.a lib64/libolecli32.a \
-@LIB64_TRUE@	lib64/libolecnv32.a lib64/liboledb32.a \
-@LIB64_TRUE@	lib64/liboledlg.a lib64/libolesvr32.a \
-@LIB64_TRUE@	lib64/libopengl32.a lib64/libosuninst.a \
-@LIB64_TRUE@	lib64/libpautoenr.a lib64/libpdh.a \
-@LIB64_TRUE@	lib64/libperfctrs.a lib64/libperfdisk.a \
-@LIB64_TRUE@	lib64/libperfnet.a lib64/libperfos.a \
-@LIB64_TRUE@	lib64/libperfproc.a lib64/libperfts.a \
-@LIB64_TRUE@	lib64/libphotowiz.a lib64/libpidgen.a \
-@LIB64_TRUE@	lib64/libpintlcsd.a lib64/libpolicman.a \
-@LIB64_TRUE@	lib64/libpolstore.a lib64/libpowrprof.a \
-@LIB64_TRUE@	lib64/libprintui.a lib64/libprofmap.a \
-@LIB64_TRUE@	lib64/libPS5UI.a lib64/libpsapi.a \
-@LIB64_TRUE@	lib64/libpsbase.a lib64/libpschdprf.a \
-@LIB64_TRUE@	lib64/libPSCRIPT5.a lib64/libpstorec.a \
-@LIB64_TRUE@	lib64/libpstorsvc.a lib64/libqmgr.a \
-@LIB64_TRUE@	lib64/libqosname.a lib64/libquartz.a \
-@LIB64_TRUE@	lib64/libquery.a lib64/librasadhlp.a \
-@LIB64_TRUE@	lib64/librasapi32.a lib64/librasauto.a \
-@LIB64_TRUE@	lib64/libraschap.a lib64/librasctrs.a \
-@LIB64_TRUE@	lib64/librasdlg.a lib64/librasman.a \
-@LIB64_TRUE@	lib64/librasmans.a lib64/librasmontr.a \
-@LIB64_TRUE@	lib64/librasmxs.a lib64/librasppp.a \
-@LIB64_TRUE@	lib64/librasrad.a lib64/librassapi.a \
-@LIB64_TRUE@	lib64/librasser.a lib64/librastapi.a \
-@LIB64_TRUE@	lib64/librastls.a lib64/librdpcfgex.a \
-@LIB64_TRUE@	lib64/librdpsnd.a lib64/librdpwsx.a \
-@LIB64_TRUE@	lib64/libregapi.a lib64/libregsvc.a \
-@LIB64_TRUE@	lib64/libresutils.a lib64/libriched20.a \
-@LIB64_TRUE@	lib64/librnr20.a lib64/libroutetab.a \
-@LIB64_TRUE@	lib64/librpcns4.a lib64/librpcref.a \
-@LIB64_TRUE@	lib64/librpcrt4.a lib64/librpcss.a \
-@LIB64_TRUE@	lib64/librsaenh.a lib64/librtm.a \
+@LIB64_TRUE@	lib64/libntdll.a lib64/libntdllcrt.a \
+@LIB64_TRUE@	lib64/libntdsapi.a lib64/libntdsbcli.a \
+@LIB64_TRUE@	lib64/libntlanman.a lib64/libntlanui.a \
+@LIB64_TRUE@	lib64/libntlsapi.a lib64/libntmarta.a \
+@LIB64_TRUE@	lib64/libntmsapi.a lib64/libntoc.a \
+@LIB64_TRUE@	lib64/libntprint.a lib64/libntshrui.a \
+@LIB64_TRUE@	lib64/libntvdm64.a lib64/libnwprovau.a \
+@LIB64_TRUE@	lib64/liboakley.a lib64/liboccache.a \
+@LIB64_TRUE@	lib64/libocgen.a lib64/libocmanage.a \
+@LIB64_TRUE@	lib64/libocmsn.a lib64/libodbc32.a \
+@LIB64_TRUE@	lib64/libodbc32gt.a lib64/libodbcbcp.a \
+@LIB64_TRUE@	lib64/libodbcconf.a lib64/libodbccp32.a \
+@LIB64_TRUE@	lib64/libodbccr32.a lib64/libodbccu32.a \
+@LIB64_TRUE@	lib64/libodbctrac.a lib64/liboeimport.a \
+@LIB64_TRUE@	lib64/liboemiglib.a lib64/libole32.a \
+@LIB64_TRUE@	lib64/liboleacc.a lib64/liboleaut32.a \
+@LIB64_TRUE@	lib64/libolecli32.a lib64/libolecnv32.a \
+@LIB64_TRUE@	lib64/liboledb32.a lib64/liboledlg.a \
+@LIB64_TRUE@	lib64/libolesvr32.a lib64/libopengl32.a \
+@LIB64_TRUE@	lib64/libosuninst.a lib64/libpautoenr.a \
+@LIB64_TRUE@	lib64/libpdh.a lib64/libperfctrs.a \
+@LIB64_TRUE@	lib64/libperfdisk.a lib64/libperfnet.a \
+@LIB64_TRUE@	lib64/libperfos.a lib64/libperfproc.a \
+@LIB64_TRUE@	lib64/libperfts.a lib64/libphotowiz.a \
+@LIB64_TRUE@	lib64/libpidgen.a lib64/libpintlcsd.a \
+@LIB64_TRUE@	lib64/libpolicman.a lib64/libpolstore.a \
+@LIB64_TRUE@	lib64/libpowrprof.a lib64/libprintui.a \
+@LIB64_TRUE@	lib64/libprofmap.a lib64/libPS5UI.a \
+@LIB64_TRUE@	lib64/libpsapi.a lib64/libpsbase.a \
+@LIB64_TRUE@	lib64/libpschdprf.a lib64/libPSCRIPT5.a \
+@LIB64_TRUE@	lib64/libpstorec.a lib64/libpstorsvc.a \
+@LIB64_TRUE@	lib64/libqmgr.a lib64/libqosname.a \
+@LIB64_TRUE@	lib64/libquartz.a lib64/libquery.a \
+@LIB64_TRUE@	lib64/librasadhlp.a lib64/librasapi32.a \
+@LIB64_TRUE@	lib64/librasauto.a lib64/libraschap.a \
+@LIB64_TRUE@	lib64/librasctrs.a lib64/librasdlg.a \
+@LIB64_TRUE@	lib64/librasman.a lib64/librasmans.a \
+@LIB64_TRUE@	lib64/librasmontr.a lib64/librasmxs.a \
+@LIB64_TRUE@	lib64/librasppp.a lib64/librasrad.a \
+@LIB64_TRUE@	lib64/librassapi.a lib64/librasser.a \
+@LIB64_TRUE@	lib64/librastapi.a lib64/librastls.a \
+@LIB64_TRUE@	lib64/librdpcfgex.a lib64/librdpsnd.a \
+@LIB64_TRUE@	lib64/librdpwsx.a lib64/libregapi.a \
+@LIB64_TRUE@	lib64/libregsvc.a lib64/libresutils.a \
+@LIB64_TRUE@	lib64/libriched20.a lib64/librnr20.a \
+@LIB64_TRUE@	lib64/libroutetab.a lib64/librpcns4.a \
+@LIB64_TRUE@	lib64/librpcref.a lib64/librpcrt4.a \
+@LIB64_TRUE@	lib64/librpcss.a lib64/librsaenh.a lib64/librtm.a \
 @LIB64_TRUE@	lib64/librtutils.a lib64/libsamlib.a \
 @LIB64_TRUE@	lib64/libsamsrv.a lib64/libsapi.a \
 @LIB64_TRUE@	lib64/libscarddlg.a lib64/libsccbase.a \
@@ -8432,9 +8433,10 @@
 @LIBARM32_TRUE@	libarm32/libnormaliz.a libarm32/libnrpsrv.a \
 @LIBARM32_TRUE@	libarm32/libnshwfp.a libarm32/libnsi.a \
 @LIBARM32_TRUE@	libarm32/libnsisvc.a libarm32/libntdll.a \
-@LIBARM32_TRUE@	libarm32/libntdsapi.a libarm32/libntlanman.a \
-@LIBARM32_TRUE@	libarm32/libntmarta.a libarm32/libntoskrnl.a \
-@LIBARM32_TRUE@	libarm32/libntprint.a libarm32/libntshrui.a \
+@LIBARM32_TRUE@	libarm32/libntdllcrt.a libarm32/libntdsapi.a \
+@LIBARM32_TRUE@	libarm32/libntlanman.a libarm32/libntmarta.a \
+@LIBARM32_TRUE@	libarm32/libntoskrnl.a libarm32/libntprint.a \
+@LIBARM32_TRUE@	libarm32/libntshrui.a \
 @LIBARM32_TRUE@	libarm32/libnvcameraispb.a \
 @LIBARM32_TRUE@	libarm32/libnvcameraisp.a libarm32/libnvd3dum.a \
 @LIBARM32_TRUE@	libarm32/libnvencodeapi.a libarm32/liboccache.a \
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index 169e986..203d09d 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -191,6 +191,7 @@
 lib32_DATA += %reldir%/libnewdev.a
 lib32_DATA += %reldir%/libnormaliz.a
 lib32_DATA += %reldir%/libntdll.a
+lib32_DATA += %reldir%/libntdllcrt.a
 lib32_DATA += %reldir%/libntdsapi.a
 lib32_DATA += %reldir%/libntmsapi.a
 lib32_DATA += %reldir%/libntoskrnl.a
diff --git a/mingw-w64-crt/lib32/ntdll.def b/mingw-w64-crt/lib32/ntdll.def
index d6837b1..072c46d 100644
--- a/mingw-w64-crt/lib32/ntdll.def
+++ b/mingw-w64-crt/lib32/ntdll.def
@@ -1895,188 +1895,3 @@
 ZwWriteRequestData@24
 ZwWriteVirtualMemory@20
 ZwYieldExecution@0
-_CIcos
-_CIlog
-_CIpow
-_CIsin
-_CIsqrt
-__isascii
-__iscsym
-__iscsymf
-__toascii
-_alldiv
-_alldvrm@16
-_allmul@16
-_alloca_probe
-_alloca_probe_16
-_alloca_probe_8
-_allrem@16
-_allshl
-_allshr
-_atoi64
-_aulldiv@16
-_aulldvrm@16
-_aullrem@16
-_aullshr
-;_chkstk
-_fltused DATA
-_ftol
-_i64toa
-_i64toa_s
-_i64tow
-_i64tow_s
-_itoa
-_itoa_s
-_itow
-_itow_s
-_lfind
-_ltoa
-_ltoa_s
-_ltow
-_ltow_s
-_makepath_s
-_memccpy
-_memicmp
-_snprintf
-_snprintf_s
-_snscanf_s
-_snwprintf
-_snwprintf_s
-_snwscanf_s
-_splitpath
-_splitpath_s
-_strcmpi
-_stricmp
-_strlwr
-_strnicmp
-_strnset_s
-_strset_s
-_strupr
-_swprintf
-_tolower
-_toupper
-_ui64toa
-_ui64toa_s
-_ui64tow
-_ui64tow_s
-_ultoa
-_ultoa_s
-_ultow
-_ultow_s
-_vscwprintf
-_vsnprintf
-_vsnprintf_s
-_vsnwprintf
-_vsnwprintf_s
-_vswprintf
-_wcsicmp
-_wcslwr
-_wcsnicmp
-_wcsnset_s
-_wcsset_s
-_wcstoui64
-_wcsupr
-_wmakepath_s
-_wsplitpath_s
-_wtoi
-_wtoi64
-_wtol
-abs
-atan DATA
-atoi
-atol
-bsearch
-ceil
-cos DATA
-fabs DATA
-floor DATA
-isalnum
-isalpha
-iscntrl
-isdigit
-isgraph
-islower
-isprint
-ispunct
-isspace
-isupper
-iswalpha
-iswctype
-iswdigit
-iswlower
-iswspace
-iswxdigit
-isxdigit
-labs
-log
-mbstowcs
-memchr
-memcmp
-memcpy
-memcpy_s
-memmove
-memmove_s
-memset
-pow
-qsort
-sin
-sprintf
-sprintf_s
-sqrt
-sscanf
-sscanf_s
-strcat
-strcat_s
-strchr
-strcmp
-strcpy
-strcpy_s
-strcspn
-strlen
-strncat
-strncat_s
-strncmp
-strncpy
-strncpy_s
-strnlen
-strpbrk
-strrchr
-strspn
-strstr
-strtok_s
-strtol
-strtoul
-swprintf
-swprintf_s
-swscanf_s
-tan
-tolower
-toupper
-towlower
-towupper
-vDbgPrintEx@16
-vDbgPrintExWithPrefix@20
-vsprintf
-vsprintf_s
-vswprintf_s
-wcscat
-wcscat_s
-wcschr
-wcscmp
-wcscpy
-wcscpy_s
-wcscspn
-wcslen
-wcsncat
-wcsncat_s
-wcsncmp
-wcsncpy
-wcsncpy_s
-wcsnlen
-wcspbrk
-wcsrchr
-wcsspn
-wcsstr
-wcstol
-wcstombs
-wcstoul
diff --git a/mingw-w64-crt/lib32/ntdllcrt.def b/mingw-w64-crt/lib32/ntdllcrt.def
new file mode 100644
index 0000000..c7c6e8d
--- /dev/null
+++ b/mingw-w64-crt/lib32/ntdllcrt.def
@@ -0,0 +1,192 @@
+;
+; Definition file of ntdll.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "ntdll.dll"
+EXPORTS
+_CIcos
+_CIlog
+_CIpow
+_CIsin
+_CIsqrt
+__isascii
+__iscsym
+__iscsymf
+__toascii
+_alldiv
+_alldvrm@16
+_allmul@16
+_alloca_probe
+_alloca_probe_16
+_alloca_probe_8
+_allrem@16
+_allshl
+_allshr
+_atoi64
+_aulldiv@16
+_aulldvrm@16
+_aullrem@16
+_aullshr
+;_chkstk
+_fltused DATA
+_ftol
+_i64toa
+_i64toa_s
+_i64tow
+_i64tow_s
+_itoa
+_itoa_s
+_itow
+_itow_s
+_lfind
+_ltoa
+_ltoa_s
+_ltow
+_ltow_s
+_makepath_s
+_memccpy
+_memicmp
+_snprintf
+_snprintf_s
+_snscanf_s
+_snwprintf
+_snwprintf_s
+_snwscanf_s
+_splitpath
+_splitpath_s
+_strcmpi
+_stricmp
+_strlwr
+_strnicmp
+_strnset_s
+_strset_s
+_strupr
+_swprintf
+_tolower
+_toupper
+_ui64toa
+_ui64toa_s
+_ui64tow
+_ui64tow_s
+_ultoa
+_ultoa_s
+_ultow
+_ultow_s
+_vscwprintf
+_vsnprintf
+_vsnprintf_s
+_vsnwprintf
+_vsnwprintf_s
+_vswprintf
+_wcsicmp
+_wcslwr
+_wcsnicmp
+_wcsnset_s
+_wcsset_s
+_wcstoui64
+_wcsupr
+_wmakepath_s
+_wsplitpath_s
+_wtoi
+_wtoi64
+_wtol
+abs
+atan DATA
+atoi
+atol
+bsearch
+ceil
+cos DATA
+fabs DATA
+floor DATA
+isalnum
+isalpha
+iscntrl
+isdigit
+isgraph
+islower
+isprint
+ispunct
+isspace
+isupper
+iswalpha
+iswctype
+iswdigit
+iswlower
+iswspace
+iswxdigit
+isxdigit
+labs
+log
+mbstowcs
+memchr
+memcmp
+memcpy
+memcpy_s
+memmove
+memmove_s
+memset
+pow
+qsort
+sin
+sprintf
+sprintf_s
+sqrt
+sscanf
+sscanf_s
+strcat
+strcat_s
+strchr
+strcmp
+strcpy
+strcpy_s
+strcspn
+strlen
+strncat
+strncat_s
+strncmp
+strncpy
+strncpy_s
+strnlen
+strpbrk
+strrchr
+strspn
+strstr
+strtok_s
+strtol
+strtoul
+swprintf
+swprintf_s
+swscanf_s
+tan
+tolower
+toupper
+towlower
+towupper
+vDbgPrintEx@16
+vDbgPrintExWithPrefix@20
+vsprintf
+vsprintf_s
+vswprintf_s
+wcscat
+wcscat_s
+wcschr
+wcscmp
+wcscpy
+wcscpy_s
+wcscspn
+wcslen
+wcsncat
+wcsncat_s
+wcsncmp
+wcsncpy
+wcsncpy_s
+wcsnlen
+wcspbrk
+wcsrchr
+wcsspn
+wcsstr
+wcstol
+wcstombs
+wcstoul
diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am
index 1d5cee5..f888ed5 100644
--- a/mingw-w64-crt/lib64/Makefile.am
+++ b/mingw-w64-crt/lib64/Makefile.am
@@ -390,6 +390,7 @@
 lib64_DATA += %reldir%/libnpptools.a
 lib64_DATA += %reldir%/libnshipsec.a
 lib64_DATA += %reldir%/libntdll.a
+lib64_DATA += %reldir%/libntdllcrt.a
 lib64_DATA += %reldir%/libntdsapi.a
 lib64_DATA += %reldir%/libntdsbcli.a
 lib64_DATA += %reldir%/libntlanman.a
diff --git a/mingw-w64-crt/lib64/ntdll.def b/mingw-w64-crt/lib64/ntdll.def
index 2b2ad36..894c312 100644
--- a/mingw-w64-crt/lib64/ntdll.def
+++ b/mingw-w64-crt/lib64/ntdll.def
@@ -1863,175 +1863,3 @@
 ZwWriteRequestData
 ZwWriteVirtualMemory
 ZwYieldExecution
-__C_specific_handler
-;__chkstk
-__isascii
-__iscsym
-__iscsymf
-__misaligned_access
-__toascii
-_atoi64
-_fltused DATA
-_i64toa
-_i64toa_s
-_i64tow
-_i64tow_s
-_itoa
-_itoa_s
-_itow
-_itow_s
-_lfind
-_local_unwind
-_ltoa
-_ltoa_s
-_ltow
-_ltow_s
-_makepath_s
-_memccpy
-_memicmp
-_setjmp
-_setjmpex
-_snprintf
-_snprintf_s
-_snscanf_s
-_snwprintf
-_snwprintf_s
-_snwscanf_s
-_splitpath
-_splitpath_s
-_strcmpi
-_stricmp
-_strlwr
-_strnicmp
-_strnset_s
-_strset_s
-_strupr
-_tolower
-_toupper
-_swprintf
-_ui64toa
-_ui64toa_s
-_ui64tow
-_ui64tow_s
-_ultoa
-_ultoa_s
-_ultow
-_ultow_s
-_vscwprintf
-_vsnprintf
-_vsnprintf_s
-_vsnwprintf
-_vsnwprintf_s
-_vswprintf
-_wcsicmp
-_wcslwr
-_wcsnicmp
-_wcsnset_s
-_wcsset_s
-_wcstoui64
-_wcsupr
-_wmakepath_s
-_wsplitpath_s
-_wtoi
-_wtoi64
-_wtol
-abs
-atan DATA
-atoi
-atol
-bsearch
-ceil
-cos DATA
-fabs DATA
-floor DATA
-isalnum
-isalpha
-iscntrl
-isdigit
-isgraph
-islower
-isprint
-ispunct
-isspace
-isupper
-iswalpha
-iswctype
-iswdigit
-iswlower
-iswspace
-iswxdigit
-isxdigit
-labs
-log
-longjmp DATA
-mbstowcs
-memchr
-memcmp
-memcpy
-memcpy_s
-memmove
-memmove_s
-memset
-pow
-qsort
-sin
-sprintf
-sprintf_s
-sqrt
-sscanf
-sscanf_s
-strcat
-strcat_s
-strchr
-strcmp
-strcpy
-strcpy_s
-strcspn
-strlen
-strncat
-strncat_s
-strncmp
-strncpy
-strncpy_s
-strnlen
-strpbrk
-strrchr
-strspn
-strstr
-strtok_s
-strtol
-strtoul
-swprintf
-swprintf_s
-swscanf_s
-tan
-tolower
-toupper
-towlower
-towupper
-vDbgPrintEx
-vDbgPrintExWithPrefix
-vsprintf
-vsprintf_s
-vswprintf_s
-wcscat
-wcscat_s
-wcschr
-wcscmp
-wcscpy
-wcscpy_s
-wcscspn
-wcslen
-wcsncat
-wcsncat_s
-wcsncmp
-wcsncpy
-wcsncpy_s
-wcsnlen
-wcspbrk
-wcsrchr
-wcsspn
-wcsstr
-wcstol
-wcstombs
-wcstoul
diff --git a/mingw-w64-crt/lib64/ntdllcrt.def b/mingw-w64-crt/lib64/ntdllcrt.def
new file mode 100644
index 0000000..87794fb
--- /dev/null
+++ b/mingw-w64-crt/lib64/ntdllcrt.def
@@ -0,0 +1,179 @@
+;
+; Definition file of ntdll.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "ntdll.dll"
+EXPORTS
+__C_specific_handler
+;__chkstk
+__isascii
+__iscsym
+__iscsymf
+__misaligned_access
+__toascii
+_atoi64
+_fltused DATA
+_i64toa
+_i64toa_s
+_i64tow
+_i64tow_s
+_itoa
+_itoa_s
+_itow
+_itow_s
+_lfind
+_local_unwind
+_ltoa
+_ltoa_s
+_ltow
+_ltow_s
+_makepath_s
+_memccpy
+_memicmp
+_setjmp
+_setjmpex
+_snprintf
+_snprintf_s
+_snscanf_s
+_snwprintf
+_snwprintf_s
+_snwscanf_s
+_splitpath
+_splitpath_s
+_strcmpi
+_stricmp
+_strlwr
+_strnicmp
+_strnset_s
+_strset_s
+_strupr
+_tolower
+_toupper
+_swprintf
+_ui64toa
+_ui64toa_s
+_ui64tow
+_ui64tow_s
+_ultoa
+_ultoa_s
+_ultow
+_ultow_s
+_vscwprintf
+_vsnprintf
+_vsnprintf_s
+_vsnwprintf
+_vsnwprintf_s
+_vswprintf
+_wcsicmp
+_wcslwr
+_wcsnicmp
+_wcsnset_s
+_wcsset_s
+_wcstoui64
+_wcsupr
+_wmakepath_s
+_wsplitpath_s
+_wtoi
+_wtoi64
+_wtol
+abs
+atan DATA
+atoi
+atol
+bsearch
+ceil
+cos DATA
+fabs DATA
+floor DATA
+isalnum
+isalpha
+iscntrl
+isdigit
+isgraph
+islower
+isprint
+ispunct
+isspace
+isupper
+iswalpha
+iswctype
+iswdigit
+iswlower
+iswspace
+iswxdigit
+isxdigit
+labs
+log
+longjmp DATA
+mbstowcs
+memchr
+memcmp
+memcpy
+memcpy_s
+memmove
+memmove_s
+memset
+pow
+qsort
+sin
+sprintf
+sprintf_s
+sqrt
+sscanf
+sscanf_s
+strcat
+strcat_s
+strchr
+strcmp
+strcpy
+strcpy_s
+strcspn
+strlen
+strncat
+strncat_s
+strncmp
+strncpy
+strncpy_s
+strnlen
+strpbrk
+strrchr
+strspn
+strstr
+strtok_s
+strtol
+strtoul
+swprintf
+swprintf_s
+swscanf_s
+tan
+tolower
+toupper
+towlower
+towupper
+vDbgPrintEx
+vDbgPrintExWithPrefix
+vsprintf
+vsprintf_s
+vswprintf_s
+wcscat
+wcscat_s
+wcschr
+wcscmp
+wcscpy
+wcscpy_s
+wcscspn
+wcslen
+wcsncat
+wcsncat_s
+wcsncmp
+wcsncpy
+wcsncpy_s
+wcsnlen
+wcspbrk
+wcsrchr
+wcsspn
+wcsstr
+wcstol
+wcstombs
+wcstoul
diff --git a/mingw-w64-crt/libarm32/Makefile.am b/mingw-w64-crt/libarm32/Makefile.am
index 10b7f01..4597c26 100644
--- a/mingw-w64-crt/libarm32/Makefile.am
+++ b/mingw-w64-crt/libarm32/Makefile.am
@@ -500,6 +500,7 @@
 libarm32_DATA += %reldir%/libnsi.a
 libarm32_DATA += %reldir%/libnsisvc.a
 libarm32_DATA += %reldir%/libntdll.a
+libarm32_DATA += %reldir%/libntdllcrt.a
 libarm32_DATA += %reldir%/libntdsapi.a
 libarm32_DATA += %reldir%/libntlanman.a
 libarm32_DATA += %reldir%/libntmarta.a
diff --git a/mingw-w64-crt/libarm32/ntdll.def b/mingw-w64-crt/libarm32/ntdll.def
index 13099a9..ac9c39f 100644
--- a/mingw-w64-crt/libarm32/ntdll.def
+++ b/mingw-w64-crt/libarm32/ntdll.def
@@ -1982,184 +1982,3 @@
 ZwWriteRequestData
 ZwWriteVirtualMemory
 ZwYieldExecution
-__C_specific_handler
-__chkstk
-__isascii
-__iscsym
-__iscsymf
-__jump_unwind
-__toascii
-_atoi64
-_errno
-_fltused DATA
-_i64toa
-_i64toa_s
-_i64tow
-_i64tow_s
-_itoa
-_itoa_s
-_itow
-_itow_s
-_lfind
-_ltoa
-_ltoa_s
-_ltow
-_ltow_s
-_makepath_s
-_memccpy
-_memicmp
-_setjmp
-_setjmpex
-_snprintf
-_snprintf_s
-_snscanf_s
-_snwprintf
-_snwprintf_s
-_snwscanf_s
-_splitpath
-_splitpath_s
-_strcmpi
-_stricmp
-_strlwr
-_strlwr_s
-_strnicmp
-_strnset_s
-_strset_s
-_strupr
-_strupr_s
-_swprintf
-_ui64toa
-_ui64toa_s
-_ui64tow
-_ui64tow_s
-_ultoa
-_ultoa_s
-_ultow
-_ultow_s
-_vscwprintf
-_vsnprintf
-_vsnprintf_s
-_vsnwprintf
-_vsnwprintf_s
-_vswprintf
-_wcsicmp
-_wcslwr
-_wcslwr_s
-_wcsnicmp
-_wcsnset_s
-_wcsset_s
-_wcstoi64
-_wcstoui64
-_wcsupr
-_wcsupr_s
-_wmakepath_s
-_wsplitpath_s
-_wtoi
-_wtoi64
-_wtol
-abs
-atan
-atoi
-atol
-bsearch
-ceil
-cos
-fabs
-floor
-isalnum
-isalpha
-iscntrl
-isdigit
-isgraph
-islower
-isprint
-ispunct
-isspace
-isupper
-iswalnum
-iswalpha
-iswascii
-iswctype
-iswdigit
-iswgraph
-iswlower
-iswprint
-iswspace
-iswxdigit
-isxdigit
-labs
-log
-longjmp
-mbstowcs
-memchr
-memcmp
-memcpy
-memcpy_s
-memmove
-memmove_s
-memset
-pow
-qsort
-qsort_s
-sin
-sprintf
-sprintf_s
-sqrt
-sscanf
-sscanf_s
-strcat
-strcat_s
-strchr
-strcmp
-strcpy
-strcpy_s
-strcspn
-strlen
-strncat
-strncat_s
-strncmp
-strncpy
-strncpy_s
-strnlen
-strpbrk
-strrchr
-strspn
-strstr
-strtok_s
-strtol
-strtoul
-swprintf
-swprintf_s
-swscanf_s
-tan
-tolower
-toupper
-towlower
-towupper
-vDbgPrintEx
-vDbgPrintExWithPrefix
-vsprintf
-vsprintf_s
-vswprintf_s
-wcscat
-wcscat_s
-wcschr
-wcscmp
-wcscpy
-wcscpy_s
-wcscspn
-wcslen
-wcsncat
-wcsncat_s
-wcsncmp
-wcsncpy
-wcsncpy_s
-wcsnlen
-wcspbrk
-wcsrchr
-wcsspn
-wcsstr
-wcstok_s
-wcstol
-wcstombs
-wcstoul
diff --git a/mingw-w64-crt/libarm32/ntdllcrt.def b/mingw-w64-crt/libarm32/ntdllcrt.def
new file mode 100644
index 0000000..a819b17
--- /dev/null
+++ b/mingw-w64-crt/libarm32/ntdllcrt.def
@@ -0,0 +1,188 @@
+;
+; Definition file of ntdll.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008-2014
+;
+LIBRARY "ntdll.dll"
+EXPORTS
+__C_specific_handler
+__chkstk
+__isascii
+__iscsym
+__iscsymf
+__jump_unwind
+__toascii
+_atoi64
+_errno
+_fltused DATA
+_i64toa
+_i64toa_s
+_i64tow
+_i64tow_s
+_itoa
+_itoa_s
+_itow
+_itow_s
+_lfind
+_ltoa
+_ltoa_s
+_ltow
+_ltow_s
+_makepath_s
+_memccpy
+_memicmp
+_setjmp
+_setjmpex
+_snprintf
+_snprintf_s
+_snscanf_s
+_snwprintf
+_snwprintf_s
+_snwscanf_s
+_splitpath
+_splitpath_s
+_strcmpi
+_stricmp
+_strlwr
+_strlwr_s
+_strnicmp
+_strnset_s
+_strset_s
+_strupr
+_strupr_s
+_swprintf
+_ui64toa
+_ui64toa_s
+_ui64tow
+_ui64tow_s
+_ultoa
+_ultoa_s
+_ultow
+_ultow_s
+_vscwprintf
+_vsnprintf
+_vsnprintf_s
+_vsnwprintf
+_vsnwprintf_s
+_vswprintf
+_wcsicmp
+_wcslwr
+_wcslwr_s
+_wcsnicmp
+_wcsnset_s
+_wcsset_s
+_wcstoi64
+_wcstoui64
+_wcsupr
+_wcsupr_s
+_wmakepath_s
+_wsplitpath_s
+_wtoi
+_wtoi64
+_wtol
+abs
+atan
+atoi
+atol
+bsearch
+ceil
+cos
+fabs
+floor
+isalnum
+isalpha
+iscntrl
+isdigit
+isgraph
+islower
+isprint
+ispunct
+isspace
+isupper
+iswalnum
+iswalpha
+iswascii
+iswctype
+iswdigit
+iswgraph
+iswlower
+iswprint
+iswspace
+iswxdigit
+isxdigit
+labs
+log
+longjmp
+mbstowcs
+memchr
+memcmp
+memcpy
+memcpy_s
+memmove
+memmove_s
+memset
+pow
+qsort
+qsort_s
+sin
+sprintf
+sprintf_s
+sqrt
+sscanf
+sscanf_s
+strcat
+strcat_s
+strchr
+strcmp
+strcpy
+strcpy_s
+strcspn
+strlen
+strncat
+strncat_s
+strncmp
+strncpy
+strncpy_s
+strnlen
+strpbrk
+strrchr
+strspn
+strstr
+strtok_s
+strtol
+strtoul
+swprintf
+swprintf_s
+swscanf_s
+tan
+tolower
+toupper
+towlower
+towupper
+vDbgPrintEx
+vDbgPrintExWithPrefix
+vsprintf
+vsprintf_s
+vswprintf_s
+wcscat
+wcscat_s
+wcschr
+wcscmp
+wcscpy
+wcscpy_s
+wcscspn
+wcslen
+wcsncat
+wcsncat_s
+wcsncmp
+wcsncpy
+wcsncpy_s
+wcsnlen
+wcspbrk
+wcsrchr
+wcsspn
+wcsstr
+wcstok_s
+wcstol
+wcstombs
+wcstoul