Signed-off-by: Martin Storsjö <[email protected]> --- .../ntdllcrt.def.in} | 40 ++-- mingw-w64-crt/lib64/ntdllcrt.def | 192 ------------------ mingw-w64-crt/libarm32/ntdllcrt.def | 189 ----------------- mingw-w64-crt/libarm64/Makefile.am | 1 + 4 files changed, 28 insertions(+), 394 deletions(-) rename mingw-w64-crt/{lib32/ntdllcrt.def => lib-common/ntdllcrt.def.in} (77%) delete mode 100644 mingw-w64-crt/lib64/ntdllcrt.def delete mode 100644 mingw-w64-crt/libarm32/ntdllcrt.def
diff --git a/mingw-w64-crt/lib32/ntdllcrt.def b/mingw-w64-crt/lib-common/ntdllcrt.def.in similarity index 77% rename from mingw-w64-crt/lib32/ntdllcrt.def rename to mingw-w64-crt/lib-common/ntdllcrt.def.in index 62c393ef7..a2336166b 100644 --- a/mingw-w64-crt/lib32/ntdllcrt.def +++ b/mingw-w64-crt/lib-common/ntdllcrt.def.in @@ -1,19 +1,23 @@ -; -; Definition file of ntdll.dll -; Automatic generated by gendef -; written by Kai Tietz 2008 -; +#include "func.def.in" + LIBRARY "ntdll.dll" EXPORTS +#ifdef DEF_I386 _CIcos _CIlog _CIpow _CIsin _CIsqrt +#endif +F_NON_I386(__C_specific_handler) +F_NON_I386(;__chkstk) __isascii __iscsym __iscsymf +F_X64(__misaligned_access) +F_ARM32(__jump_unwind) __toascii +#ifdef DEF_I386 _alldiv _alldvrm@16 _allmul@16 @@ -23,18 +27,23 @@ _alloca_probe_8 _allrem@16 _allshl _allshr +#endif _atoi64 +#ifdef DEF_I386 _aulldiv@16 _aulldvrm@16 _aullrem@16 _aullshr ;_chkstk +#endif _errno -_except_handler4_common +F_I386(_except_handler4_common) _fltused DATA +#ifdef DEF_I386 _ftol _ftol2 _ftol2_sse +#endif _i64toa _i64toa_s _i64tow @@ -44,7 +53,8 @@ _itoa_s _itow _itow_s _lfind -_local_unwind4 +F64(_local_unwind) +F_I386(_local_unwind4) _ltoa _ltoa_s _ltow @@ -52,6 +62,9 @@ _ltow_s _makepath_s _memccpy _memicmp +F_X64(_setjmp) +F_ARM32(_setjmp) +F_NON_I386(_setjmpex) _snprintf _snprintf_s _snscanf_s @@ -70,8 +83,8 @@ _strset_s _strupr _strupr_s _swprintf -_tolower -_toupper +F_X86_ANY(_tolower) +F_X86_ANY(_toupper) _ui64toa _ui64toa_s _ui64tow @@ -103,16 +116,16 @@ _wtoi _wtoi64 _wtol abs -atan DATA +atan F_X86_ANY(DATA) atan2 atoi atol bsearch bsearch_s ceil -cos DATA -fabs DATA -floor DATA +cos F_X86_ANY(DATA) +fabs F_X86_ANY(DATA) +floor F_X86_ANY(DATA) isalnum isalpha iscntrl @@ -136,6 +149,7 @@ iswxdigit isxdigit labs log +F_NON_I386(longjmp) mbstowcs memchr memcmp diff --git a/mingw-w64-crt/lib64/ntdllcrt.def b/mingw-w64-crt/lib64/ntdllcrt.def deleted file mode 100644 index 0cb1e3f04..000000000 --- a/mingw-w64-crt/lib64/ntdllcrt.def +++ /dev/null @@ -1,192 +0,0 @@ -; -; 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 -_errno -_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 -_strlwr_s -_strnicmp -_strnset_s -_strset_s -_strupr -_strupr_s -_tolower -_toupper -_swprintf -_ui64toa -_ui64toa_s -_ui64tow -_ui64tow_s -_ultoa -_ultoa_s -_ultow -_ultow_s -_vscprintf -_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 DATA -atan2 -atoi -atol -bsearch -bsearch_s -ceil -cos DATA -fabs DATA -floor DATA -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 -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 deleted file mode 100644 index 64eefb2e8..000000000 --- a/mingw-w64-crt/libarm32/ntdllcrt.def +++ /dev/null @@ -1,189 +0,0 @@ -; -; 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 -_vscprintf -_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 -atan2 -atoi -atol -bsearch -bsearch_s -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 -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/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am index 960808ec4..26f28619e 100644 --- a/mingw-w64-crt/libarm64/Makefile.am +++ b/mingw-w64-crt/libarm64/Makefile.am @@ -190,6 +190,7 @@ libarm64_DATA += %reldir%/libnetshell.a libarm64_DATA += %reldir%/libnetutils.a libarm64_DATA += %reldir%/libnormaliz.a libarm64_DATA += %reldir%/libntdsapi.a +libarm64_DATA += %reldir%/libntdllcrt.a libarm64_DATA += %reldir%/liboccache.a libarm64_DATA += %reldir%/libodbc32.a libarm64_DATA += %reldir%/libodbccp32.a -- 2.17.1 _______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
