Define llabs and imaxabs aliases based on a new WITH_LLABS_ALIAS and WITH_IMAXABS_ALIAS macros. --- mingw-w64-crt/def-include/msvcrt-common.def.in | 7 +++++++ mingw-w64-crt/lib-common/msvcrt.def.in | 6 ++++-- mingw-w64-crt/lib32/msvcr100.def.in | 2 +- mingw-w64-crt/lib32/msvcr110.def.in | 2 +- mingw-w64-crt/lib32/msvcr80.def.in | 3 +-- mingw-w64-crt/lib32/msvcr90.def.in | 3 +-- mingw-w64-crt/lib32/msvcr90d.def.in | 3 +-- mingw-w64-crt/lib64/msvcr100.def.in | 2 +- mingw-w64-crt/lib64/msvcr110.def.in | 2 +- mingw-w64-crt/lib64/msvcr80.def.in | 3 +-- mingw-w64-crt/lib64/msvcr90.def.in | 3 +-- mingw-w64-crt/lib64/msvcr90d.def.in | 3 +-- 12 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index ea05823f0829..d91429763f40 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in @@ -172,6 +172,13 @@ atoll == _atoi64 _atoll_l == _atoi64_l #endif +#ifdef WITH_LLABS_ALIAS +llabs == _abs64 +imaxabs == _abs64 +#elif defined(WITH_IMAXABS_ALIAS) +imaxabs == llabs +#endif + ; This is list of printf/scanf symbol aliases with __ms_ prefix #ifndef UCRTBASE __ms_fprintf == fprintf diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in index 5b383dba4e52..8bfb5b59bc63 100644 --- a/mingw-w64-crt/lib-common/msvcrt.def.in +++ b/mingw-w64-crt/lib-common/msvcrt.def.in @@ -5,6 +5,10 @@ EXPORTS #define NO_STRCMPI_ALIAS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#ifndef DEF_I386 +; i386 llabs and imaxabs alias provided by emu +#define WITH_LLABS_ALIAS +#endif #include "func.def.in" #include "msvcrt-common.def.in" @@ -1850,8 +1854,6 @@ _strtoimax_l == _strtoi64_l _strtoll_l == _strtoi64_l _strtoull_l == _strtoui64_l _strtoumax_l == _strtoui64_l -F_NON_I386(imaxabs == _abs64) ; i386 imaxabs alias provided by emu -F_NON_I386(llabs == _abs64) ; i386 llabs alias provided by emu F_NON_I386(strtoimax == _strtoi64) ; i386 strtoimax alias provided by emu F_NON_I386(strtoll == _strtoi64) ; i386 strtoll alias provided by emu F_NON_I386(strtoull == _strtoui64) ; i386 strtoull alias provided by emu diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in index 5cd2bc809d12..4e810dd4f20a 100644 --- a/mingw-w64-crt/lib32/msvcr100.def.in +++ b/mingw-w64-crt/lib32/msvcr100.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_IMAXABS_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Concurrency::details::<0x1ULL>::<0x1ULL>(void(__cdecl *)(void)) @@ -1777,7 +1778,6 @@ labs ldexp DATA ldiv llabs -imaxabs == llabs lldiv imaxdiv == lldiv localeconv diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in index 4c714b7e5230..1c6b6d045154 100644 --- a/mingw-w64-crt/lib32/msvcr110.def.in +++ b/mingw-w64-crt/lib32/msvcr110.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_IMAXABS_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Concurrency::details::<0x1ULL>::<0x1ULL>(void(__cdecl *)(void)) @@ -1910,7 +1911,6 @@ labs ldexp DATA ldiv llabs -imaxabs == llabs lldiv imaxdiv == lldiv localeconv diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in index 6e925eb7c285..9143ac279a85 100644 --- a/mingw-w64-crt/lib32/msvcr80.def.in +++ b/mingw-w64-crt/lib32/msvcr80.def.in @@ -3,6 +3,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_LLABS_ALIAS #include "msvcrt-common.def.in" ; C++ mangled symbols @@ -333,8 +334,6 @@ __wgetmainargs __winitenv DATA _abnormal_termination _abs64 -llabs == _abs64 -imaxabs == _abs64 _access _access_s _acmdln DATA diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in index bbeb8c00ff5a..63219131a765 100644 --- a/mingw-w64-crt/lib32/msvcr90.def.in +++ b/mingw-w64-crt/lib32/msvcr90.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_LLABS_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall std::__non_rtti_object::__non_rtti_object(class std::__non_rtti_object const &) @@ -331,8 +332,6 @@ __wgetmainargs __winitenv DATA _abnormal_termination _abs64 -llabs == _abs64 -imaxabs == _abs64 _access _access_s _acmdln DATA diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in index c93c2c7133e0..071b537b2e60 100644 --- a/mingw-w64-crt/lib32/msvcr90d.def.in +++ b/mingw-w64-crt/lib32/msvcr90d.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_LLABS_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall std::__non_rtti_object::__non_rtti_object(class std::__non_rtti_object const &) @@ -374,8 +375,6 @@ __wgetmainargs __winitenv DATA _abnormal_termination _abs64 -llabs == _abs64 -imaxabs == _abs64 _access _access_s _acmdln DATA diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in index 913f5091f76b..6f9a8865ebcc 100644 --- a/mingw-w64-crt/lib64/msvcr100.def.in +++ b/mingw-w64-crt/lib64/msvcr100.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_IMAXABS_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -1733,7 +1734,6 @@ labs ldexp DATA ldiv llabs -imaxabs == llabs lldiv imaxdiv == lldiv localeconv diff --git a/mingw-w64-crt/lib64/msvcr110.def.in b/mingw-w64-crt/lib64/msvcr110.def.in index c6bf1320e572..7f86ecb7f93a 100644 --- a/mingw-w64-crt/lib64/msvcr110.def.in +++ b/mingw-w64-crt/lib64/msvcr110.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_IMAXABS_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -1857,7 +1858,6 @@ labs ldexp ldiv llabs -imaxabs == llabs lldiv imaxdiv == lldiv localeconv diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in index 5ce4cbd01a9e..323745d5cc9c 100644 --- a/mingw-w64-crt/lib64/msvcr80.def.in +++ b/mingw-w64-crt/lib64/msvcr80.def.in @@ -3,6 +3,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_LLABS_ALIAS #include "msvcrt-common.def.in" ; C++ mangled symbols @@ -292,8 +293,6 @@ __wcsncnt __wgetmainargs __winitenv DATA _abs64 -llabs == _abs64 -imaxabs == _abs64 _access _access_s _acmdln DATA diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in index f1dc3dc926df..d1391709b9bc 100644 --- a/mingw-w64-crt/lib64/msvcr90.def.in +++ b/mingw-w64-crt/lib64/msvcr90.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_LLABS_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -293,8 +294,6 @@ __wcsncnt __wgetmainargs __winitenv DATA _abs64 -llabs == _abs64 -imaxabs == _abs64 _access _access_s _acmdln DATA diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in index e4ccdf28f7c4..3ae62e25fe30 100644 --- a/mingw-w64-crt/lib64/msvcr90d.def.in +++ b/mingw-w64-crt/lib64/msvcr90d.def.in @@ -8,6 +8,7 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_LLABS_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -330,8 +331,6 @@ __wcsncnt __wgetmainargs __winitenv DATA _abs64 -llabs == _abs64 -imaxabs == _abs64 _access _access_s _acmdln DATA -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
