These common parts from msvcrt-common.def.in don't belong in ucrtbase.def. Mark longjmp as DATA on X86 only, since we provide a wrapped version in misc/mingw_getsp.S, but only on X86.
Signed-off-by: Martin Storsjö <mar...@martin.st> --- mingw-w64-crt/def-include/msvcrt-common.def.in | 2 ++ mingw-w64-crt/lib-common/ucrtbase.def.in | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index 76e1fa3..92f047f 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in @@ -125,6 +125,7 @@ ADD_UNDERSCORE(hypot) ;logb ADD_UNDERSCORE(nextafter) +#ifndef UCRTBASE _daylight DATA _timezone DATA _tzname DATA @@ -133,3 +134,4 @@ ADD_UNDERSCORE(timezone) ADD_UNDERSCORE(tzname) longjmp DATA +#endif diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in b/mingw-w64-crt/lib-common/ucrtbase.def.in index 41ecbc3..674332f 100644 --- a/mingw-w64-crt/lib-common/ucrtbase.def.in +++ b/mingw-w64-crt/lib-common/ucrtbase.def.in @@ -2,6 +2,7 @@ LIBRARY "ucrtbase.dll" EXPORTS #include "func.def.in" +#define UCRTBASE #include "msvcrt-common.def.in" #ifdef DEF_I386 @@ -2422,7 +2423,7 @@ logb logbf logbl F_NON_I386(logf F_X86_ANY(DATA)) -longjmp +longjmp F_X86_ANY(DATA) lrint lrintf lrintl -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
