From 79444310975ca42fe6c4e472317eac0830405b70 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Mon, 23 May 2011 03:02:16 +0000 Subject: [PATCH] 2011-05-22 A.B., Khalid * Makefile.in: Add support for msvcr100.dll. * msvcrt.def.in: Ditto. --- winsup/mingw/ChangeLog | 5 +++++ winsup/mingw/Makefile.in | 8 ++++++-- winsup/mingw/msvcrt.def.in | 8 ++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 047d07c80..79e63eb6c 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2011-05-22 A.B., Khalid + + * Makefile.in: Add support for msvcr100.dll. + * msvcrt.def.in: Ditto. + 2011-05-22 Antoine LECA * mingwex/mingw-fseek.c: The anonymous union feature for LARGE_INTEGER is diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 8914f1010..c80b8aa6a 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -240,6 +240,7 @@ LIBS = libcrtdll.a \ libmsvcr71.a libmsvcr71d.a \ libmsvcr80.a libmsvcr80d.a \ libmsvcr90.a libmsvcr90d.a \ + libmsvcr100.a libmsvcr100d.a \ libmingw32.a \ libcoldname.a \ libmoldname.a libmoldnamed.a \ @@ -247,6 +248,7 @@ LIBS = libcrtdll.a \ libmoldname71.a libmoldname71d.a \ libmoldname80.a libmoldname80d.a \ libmoldname90.a libmoldname90d.a \ + libmoldname100.a libmoldname100d.a \ $(LIBM_A) \ libmingwthrd_old.a \ libmingwthrd.a @@ -320,7 +322,8 @@ msvcrt.def msvcrtd.def \ msvcr70.def msvcr70d.def \ msvcr71.def msvcr71d.def \ msvcr80.def msvcr80d.def \ -msvcr90.def msvcr90d.def: msvcrt.def.in +msvcr90.def msvcr90d.def \ +msvcr100.def msvcr100d.def: msvcrt.def.in V=`echo $@ | sed -e 's|[a-z]*\([0-9]*\).*|\1|'`; \ test -z "$$V" && V=60; \ V="0x0$${V}0"; \ @@ -361,7 +364,8 @@ libmoldname.a libmoldnamed.a: moldname-msvcrt.def $(MOLD_OBJS) libmoldname70.a libmoldname70d.a \ libmoldname71.a libmoldname71d.a \ libmoldname80.a libmoldname80d.a \ -libmoldname90.a libmoldname90d.a: moldname-msvcrt.def $(MOLD_OBJS) +libmoldname90.a libmoldname90d.a \ +libmoldname100.a libmoldname100d.a: moldname-msvcrt.def $(MOLD_OBJS) $(DLLTOOL) --as $(AS) -k -U \ --dllname msvcr$(@:libmoldname%a=%)dll \ --def moldname-msvcrt.def \ diff --git a/winsup/mingw/msvcrt.def.in b/winsup/mingw/msvcrt.def.in index 44af9a1f5..1b2336d5a 100644 --- a/winsup/mingw/msvcrt.def.in +++ b/winsup/mingw/msvcrt.def.in @@ -148,7 +148,7 @@ _cprintf _cputs _creat _cscanf -#if !(__msvcr71__ || __msvcr71d__ || __msvcr80__ || __msvcr80d__ || __msvcr90__ || msvcr90d__) +#if !(__msvcr71__ || __msvcr71d__ || __msvcr80__ || __msvcr80d__ || __msvcr90__ || msvcr90d__ || __msvcr100__ || __msvcr100d__) _ctype DATA #endif _cwait @@ -822,7 +822,7 @@ _wcstoui64 _wctype _wtof _get_heap_handle -#if ( __msvcr70__ || __msvcr70d__ || __msvcr71__ || __msvcr71d__ || __msvcr80__ || __msvcr80d__ || __msvcr90__ || __msvcr90d__) +#if ( __msvcr70__ || __msvcr70d__ || __msvcr71__ || __msvcr71d__ || __msvcr80__ || __msvcr80d__ || __msvcr90__ || __msvcr90d__ || __msvcr100__ || __msvcr100d__) ; msvcr70.dll and later __buffer_overrun __lc_clike @@ -831,13 +831,13 @@ __set_buffer_overrun_handler _CRT_RTC_INIT _set_security_error_handler #endif /* 7.0 */ -#if (__msvcr71__ || __msvcr71d__ || __msvcr80__ || __msvcr80d__ || __msvcr90__ || __msvcr90d__) +#if (__msvcr71__ || __msvcr71d__ || __msvcr80__ || __msvcr80d__ || __msvcr90__ || __msvcr90d__ || __msvcr100__ || __msvcr100d__) ; msvcr71.dll __CppXcptFilter __CxxCallUnwindVecDtor _set_purecall_handler #endif /* 7.1 */ -#if ( __msvcr80__ || __msvcr80d__ || __msvcr90__ || __msvcr90d__) +#if ( __msvcr80__ || __msvcr80d__ || __msvcr90__ || __msvcr90d__ || __msvcr100__ || __msvcr100d__) ; msvcr80.dll _get_output_format _set_output_format -- 2.43.5