msvcp90: Use the thiscall type on appropriate entry points.

dlls/msvcp80/msvcp80.spec

@@ -530,21 +530,21 @@
 @ stub -arch=win64 ??0?$_String_val@_WV?$allocator@_W@std@@@std@@IEAA@V?$allocator@_W@1@@Z
 @ stub -arch=win32 ??0?$_String_val@_WV?$allocator@_W@std@@@std@@QAE@ABV01@@Z
 @ stub -arch=win64 ??0?$_String_val@_WV?$allocator@_W@std@@@std@@QEAA@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@D@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@D@std@@QAE@ABV01@@Z
+@ thiscall -arch=win32 ??0?$allocator@D@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@D@std@@QAE@ABV01@@Z
 @ cdecl -arch=win64 ??0?$allocator@D@std@@QEAA@AEBV01@@Z(ptr ptr) msvcp90.??0?$allocator@D@std@@QEAA@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@D@std@@QAE@XZ() msvcp90.??0?$allocator@D@std@@QAE@XZ
+@ thiscall -arch=win32 ??0?$allocator@D@std@@QAE@XZ() msvcp90.??0?$allocator@D@std@@QAE@XZ
 @ cdecl -arch=win64 ??0?$allocator@D@std@@QEAA@XZ(ptr) msvcp90.??0?$allocator@D@std@@QEAA@XZ
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@G@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@G@std@@QAE@ABV01@@Z
+@ thiscall -arch=win32 ??0?$allocator@G@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@G@std@@QAE@ABV01@@Z
 @ cdecl -arch=win64 ??0?$allocator@G@std@@QEAA@AEBV01@@Z(ptr ptr) msvcp90.??0?$allocator@G@std@@QEAA@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@G@std@@QAE@XZ() msvcp90.??0?$allocator@G@std@@QAE@XZ
+@ thiscall -arch=win32 ??0?$allocator@G@std@@QAE@XZ() msvcp90.??0?$allocator@G@std@@QAE@XZ
 @ cdecl -arch=win64 ??0?$allocator@G@std@@QEAA@XZ(ptr) msvcp90.??0?$allocator@G@std@@QEAA@XZ
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@X@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@X@std@@QAE@ABV01@@Z
+@ thiscall -arch=win32 ??0?$allocator@X@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@X@std@@QAE@ABV01@@Z
 @ cdecl -arch=win64 ??0?$allocator@X@std@@QEAA@AEBV01@@Z(ptr ptr) msvcp90.??0?$allocator@X@std@@QEAA@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@X@std@@QAE@XZ() msvcp90.??0?$allocator@X@std@@QAE@XZ
+@ thiscall -arch=win32 ??0?$allocator@X@std@@QAE@XZ() msvcp90.??0?$allocator@X@std@@QAE@XZ
 @ cdecl -arch=win64 ??0?$allocator@X@std@@QEAA@XZ(ptr) msvcp90.??0?$allocator@X@std@@QEAA@XZ
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@_W@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@_W@std@@QAE@ABV01@@Z
+@ thiscall -arch=win32 ??0?$allocator@_W@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$allocator@_W@std@@QAE@ABV01@@Z
 @ cdecl -arch=win64 ??0?$allocator@_W@std@@QEAA@AEBV01@@Z(ptr ptr) msvcp90.??0?$allocator@_W@std@@QEAA@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@_W@std@@QAE@XZ() msvcp90.??0?$allocator@_W@std@@QAE@XZ
+@ thiscall -arch=win32 ??0?$allocator@_W@std@@QAE@XZ() msvcp90.??0?$allocator@_W@std@@QAE@XZ
 @ cdecl -arch=win64 ??0?$allocator@_W@std@@QEAA@XZ(ptr) msvcp90.??0?$allocator@_W@std@@QEAA@XZ
 @ stub -arch=win32 ??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@PAU_iobuf@@@Z
 @ stub -arch=win64 ??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAA@PEAU_iobuf@@@Z
@@ -738,7 +738,7 @@
 @ stub -arch=win64 ??0?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAA@W4_Uninitialized@1@@Z
 @ stub -arch=win32 ??0?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IAE@XZ
 @ stub -arch=win64 ??0?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAA@XZ
-@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z
+@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z(ptr ptr) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z
@@ -752,7 +752,7 @@
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD@Z(ptr str) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD@Z
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD0@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBDAEBV?$allocator@D@1@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD@Z(str) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD@Z
+@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD@Z(str) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_K@Z
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBDABV?$allocator@D@1@@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_KAEBV?$allocator@D@1@@Z
@@ -762,7 +762,7 @@
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ(ptr) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@1@0@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@_KD@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ
+@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@_KDAEBV?$allocator@D@1@@Z
 @ stub -arch=win32 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z
 @ stub -arch=win64 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@@Z
@@ -1210,7 +1210,7 @@
 @ stub -arch=win64 ??1?$basic_streambuf@GU?$char_traits@G@std@@@std@@UEAA@XZ
 @ stub -arch=win32 ??1?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@UAE@XZ
 @ stub -arch=win64 ??1?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@UEAA@XZ
-@ cdecl -arch=win32 -i386 -norelay ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() msvcp90.??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ
+@ thiscall -arch=win32 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() msvcp90.??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ
 @ cdecl -arch=win64 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ(ptr) msvcp90.??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ
 @ stub -arch=win32 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ
 @ stub -arch=win64 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ
@@ -1370,13 +1370,13 @@
 @ stub -arch=win64 ??4?$_String_val@GV?$allocator@G@std@@@std@@QEAAAEAV01@AEBV01@@Z
 @ stub -arch=win32 ??4?$_String_val@_WV?$allocator@_W@std@@@std@@QAEAAV01@ABV01@@Z
 @ stub -arch=win64 ??4?$_String_val@_WV?$allocator@_W@std@@@std@@QEAAAEAV01@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@D@std@@QAEAAV01@ABV01@@Z
+@ thiscall -arch=win32 ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@D@std@@QAEAAV01@ABV01@@Z
 @ cdecl -arch=win64 ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcp90.??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@G@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@G@std@@QAEAAV01@ABV01@@Z
+@ thiscall -arch=win32 ??4?$allocator@G@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@G@std@@QAEAAV01@ABV01@@Z
 @ cdecl -arch=win64 ??4?$allocator@G@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcp90.??4?$allocator@G@std@@QEAAAEAV01@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@X@std@@QAEAAV01@ABV01@@Z
+@ thiscall -arch=win32 ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@X@std@@QAEAAV01@ABV01@@Z
 @ cdecl -arch=win64 ??4?$allocator@X@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcp90.??4?$allocator@X@std@@QEAAAEAV01@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@_W@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@_W@std@@QAEAAV01@ABV01@@Z
+@ thiscall -arch=win32 ??4?$allocator@_W@std@@QAEAAV01@ABV01@@Z(ptr) msvcp90.??4?$allocator@_W@std@@QAEAAV01@ABV01@@Z
 @ cdecl -arch=win64 ??4?$allocator@_W@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcp90.??4?$allocator@_W@std@@QEAAAEAV01@AEBV01@@Z
 @ stub -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@ABV01@@Z
 @ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z
@@ -2854,29 +2854,29 @@
 @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAA_JPEAG_K_J@Z
 @ stub -arch=win32 ?_Xsgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEHPA_WIH@Z
 @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEA_W_K_J@Z
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@D@std@@QBEPADAAD@Z(ptr) msvcp90.?address@?$allocator@D@std@@QBEPADAAD@Z
+@ thiscall -arch=win32 ?address@?$allocator@D@std@@QBEPADAAD@Z(ptr) msvcp90.?address@?$allocator@D@std@@QBEPADAAD@Z
 @ cdecl -arch=win64 ?address@?$allocator@D@std@@QEBAPEADAEAD@Z(ptr ptr) msvcp90.?address@?$allocator@D@std@@QEBAPEADAEAD@Z
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@D@std@@QBEPBDABD@Z(ptr) msvcp90.?address@?$allocator@D@std@@QBEPBDABD@Z
+@ thiscall -arch=win32 ?address@?$allocator@D@std@@QBEPBDABD@Z(ptr) msvcp90.?address@?$allocator@D@std@@QBEPBDABD@Z
 @ cdecl -arch=win64 ?address@?$allocator@D@std@@QEBAPEBDAEBD@Z(ptr ptr) msvcp90.?address@?$allocator@D@std@@QEBAPEBDAEBD@Z
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@G@std@@QBEPAGAAG@Z(ptr) msvcp90.?address@?$allocator@G@std@@QBEPAGAAG@Z
+@ thiscall -arch=win32 ?address@?$allocator@G@std@@QBEPAGAAG@Z(ptr) msvcp90.?address@?$allocator@G@std@@QBEPAGAAG@Z
 @ cdecl -arch=win64 ?address@?$allocator@G@std@@QEBAPEAGAEAG@Z(ptr ptr) msvcp90.?address@?$allocator@G@std@@QEBAPEAGAEAG@Z
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@G@std@@QBEPBGABG@Z(ptr) msvcp90.?address@?$allocator@G@std@@QBEPBGABG@Z
+@ thiscall -arch=win32 ?address@?$allocator@G@std@@QBEPBGABG@Z(ptr) msvcp90.?address@?$allocator@G@std@@QBEPBGABG@Z
 @ cdecl -arch=win64 ?address@?$allocator@G@std@@QEBAPEBGAEBG@Z(ptr ptr) msvcp90.?address@?$allocator@G@std@@QEBAPEBGAEBG@Z
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@_W@std@@QBEPA_WAA_W@Z(ptr) msvcp90.?address@?$allocator@_W@std@@QBEPA_WAA_W@Z
+@ thiscall -arch=win32 ?address@?$allocator@_W@std@@QBEPA_WAA_W@Z(ptr) msvcp90.?address@?$allocator@_W@std@@QBEPA_WAA_W@Z
 @ cdecl -arch=win64 ?address@?$allocator@_W@std@@QEBAPEA_WAEA_W@Z(ptr ptr) msvcp90.?address@?$allocator@_W@std@@QEBAPEA_WAEA_W@Z
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@_W@std@@QBEPB_WAB_W@Z(ptr) msvcp90.?address@?$allocator@_W@std@@QBEPB_WAB_W@Z
+@ thiscall -arch=win32 ?address@?$allocator@_W@std@@QBEPB_WAB_W@Z(ptr) msvcp90.?address@?$allocator@_W@std@@QBEPB_WAB_W@Z
 @ cdecl -arch=win64 ?address@?$allocator@_W@std@@QEBAPEB_WAEB_W@Z(ptr ptr) msvcp90.?address@?$allocator@_W@std@@QEBAPEB_WAEB_W@Z
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@D@std@@QAEPADI@Z(long) msvcp90.?allocate@?$allocator@D@std@@QAEPADI@Z
+@ thiscall -arch=win32 ?allocate@?$allocator@D@std@@QAEPADI@Z(long) msvcp90.?allocate@?$allocator@D@std@@QAEPADI@Z
 @ cdecl -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z(ptr long) msvcp90.?allocate@?$allocator@D@std@@QEAAPEAD_K@Z
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@D@std@@QAEPADIPBX@Z(long ptr) msvcp90.?allocate@?$allocator@D@std@@QAEPADIPBX@Z
+@ thiscall -arch=win32 ?allocate@?$allocator@D@std@@QAEPADIPBX@Z(long ptr) msvcp90.?allocate@?$allocator@D@std@@QAEPADIPBX@Z
 @ cdecl -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z(ptr long ptr) msvcp90.?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@G@std@@QAEPAGI@Z(long) msvcp90.?allocate@?$allocator@G@std@@QAEPAGI@Z
+@ thiscall -arch=win32 ?allocate@?$allocator@G@std@@QAEPAGI@Z(long) msvcp90.?allocate@?$allocator@G@std@@QAEPAGI@Z
 @ cdecl -arch=win64 ?allocate@?$allocator@G@std@@QEAAPEAG_K@Z(ptr long) msvcp90.?allocate@?$allocator@G@std@@QEAAPEAG_K@Z
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z(long ptr) msvcp90.?allocate@?$allocator@G@std@@QAEPAGIPBX@Z
+@ thiscall -arch=win32 ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z(long ptr) msvcp90.?allocate@?$allocator@G@std@@QAEPAGIPBX@Z
 @ cdecl -arch=win64 ?allocate@?$allocator@G@std@@QEAAPEAG_KPEBX@Z(ptr long ptr) msvcp90.?allocate@?$allocator@G@std@@QEAAPEAG_KPEBX@Z
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@_W@std@@QAEPA_WI@Z(long) msvcp90.?allocate@?$allocator@_W@std@@QAEPA_WI@Z
+@ thiscall -arch=win32 ?allocate@?$allocator@_W@std@@QAEPA_WI@Z(long) msvcp90.?allocate@?$allocator@_W@std@@QAEPA_WI@Z
 @ cdecl -arch=win64 ?allocate@?$allocator@_W@std@@QEAAPEA_W_K@Z(ptr long) msvcp90.?allocate@?$allocator@_W@std@@QEAAPEA_W_K@Z
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z(long ptr) msvcp90.?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z
+@ thiscall -arch=win32 ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z(long ptr) msvcp90.?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z
 @ cdecl -arch=win64 ?allocate@?$allocator@_W@std@@QEAAPEA_W_KPEBX@Z(ptr long ptr) msvcp90.?allocate@?$allocator@_W@std@@QEAAPEA_W_KPEBX@Z
 @ stub -arch=win32 ?always_noconv@codecvt_base@std@@QBE_NXZ
 @ stub -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ
@@ -2922,17 +2922,17 @@
 @ stub -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z
 @ stub -arch=win32 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z
 @ stub -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@_K_W@Z
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z(ptr) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z(ptr) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z(ptr ptr) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z(ptr long long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z(ptr long long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z(ptr ptr long long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z
 @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ID@Z
 @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD0@Z
 @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD0@Z
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z(ptr str) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z(str) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z(str) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z(ptr ptr long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z(ptr long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z(ptr long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z
 @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z
 @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z
 @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z
@@ -3005,7 +3005,7 @@
 @ stub -arch=win64 ?begin@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
 @ stub -arch=win32 ?begin@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBE?AV?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
 @ stub -arch=win64 ?begin@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA?AV?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
-@ cdecl -arch=win32 -i386 -norelay ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ() msvcp90.?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ
+@ thiscall -arch=win32 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ() msvcp90.?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ
 @ cdecl -arch=win64 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ(ptr) msvcp90.?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ
 @ stub -arch=win32 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ
 @ stub -arch=win64 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ
@@ -3126,11 +3126,11 @@
 @ stub -arch=win64 ?compare@?$collate@G@std@@QEBAHPEBG000@Z
 @ stub -arch=win32 ?compare@?$collate@_W@std@@QBEHPB_W000@Z
 @ stub -arch=win64 ?compare@?$collate@_W@std@@QEBAHPEB_W000@Z
-@ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator@D@std@@QAEXPADABD@Z(ptr ptr) msvcp90.?construct@?$allocator@D@std@@QAEXPADABD@Z
+@ thiscall -arch=win32 ?construct@?$allocator@D@std@@QAEXPADABD@Z(ptr ptr) msvcp90.?construct@?$allocator@D@std@@QAEXPADABD@Z
 @ cdecl -arch=win64 ?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z(ptr ptr ptr) msvcp90.?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z
-@ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator@G@std@@QAEXPAGABG@Z(ptr ptr) msvcp90.?construct@?$allocator@G@std@@QAEXPAGABG@Z
+@ thiscall -arch=win32 ?construct@?$allocator@G@std@@QAEXPAGABG@Z(ptr ptr) msvcp90.?construct@?$allocator@G@std@@QAEXPAGABG@Z
 @ cdecl -arch=win64 ?construct@?$allocator@G@std@@QEAAXPEAGAEBG@Z(ptr ptr ptr) msvcp90.?construct@?$allocator@G@std@@QEAAXPEAGAEBG@Z
-@ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z(ptr ptr) msvcp90.?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z
+@ thiscall -arch=win32 ?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z(ptr ptr) msvcp90.?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z
 @ cdecl -arch=win64 ?construct@?$allocator@_W@std@@QEAAXPEA_WAEB_W@Z(ptr ptr ptr) msvcp90.?construct@?$allocator@_W@std@@QEAAXPEA_WAEB_W@Z
 @ stub -arch=win32 ?copy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPADII@Z
 @ stub -arch=win64 ?copy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEAD_K1@Z
@@ -3174,11 +3174,11 @@
 @ stub -arch=win64 ?date_order@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ
 @ stub -arch=win32 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ
 @ stub -arch=win64 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ
-@ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator@D@std@@QAEXPADI@Z(ptr long) msvcp90.?deallocate@?$allocator@D@std@@QAEXPADI@Z
+@ thiscall -arch=win32 ?deallocate@?$allocator@D@std@@QAEXPADI@Z(ptr long) msvcp90.?deallocate@?$allocator@D@std@@QAEXPADI@Z
 @ cdecl -arch=win64 ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z(ptr ptr long) msvcp90.?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z
-@ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator@G@std@@QAEXPAGI@Z(ptr long) msvcp90.?deallocate@?$allocator@G@std@@QAEXPAGI@Z
+@ thiscall -arch=win32 ?deallocate@?$allocator@G@std@@QAEXPAGI@Z(ptr long) msvcp90.?deallocate@?$allocator@G@std@@QAEXPAGI@Z
 @ cdecl -arch=win64 ?deallocate@?$allocator@G@std@@QEAAXPEAG_K@Z(ptr ptr long) msvcp90.?deallocate@?$allocator@G@std@@QEAAXPEAG_K@Z
-@ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z(ptr long) msvcp90.?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z
+@ thiscall -arch=win32 ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z(ptr long) msvcp90.?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z
 @ cdecl -arch=win64 ?deallocate@?$allocator@_W@std@@QEAAXPEA_W_K@Z(ptr ptr long) msvcp90.?deallocate@?$allocator@_W@std@@QEAAXPEA_W_K@Z
 @ stub -arch=win32 ?decimal_point@?$_Mpunct@D@std@@QBEDXZ
 @ stub -arch=win64 ?decimal_point@?$_Mpunct@D@std@@QEBADXZ
@@ -3208,11 +3208,11 @@
 @ stub ?denorm_min@?$numeric_limits@_K@std@@SA_KXZ
 @ stub ?denorm_min@?$numeric_limits@_N@std@@SA_NXZ
 @ stub ?denorm_min@?$numeric_limits@_W@std@@SA_WXZ
-@ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator@D@std@@QAEXPAD@Z(ptr) msvcp90.?destroy@?$allocator@D@std@@QAEXPAD@Z
+@ thiscall -arch=win32 ?destroy@?$allocator@D@std@@QAEXPAD@Z(ptr) msvcp90.?destroy@?$allocator@D@std@@QAEXPAD@Z
 @ cdecl -arch=win64 ?destroy@?$allocator@D@std@@QEAAXPEAD@Z(ptr ptr) msvcp90.?destroy@?$allocator@D@std@@QEAAXPEAD@Z
-@ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator@G@std@@QAEXPAG@Z(ptr) msvcp90.?destroy@?$allocator@G@std@@QAEXPAG@Z
+@ thiscall -arch=win32 ?destroy@?$allocator@G@std@@QAEXPAG@Z(ptr) msvcp90.?destroy@?$allocator@G@std@@QAEXPAG@Z
 @ cdecl -arch=win64 ?destroy@?$allocator@G@std@@QEAAXPEAG@Z(ptr ptr) msvcp90.?destroy@?$allocator@G@std@@QEAAXPEAG@Z
-@ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator@_W@std@@QAEXPA_W@Z(ptr) msvcp90.?destroy@?$allocator@_W@std@@QAEXPA_W@Z
+@ thiscall -arch=win32 ?destroy@?$allocator@_W@std@@QAEXPA_W@Z(ptr) msvcp90.?destroy@?$allocator@_W@std@@QAEXPA_W@Z
 @ cdecl -arch=win64 ?destroy@?$allocator@_W@std@@QEAAXPEA_W@Z(ptr ptr) msvcp90.?destroy@?$allocator@_W@std@@QEAAXPEA_W@Z
 @ stub ?digits10@?$numeric_limits@C@std@@2HB
 @ stub ?digits10@?$numeric_limits@D@std@@2HB
@@ -3742,7 +3742,7 @@
 @ stub -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@0@Z
 @ stub -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z
 @ stub -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z
-@ cdecl -arch=win32 -i386 -norelay ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z(long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z
+@ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z(long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z
 @ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z(ptr long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z
 @ stub -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@0@Z
 @ stub -arch=win64 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@0@Z
@@ -4479,11 +4479,11 @@
 @ stub ?max_exponent@_Num_base@std@@2HB
 @ stub -arch=win32 ?max_length@codecvt_base@std@@QBEHXZ
 @ stub -arch=win64 ?max_length@codecvt_base@std@@QEBAHXZ
-@ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator@D@std@@QBEIXZ() msvcp90.?max_size@?$allocator@D@std@@QBEIXZ
+@ thiscall -arch=win32 ?max_size@?$allocator@D@std@@QBEIXZ() msvcp90.?max_size@?$allocator@D@std@@QBEIXZ
 @ cdecl -arch=win64 ?max_size@?$allocator@D@std@@QEBA_KXZ(ptr) msvcp90.?max_size@?$allocator@D@std@@QEBA_KXZ
-@ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator@G@std@@QBEIXZ() msvcp90.?max_size@?$allocator@G@std@@QBEIXZ
+@ thiscall -arch=win32 ?max_size@?$allocator@G@std@@QBEIXZ() msvcp90.?max_size@?$allocator@G@std@@QBEIXZ
 @ cdecl -arch=win64 ?max_size@?$allocator@G@std@@QEBA_KXZ(ptr) msvcp90.?max_size@?$allocator@G@std@@QEBA_KXZ
-@ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator@_W@std@@QBEIXZ() msvcp90.?max_size@?$allocator@_W@std@@QBEIXZ
+@ thiscall -arch=win32 ?max_size@?$allocator@_W@std@@QBEIXZ() msvcp90.?max_size@?$allocator@_W@std@@QBEIXZ
 @ cdecl -arch=win64 ?max_size@?$allocator@_W@std@@QEBA_KXZ(ptr) msvcp90.?max_size@?$allocator@_W@std@@QEBA_KXZ
 @ stub -arch=win32 ?max_size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ
 @ stub -arch=win64 ?max_size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ

dlls/msvcp90/msvcp90.spec

@@ -530,21 +530,21 @@
 @ stub -arch=win64 ??0?$_String_val@_WV?$allocator@_W@std@@@std@@IEAA@V?$allocator@_W@1@@Z
 @ stub -arch=win32 ??0?$_String_val@_WV?$allocator@_W@std@@@std@@QAE@ABV01@@Z
 @ stub -arch=win64 ??0?$_String_val@_WV?$allocator@_W@std@@@std@@QEAA@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@D@std@@QAE@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_copy_ctor
+@ thiscall -arch=win32 ??0?$allocator@D@std@@QAE@ABV01@@Z(ptr) MSVCP_allocator_char_copy_ctor
 @ cdecl -arch=win64 ??0?$allocator@D@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@D@std@@QAE@XZ() __thiscall_MSVCP_allocator_char_ctor
+@ thiscall -arch=win32 ??0?$allocator@D@std@@QAE@XZ() MSVCP_allocator_char_ctor
 @ cdecl -arch=win64 ??0?$allocator@D@std@@QEAA@XZ(ptr) MSVCP_allocator_char_ctor
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@G@std@@QAE@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_short_copy_ctor
+@ thiscall -arch=win32 ??0?$allocator@G@std@@QAE@ABV01@@Z(ptr) MSVCP_allocator_short_copy_ctor
 @ cdecl -arch=win64 ??0?$allocator@G@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_allocator_short_copy_ctor
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@G@std@@QAE@XZ() __thiscall_MSVCP_allocator_short_ctor
+@ thiscall -arch=win32 ??0?$allocator@G@std@@QAE@XZ() MSVCP_allocator_short_ctor
 @ cdecl -arch=win64 ??0?$allocator@G@std@@QEAA@XZ(ptr) MSVCP_allocator_short_ctor
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@X@std@@QAE@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_void_copy_ctor
+@ thiscall -arch=win32 ??0?$allocator@X@std@@QAE@ABV01@@Z(ptr) MSVCP_allocator_void_copy_ctor
 @ cdecl -arch=win64 ??0?$allocator@X@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_allocator_void_copy_ctor
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@X@std@@QAE@XZ() __thiscall_MSVCP_allocator_void_ctor
+@ thiscall -arch=win32 ??0?$allocator@X@std@@QAE@XZ() MSVCP_allocator_void_ctor
 @ cdecl -arch=win64 ??0?$allocator@X@std@@QEAA@XZ(ptr) MSVCP_allocator_void_ctor
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@_W@std@@QAE@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_wchar_copy_ctor
+@ thiscall -arch=win32 ??0?$allocator@_W@std@@QAE@ABV01@@Z(ptr) MSVCP_allocator_wchar_copy_ctor
 @ cdecl -arch=win64 ??0?$allocator@_W@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_copy_ctor
-@ cdecl -arch=win32 -i386 -norelay ??0?$allocator@_W@std@@QAE@XZ() __thiscall_MSVCP_allocator_wchar_ctor
+@ thiscall -arch=win32 ??0?$allocator@_W@std@@QAE@XZ() MSVCP_allocator_wchar_ctor
 @ cdecl -arch=win64 ??0?$allocator@_W@std@@QEAA@XZ(ptr) MSVCP_allocator_wchar_ctor
 @ stub -arch=win32 ??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@PAU_iobuf@@@Z
 @ stub -arch=win64 ??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAA@PEAU_iobuf@@@Z
@@ -732,7 +732,7 @@
 @ stub -arch=win64 ??0?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAA@W4_Uninitialized@1@@Z
 @ stub -arch=win32 ??0?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IAE@XZ
 @ stub -arch=win64 ??0?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAA@XZ
-@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr) __thiscall_MSVCP_basic_string_char_copy_ctor
+@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr) MSVCP_basic_string_char_copy_ctor
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z
@@ -746,7 +746,7 @@
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD@Z(ptr str) MSVCP_basic_string_char_ctor_cstr
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD0@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBDAEBV?$allocator@D@1@@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD@Z(str) __thiscall_MSVCP_basic_string_char_ctor_cstr
+@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD@Z(str) MSVCP_basic_string_char_ctor_cstr
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_K@Z
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBDABV?$allocator@D@1@@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_KAEBV?$allocator@D@1@@Z
@@ -756,7 +756,7 @@
 @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ(ptr) MSVCP_basic_string_char_ctor
 @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@1@0@Z
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@_KD@Z
-@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() __thiscall_MSVCP_basic_string_char_ctor
+@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() MSVCP_basic_string_char_ctor
 @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@_KDAEBV?$allocator@D@1@@Z
 @ stub -arch=win32 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z
 @ stub -arch=win64 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@@Z
@@ -1212,7 +1212,7 @@
 @ stub -arch=win64 ??1?$basic_streambuf@GU?$char_traits@G@std@@@std@@UEAA@XZ
 @ stub -arch=win32 ??1?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@UAE@XZ
 @ stub -arch=win64 ??1?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@UEAA@XZ
-@ cdecl -arch=win32 -i386 -norelay ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() __thiscall_MSVCP_basic_string_char_dtor
+@ thiscall -arch=win32 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ() MSVCP_basic_string_char_dtor
 @ cdecl -arch=win64 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ(ptr) MSVCP_basic_string_char_dtor
 @ stub -arch=win32 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ
 @ stub -arch=win64 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ
@@ -1372,13 +1372,13 @@
 @ stub -arch=win64 ??4?$_String_val@GV?$allocator@G@std@@@std@@QEAAAEAV01@AEBV01@@Z
 @ stub -arch=win32 ??4?$_String_val@_WV?$allocator@_W@std@@@std@@QAEAAV01@ABV01@@Z
 @ stub -arch=win64 ??4?$_String_val@_WV?$allocator@_W@std@@@std@@QEAAAEAV01@AEBV01@@Z
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_assign
+@ thiscall -arch=win32 ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z(ptr) MSVCP_allocator_char_assign
 @ cdecl -arch=win64 ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@G@std@@QAEAAV01@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_short_assign
+@ thiscall -arch=win32 ??4?$allocator@G@std@@QAEAAV01@ABV01@@Z(ptr) MSVCP_allocator_short_assign
 @ cdecl -arch=win64 ??4?$allocator@G@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_allocator_short_assign
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_void_assign
+@ thiscall -arch=win32 ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z(ptr) MSVCP_allocator_void_assign
 @ cdecl -arch=win64 ??4?$allocator@X@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_allocator_void_assign
-@ cdecl -arch=win32 -i386 -norelay ??4?$allocator@_W@std@@QAEAAV01@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_wchar_assign
+@ thiscall -arch=win32 ??4?$allocator@_W@std@@QAEAAV01@ABV01@@Z(ptr) MSVCP_allocator_wchar_assign
 @ cdecl -arch=win64 ??4?$allocator@_W@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign
 @ stub -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@ABV01@@Z
 @ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z
@@ -2890,29 +2890,29 @@
 @ stub -arch=win32 ?_Xsgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEHPA_WIH@Z
 @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEA_W_K_J@Z
 @ stub ?_Xweak@tr1@std@@YAXXZ
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@D@std@@QBEPADAAD@Z(ptr) __thiscall_MSVCP_allocator_char_address
+@ thiscall -arch=win32 ?address@?$allocator@D@std@@QBEPADAAD@Z(ptr) MSVCP_allocator_char_address
 @ cdecl -arch=win64 ?address@?$allocator@D@std@@QEBAPEADAEAD@Z(ptr ptr) MSVCP_allocator_char_address
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@D@std@@QBEPBDABD@Z(ptr) __thiscall_MSVCP_allocator_char_const_address
+@ thiscall -arch=win32 ?address@?$allocator@D@std@@QBEPBDABD@Z(ptr) MSVCP_allocator_char_const_address
 @ cdecl -arch=win64 ?address@?$allocator@D@std@@QEBAPEBDAEBD@Z(ptr ptr) MSVCP_allocator_char_const_address
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@G@std@@QBEPAGAAG@Z(ptr) __thiscall_MSVCP_allocator_short_address
+@ thiscall -arch=win32 ?address@?$allocator@G@std@@QBEPAGAAG@Z(ptr) MSVCP_allocator_short_address
 @ cdecl -arch=win64 ?address@?$allocator@G@std@@QEBAPEAGAEAG@Z(ptr ptr) MSVCP_allocator_short_address
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@G@std@@QBEPBGABG@Z(ptr) __thiscall_MSVCP_allocator_short_const_address
+@ thiscall -arch=win32 ?address@?$allocator@G@std@@QBEPBGABG@Z(ptr) MSVCP_allocator_short_const_address
 @ cdecl -arch=win64 ?address@?$allocator@G@std@@QEBAPEBGAEBG@Z(ptr ptr) MSVCP_allocator_short_const_address
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@_W@std@@QBEPA_WAA_W@Z(ptr) __thiscall_MSVCP_allocator_wchar_address
+@ thiscall -arch=win32 ?address@?$allocator@_W@std@@QBEPA_WAA_W@Z(ptr) MSVCP_allocator_wchar_address
 @ cdecl -arch=win64 ?address@?$allocator@_W@std@@QEBAPEA_WAEA_W@Z(ptr ptr) MSVCP_allocator_wchar_address
-@ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@_W@std@@QBEPB_WAB_W@Z(ptr) __thiscall_MSVCP_allocator_wchar_const_address
+@ thiscall -arch=win32 ?address@?$allocator@_W@std@@QBEPB_WAB_W@Z(ptr) MSVCP_allocator_wchar_const_address
 @ cdecl -arch=win64 ?address@?$allocator@_W@std@@QEBAPEB_WAEB_W@Z(ptr ptr) MSVCP_allocator_wchar_const_address
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@D@std@@QAEPADI@Z(long) __thiscall_MSVCP_allocator_char_allocate
+@ thiscall -arch=win32 ?allocate@?$allocator@D@std@@QAEPADI@Z(long) MSVCP_allocator_char_allocate
 @ cdecl -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z(ptr long) MSVCP_allocator_char_allocate
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@D@std@@QAEPADIPBX@Z(long ptr) __thiscall_MSVCP_allocator_char_allocate_hint
+@ thiscall -arch=win32 ?allocate@?$allocator@D@std@@QAEPADIPBX@Z(long ptr) MSVCP_allocator_char_allocate_hint
 @ cdecl -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z(ptr long ptr) MSVCP_allocator_char_allocate_hint
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@G@std@@QAEPAGI@Z(long) __thiscall_MSVCP_allocator_short_allocate
+@ thiscall -arch=win32 ?allocate@?$allocator@G@std@@QAEPAGI@Z(long) MSVCP_allocator_short_allocate
 @ cdecl -arch=win64 ?allocate@?$allocator@G@std@@QEAAPEAG_K@Z(ptr long) MSVCP_allocator_short_allocate
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z(long ptr) __thiscall_MSVCP_allocator_short_allocate_hint
+@ thiscall -arch=win32 ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z(long ptr) MSVCP_allocator_short_allocate_hint
 @ cdecl -arch=win64 ?allocate@?$allocator@G@std@@QEAAPEAG_KPEBX@Z(ptr long ptr) MSVCP_allocator_short_allocate_hint
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@_W@std@@QAEPA_WI@Z(long) __thiscall_MSVCP_allocator_wchar_allocate
+@ thiscall -arch=win32 ?allocate@?$allocator@_W@std@@QAEPA_WI@Z(long) MSVCP_allocator_wchar_allocate
 @ cdecl -arch=win64 ?allocate@?$allocator@_W@std@@QEAAPEA_W_K@Z(ptr long) MSVCP_allocator_wchar_allocate
-@ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z(long ptr) __thiscall_MSVCP_allocator_wchar_allocate_hint
+@ thiscall -arch=win32 ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z(long ptr) MSVCP_allocator_wchar_allocate_hint
 @ cdecl -arch=win64 ?allocate@?$allocator@_W@std@@QEAAPEA_W_KPEBX@Z(ptr long ptr) MSVCP_allocator_wchar_allocate_hint
 @ stub -arch=win32 ?always_noconv@codecvt_base@std@@QBE_NXZ
 @ stub -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ
@@ -2958,17 +2958,17 @@
 @ stub -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z
 @ stub -arch=win32 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z
 @ stub -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@_K_W@Z
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z(ptr) __thiscall_MSVCP_basic_string_char_assign
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z(ptr) MSVCP_basic_string_char_assign
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z(ptr ptr) MSVCP_basic_string_char_assign
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z(ptr long long) __thiscall_MSVCP_basic_string_char_assign_substr
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z(ptr long long) MSVCP_basic_string_char_assign_substr
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z(ptr ptr long long) MSVCP_basic_string_char_assign_substr
 @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ID@Z
 @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD0@Z
 @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD0@Z
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z(ptr str) MSVCP_basic_string_char_assign_cstr
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z(str) __thiscall_MSVCP_basic_string_char_assign_cstr
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z(str) MSVCP_basic_string_char_assign_cstr
 @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z(ptr ptr long) MSVCP_basic_string_char_assign_cstr_len
-@ cdecl -arch=win32 -i386 -norelay ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z(ptr long) __thiscall_MSVCP_basic_string_char_assign_cstr_len
+@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z(ptr long) MSVCP_basic_string_char_assign_cstr_len
 @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z
 @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z
 @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z
@@ -3041,7 +3041,7 @@
 @ stub -arch=win64 ?begin@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
 @ stub -arch=win32 ?begin@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBE?AV?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
 @ stub -arch=win64 ?begin@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA?AV?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
-@ cdecl -arch=win32 -i386 -norelay ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ() __thiscall_MSVCP_basic_string_char_c_str
+@ thiscall -arch=win32 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ() MSVCP_basic_string_char_c_str
 @ cdecl -arch=win64 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ(ptr) MSVCP_basic_string_char_c_str
 @ stub -arch=win32 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ
 @ stub -arch=win64 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ
@@ -3162,11 +3162,11 @@
 @ stub -arch=win64 ?compare@?$collate@G@std@@QEBAHPEBG000@Z
 @ stub -arch=win32 ?compare@?$collate@_W@std@@QBEHPB_W000@Z
 @ stub -arch=win64 ?compare@?$collate@_W@std@@QEBAHPEB_W000@Z
-@ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator@D@std@@QAEXPADABD@Z(ptr ptr) __thiscall_MSVCP_allocator_char_construct
+@ thiscall -arch=win32 ?construct@?$allocator@D@std@@QAEXPADABD@Z(ptr ptr) MSVCP_allocator_char_construct
 @ cdecl -arch=win64 ?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z(ptr ptr ptr) MSVCP_allocator_char_construct
-@ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator@G@std@@QAEXPAGABG@Z(ptr ptr) __thiscall_MSVCP_allocator_short_construct
+@ thiscall -arch=win32 ?construct@?$allocator@G@std@@QAEXPAGABG@Z(ptr ptr) MSVCP_allocator_short_construct
 @ cdecl -arch=win64 ?construct@?$allocator@G@std@@QEAAXPEAGAEBG@Z(ptr ptr ptr) MSVCP_allocator_short_construct
-@ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z(ptr ptr) __thiscall_MSVCP_allocator_wchar_construct
+@ thiscall -arch=win32 ?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z(ptr ptr) MSVCP_allocator_wchar_construct
 @ cdecl -arch=win64 ?construct@?$allocator@_W@std@@QEAAXPEA_WAEB_W@Z(ptr ptr ptr) MSVCP_allocator_wchar_construct
 @ stub -arch=win32 ?copy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPADII@Z
 @ stub -arch=win64 ?copy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEAD_K1@Z
@@ -3210,11 +3210,11 @@
 @ stub -arch=win64 ?date_order@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ
 @ stub -arch=win32 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ
 @ stub -arch=win64 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ
-@ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator@D@std@@QAEXPADI@Z(ptr long) __thiscall_MSVCP_allocator_char_deallocate
+@ thiscall -arch=win32 ?deallocate@?$allocator@D@std@@QAEXPADI@Z(ptr long) MSVCP_allocator_char_deallocate
 @ cdecl -arch=win64 ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z(ptr ptr long) MSVCP_allocator_char_deallocate
-@ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator@G@std@@QAEXPAGI@Z(ptr long) __thiscall_MSVCP_allocator_short_deallocate
+@ thiscall -arch=win32 ?deallocate@?$allocator@G@std@@QAEXPAGI@Z(ptr long) MSVCP_allocator_short_deallocate
 @ cdecl -arch=win64 ?deallocate@?$allocator@G@std@@QEAAXPEAG_K@Z(ptr ptr long) MSVCP_allocator_short_deallocate
-@ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z(ptr long) __thiscall_MSVCP_allocator_wchar_deallocate
+@ thiscall -arch=win32 ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z(ptr long) MSVCP_allocator_wchar_deallocate
 @ cdecl -arch=win64 ?deallocate@?$allocator@_W@std@@QEAAXPEA_W_K@Z(ptr ptr long) MSVCP_allocator_wchar_deallocate
 @ stub -arch=win32 ?decimal_point@?$_Mpunct@D@std@@QBEDXZ
 @ stub -arch=win64 ?decimal_point@?$_Mpunct@D@std@@QEBADXZ
@@ -3244,11 +3244,11 @@
 @ stub ?denorm_min@?$numeric_limits@_K@std@@SA_KXZ
 @ stub ?denorm_min@?$numeric_limits@_N@std@@SA_NXZ
 @ stub ?denorm_min@?$numeric_limits@_W@std@@SA_WXZ
-@ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator@D@std@@QAEXPAD@Z(ptr) __thiscall_MSVCP_allocator_char_destroy
+@ thiscall -arch=win32 ?destroy@?$allocator@D@std@@QAEXPAD@Z(ptr) MSVCP_allocator_char_destroy
 @ cdecl -arch=win64 ?destroy@?$allocator@D@std@@QEAAXPEAD@Z(ptr ptr) MSVCP_allocator_char_destroy
-@ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator@G@std@@QAEXPAG@Z(ptr) __thiscall_MSVCP_allocator_short_destroy
+@ thiscall -arch=win32 ?destroy@?$allocator@G@std@@QAEXPAG@Z(ptr) MSVCP_allocator_short_destroy
 @ cdecl -arch=win64 ?destroy@?$allocator@G@std@@QEAAXPEAG@Z(ptr ptr) MSVCP_allocator_short_destroy
-@ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator@_W@std@@QAEXPA_W@Z(ptr) __thiscall_MSVCP_allocator_wchar_destroy
+@ thiscall -arch=win32 ?destroy@?$allocator@_W@std@@QAEXPA_W@Z(ptr) MSVCP_allocator_wchar_destroy
 @ cdecl -arch=win64 ?destroy@?$allocator@_W@std@@QEAAXPEA_W@Z(ptr ptr) MSVCP_allocator_wchar_destroy
 @ stub ?digits10@?$numeric_limits@C@std@@2HB
 @ stub ?digits10@?$numeric_limits@D@std@@2HB
@@ -3774,7 +3774,7 @@
 @ stub -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z
 @ stub -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z
 @ stub -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z
-@ cdecl -arch=win32 -i386 -norelay ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z(long long) __thiscall_MSVCP_basic_string_char_erase
+@ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z(long long) MSVCP_basic_string_char_erase
 @ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z(ptr long long) MSVCP_basic_string_char_erase
 @ stub -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z
 @ stub -arch=win64 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z
@@ -4509,11 +4509,11 @@
 @ stub ?max_exponent@_Num_base@std@@2HB
 @ stub -arch=win32 ?max_length@codecvt_base@std@@QBEHXZ
 @ stub -arch=win64 ?max_length@codecvt_base@std@@QEBAHXZ
-@ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator@D@std@@QBEIXZ() __thiscall_MSVCP_allocator_char_max_size
+@ thiscall -arch=win32 ?max_size@?$allocator@D@std@@QBEIXZ() MSVCP_allocator_char_max_size
 @ cdecl -arch=win64 ?max_size@?$allocator@D@std@@QEBA_KXZ(ptr) MSVCP_allocator_char_max_size
-@ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator@G@std@@QBEIXZ() __thiscall_MSVCP_allocator_short_max_size
+@ thiscall -arch=win32 ?max_size@?$allocator@G@std@@QBEIXZ() MSVCP_allocator_short_max_size
 @ cdecl -arch=win64 ?max_size@?$allocator@G@std@@QEBA_KXZ(ptr) MSVCP_allocator_short_max_size
-@ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator@_W@std@@QBEIXZ() __thiscall_MSVCP_allocator_wchar_max_size
+@ thiscall -arch=win32 ?max_size@?$allocator@_W@std@@QBEIXZ() MSVCP_allocator_wchar_max_size
 @ cdecl -arch=win64 ?max_size@?$allocator@_W@std@@QEBA_KXZ(ptr) MSVCP_allocator_wchar_max_size
 @ stub -arch=win32 ?max_size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ
 @ stub -arch=win64 ?max_size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ