crt: Unify oleaut32.def for lib64 and libarm32, use on libarm64

Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 5c7d8fc..d3d5e8c 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -913,7 +913,7 @@
 				  lib64/msvcr100.def lib64/msvcr110.def lib64/msvcr120.def lib64/msvcr120d.def \
 				  lib64/msvcr120_app.def lib64/msvcp120_app.def \
 				  lib64/advapi32.def lib64/clbcatq.def lib64/kernel32.def lib64/ole32.def \
-				  lib64/user32.def lib64/ws2_32.def
+				  lib64/oleaut32.def lib64/user32.def lib64/ws2_32.def
 
 endif
 
@@ -1209,8 +1209,8 @@
 libarm32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
 
 processed_defs += libarm32/msvcrt.def libarm32/msvcr80.def libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def libarm32/msvcr110.def \
-				  libarm32/advapi32.def libarm32/clbcatq.def libarm32/kernel32.def libarm32/ole32.def libarm32/user32.def \
-				  libarm32/ws2_32.def
+				  libarm32/advapi32.def libarm32/clbcatq.def libarm32/kernel32.def libarm32/ole32.def libarm32/oleaut32.def \
+				  libarm32/user32.def libarm32/ws2_32.def
 
 endif
 
@@ -1460,8 +1460,8 @@
 libarm64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM64) $(sysincludes)
 
 processed_defs += libarm64/msvcrt.def \
-				  libarm64/advapi32.def libarm64/clbcatq.def libarm64/kernel32.def libarm64/ole32.def libarm64/user32.def \
-				  libarm64/ws2_32.def
+				  libarm64/advapi32.def libarm64/clbcatq.def libarm64/kernel32.def libarm64/ole32.def libarm64/oleaut32.def \
+				  libarm64/user32.def libarm64/ws2_32.def
 
 endif
 
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index a3649a9..3f6a80b 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -200,7 +200,7 @@
 @LIB64_TRUE@@W32API_FALSE@				  lib64/msvcr100.def lib64/msvcr110.def lib64/msvcr120.def lib64/msvcr120d.def \
 @LIB64_TRUE@@W32API_FALSE@				  lib64/msvcr120_app.def lib64/msvcp120_app.def \
 @LIB64_TRUE@@W32API_FALSE@				  lib64/advapi32.def lib64/clbcatq.def lib64/kernel32.def lib64/ole32.def \
-@LIB64_TRUE@@W32API_FALSE@				  lib64/user32.def lib64/ws2_32.def
+@LIB64_TRUE@@W32API_FALSE@				  lib64/oleaut32.def lib64/user32.def lib64/ws2_32.def
 
 @LIB64_TRUE@@W32API_FALSE@am__append_11 = lib64/libmsvcp60.a lib64/libmsvcr80.a lib64/libmsvcr90.a lib64/libmsvcr100.a lib64/libmsvcr90d.a \
 @LIB64_TRUE@@W32API_FALSE@			  lib64/libmsvcr110.a lib64/libmsvcr120.a lib64/libmsvcr120d.a lib64/libcrtdll.a \
@@ -222,8 +222,8 @@
 @LIBARM32_TRUE@@W32API_FALSE@	libarm32/libmoldname.a \
 @LIBARM32_TRUE@@W32API_FALSE@	libarm32/libmingwthrd.a
 @LIBARM32_TRUE@@W32API_FALSE@am__append_14 = libarm32/msvcrt.def libarm32/msvcr80.def libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def libarm32/msvcr110.def \
-@LIBARM32_TRUE@@W32API_FALSE@				  libarm32/advapi32.def libarm32/clbcatq.def libarm32/kernel32.def libarm32/ole32.def libarm32/user32.def \
-@LIBARM32_TRUE@@W32API_FALSE@				  libarm32/ws2_32.def
+@LIBARM32_TRUE@@W32API_FALSE@				  libarm32/advapi32.def libarm32/clbcatq.def libarm32/kernel32.def libarm32/ole32.def libarm32/oleaut32.def \
+@LIBARM32_TRUE@@W32API_FALSE@				  libarm32/user32.def libarm32/ws2_32.def
 
 @LIBARM32_TRUE@@W32API_FALSE@am__append_15 = libarm32/libmsvcp60.a libarm32/libmsvcr110.a
 @LIBARM64_TRUE@@W32API_FALSE@am__append_16 = libarm64/libmsvcrt.a
@@ -242,8 +242,8 @@
 @LIBARM64_TRUE@@W32API_FALSE@	libarm64/libmoldname.a \
 @LIBARM64_TRUE@@W32API_FALSE@	libarm64/libmingwthrd.a
 @LIBARM64_TRUE@@W32API_FALSE@am__append_18 = libarm64/msvcrt.def \
-@LIBARM64_TRUE@@W32API_FALSE@				  libarm64/advapi32.def libarm64/clbcatq.def libarm64/kernel32.def libarm64/ole32.def libarm64/user32.def \
-@LIBARM64_TRUE@@W32API_FALSE@				  libarm64/ws2_32.def
+@LIBARM64_TRUE@@W32API_FALSE@				  libarm64/advapi32.def libarm64/clbcatq.def libarm64/kernel32.def libarm64/ole32.def libarm64/oleaut32.def \
+@LIBARM64_TRUE@@W32API_FALSE@				  libarm64/user32.def libarm64/ws2_32.def
 
 @ENABLE_TESTS_UNICODE_TRUE@am__append_19 = testcases/t_municode testcases/t_tmain
 check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_6)
@@ -8296,62 +8296,63 @@
 @LIBARM64_TRUE@	libarm64/libnetutils.a libarm64/libnormaliz.a \
 @LIBARM64_TRUE@	libarm64/libntdsapi.a libarm64/liboccache.a \
 @LIBARM64_TRUE@	libarm64/libodbccp32.a libarm64/libole32.a \
-@LIBARM64_TRUE@	libarm64/liboleacc.a libarm64/liboledlg.a \
-@LIBARM64_TRUE@	libarm64/libosuninst.a libarm64/libp2p.a \
-@LIBARM64_TRUE@	libarm64/libp2pgraph.a libarm64/libpcwum.a \
-@LIBARM64_TRUE@	libarm64/libperfctrs.a libarm64/libperfdisk.a \
-@LIBARM64_TRUE@	libarm64/libperfnet.a libarm64/libperfos.a \
-@LIBARM64_TRUE@	libarm64/libperfproc.a libarm64/libperfts.a \
-@LIBARM64_TRUE@	libarm64/libphotowiz.a libarm64/libpsapi.a \
-@LIBARM64_TRUE@	libarm64/libpstorec.a libarm64/libqutil.a \
-@LIBARM64_TRUE@	libarm64/libqwave.a libarm64/librasadhlp.a \
-@LIBARM64_TRUE@	libarm64/librasauto.a libarm64/libraschap.a \
-@LIBARM64_TRUE@	libarm64/librasctrs.a libarm64/librasmontr.a \
-@LIBARM64_TRUE@	libarm64/librasmxs.a libarm64/librasser.a \
-@LIBARM64_TRUE@	libarm64/librastapi.a libarm64/librdpcfgex.a \
-@LIBARM64_TRUE@	libarm64/libregapi.a libarm64/libregsvc.a \
-@LIBARM64_TRUE@	libarm64/libresutils.a libarm64/libriched20.a \
-@LIBARM64_TRUE@	libarm64/librnr20.a libarm64/librpcns4.a \
-@LIBARM64_TRUE@	libarm64/librpcrt4.a libarm64/librpcss.a \
-@LIBARM64_TRUE@	libarm64/librsaenh.a libarm64/librtutils.a \
-@LIBARM64_TRUE@	libarm64/libsamcli.a libarm64/libscarddlg.a \
-@LIBARM64_TRUE@	libarm64/libscesrv.a libarm64/libschannel.a \
-@LIBARM64_TRUE@	libarm64/libschedcli.a libarm64/libscrobj.a \
-@LIBARM64_TRUE@	libarm64/libscrrun.a libarm64/libsdhcinst.a \
-@LIBARM64_TRUE@	libarm64/libseclogon.a libarm64/libsecur32.a \
-@LIBARM64_TRUE@	libarm64/libsecurity.a libarm64/libsensapi.a \
-@LIBARM64_TRUE@	libarm64/libsens.a libarm64/libserialui.a \
-@LIBARM64_TRUE@	libarm64/libserwvdrv.a libarm64/libshfolder.a \
-@LIBARM64_TRUE@	libarm64/libshimgvw.a libarm64/libshsvcs.a \
-@LIBARM64_TRUE@	libarm64/libsisbkup.a libarm64/libslcext.a \
-@LIBARM64_TRUE@	libarm64/libslwga.a libarm64/libsnmpapi.a \
-@LIBARM64_TRUE@	libarm64/libsoftpub.a libarm64/libsqlsrv32.a \
-@LIBARM64_TRUE@	libarm64/libsrvcli.a libarm64/libsrvsvc.a \
-@LIBARM64_TRUE@	libarm64/libsspicli.a libarm64/libstreamci.a \
-@LIBARM64_TRUE@	libarm64/libsxs.a libarm64/libt2embed.a \
-@LIBARM64_TRUE@	libarm64/libtapi32.a libarm64/libtapiperf.a \
-@LIBARM64_TRUE@	libarm64/libtbs.a libarm64/libtdh.a \
-@LIBARM64_TRUE@	libarm64/libtraffic.a libarm64/libtsbyuv.a \
-@LIBARM64_TRUE@	libarm64/libtxfw32.a libarm64/libumdmxfrm.a \
-@LIBARM64_TRUE@	libarm64/libunimdmat.a libarm64/libuniplat.a \
-@LIBARM64_TRUE@	libarm64/libupnp.a libarm64/liburl.a \
-@LIBARM64_TRUE@	libarm64/libuser32.a libarm64/libusp10.a \
-@LIBARM64_TRUE@	libarm64/libutildll.a libarm64/libvirtdisk.a \
-@LIBARM64_TRUE@	libarm64/libw32time.a libarm64/libw32topl.a \
-@LIBARM64_TRUE@	libarm64/libwdigest.a libarm64/libwebclnt.a \
-@LIBARM64_TRUE@	libarm64/libwecapi.a libarm64/libwevtapi.a \
-@LIBARM64_TRUE@	libarm64/libwiashext.a libarm64/libwinhttp.a \
-@LIBARM64_TRUE@	libarm64/libwininet.a libarm64/libwinmm.a \
-@LIBARM64_TRUE@	libarm64/libwinrnr.a libarm64/libwinspool.a \
-@LIBARM64_TRUE@	libarm64/libwinsrv.a libarm64/libwinusb.a \
-@LIBARM64_TRUE@	libarm64/libwkscli.a libarm64/libwkssvc.a \
-@LIBARM64_TRUE@	libarm64/libwlanapi.a libarm64/libwlanui.a \
-@LIBARM64_TRUE@	libarm64/libwlanutil.a libarm64/libwldap32.a \
-@LIBARM64_TRUE@	libarm64/libwmi.a libarm64/libwmiprop.a \
-@LIBARM64_TRUE@	libarm64/libwpd_ci.a libarm64/libws2help.a \
-@LIBARM64_TRUE@	libarm64/libwscsvc.a libarm64/libwshbth.a \
-@LIBARM64_TRUE@	libarm64/libwsock32.a libarm64/libwtsapi32.a \
-@LIBARM64_TRUE@	libarm64/libxaudio2_8.a libarm64/libxinput1_4.a
+@LIBARM64_TRUE@	libarm64/liboleacc.a libarm64/liboleaut32.a \
+@LIBARM64_TRUE@	libarm64/liboledlg.a libarm64/libosuninst.a \
+@LIBARM64_TRUE@	libarm64/libp2p.a libarm64/libp2pgraph.a \
+@LIBARM64_TRUE@	libarm64/libpcwum.a libarm64/libperfctrs.a \
+@LIBARM64_TRUE@	libarm64/libperfdisk.a libarm64/libperfnet.a \
+@LIBARM64_TRUE@	libarm64/libperfos.a libarm64/libperfproc.a \
+@LIBARM64_TRUE@	libarm64/libperfts.a libarm64/libphotowiz.a \
+@LIBARM64_TRUE@	libarm64/libpsapi.a libarm64/libpstorec.a \
+@LIBARM64_TRUE@	libarm64/libqutil.a libarm64/libqwave.a \
+@LIBARM64_TRUE@	libarm64/librasadhlp.a libarm64/librasauto.a \
+@LIBARM64_TRUE@	libarm64/libraschap.a libarm64/librasctrs.a \
+@LIBARM64_TRUE@	libarm64/librasmontr.a libarm64/librasmxs.a \
+@LIBARM64_TRUE@	libarm64/librasser.a libarm64/librastapi.a \
+@LIBARM64_TRUE@	libarm64/librdpcfgex.a libarm64/libregapi.a \
+@LIBARM64_TRUE@	libarm64/libregsvc.a libarm64/libresutils.a \
+@LIBARM64_TRUE@	libarm64/libriched20.a libarm64/librnr20.a \
+@LIBARM64_TRUE@	libarm64/librpcns4.a libarm64/librpcrt4.a \
+@LIBARM64_TRUE@	libarm64/librpcss.a libarm64/librsaenh.a \
+@LIBARM64_TRUE@	libarm64/librtutils.a libarm64/libsamcli.a \
+@LIBARM64_TRUE@	libarm64/libscarddlg.a libarm64/libscesrv.a \
+@LIBARM64_TRUE@	libarm64/libschannel.a libarm64/libschedcli.a \
+@LIBARM64_TRUE@	libarm64/libscrobj.a libarm64/libscrrun.a \
+@LIBARM64_TRUE@	libarm64/libsdhcinst.a libarm64/libseclogon.a \
+@LIBARM64_TRUE@	libarm64/libsecur32.a libarm64/libsecurity.a \
+@LIBARM64_TRUE@	libarm64/libsensapi.a libarm64/libsens.a \
+@LIBARM64_TRUE@	libarm64/libserialui.a libarm64/libserwvdrv.a \
+@LIBARM64_TRUE@	libarm64/libshfolder.a libarm64/libshimgvw.a \
+@LIBARM64_TRUE@	libarm64/libshsvcs.a libarm64/libsisbkup.a \
+@LIBARM64_TRUE@	libarm64/libslcext.a libarm64/libslwga.a \
+@LIBARM64_TRUE@	libarm64/libsnmpapi.a libarm64/libsoftpub.a \
+@LIBARM64_TRUE@	libarm64/libsqlsrv32.a libarm64/libsrvcli.a \
+@LIBARM64_TRUE@	libarm64/libsrvsvc.a libarm64/libsspicli.a \
+@LIBARM64_TRUE@	libarm64/libstreamci.a libarm64/libsxs.a \
+@LIBARM64_TRUE@	libarm64/libt2embed.a libarm64/libtapi32.a \
+@LIBARM64_TRUE@	libarm64/libtapiperf.a libarm64/libtbs.a \
+@LIBARM64_TRUE@	libarm64/libtdh.a libarm64/libtraffic.a \
+@LIBARM64_TRUE@	libarm64/libtsbyuv.a libarm64/libtxfw32.a \
+@LIBARM64_TRUE@	libarm64/libumdmxfrm.a libarm64/libunimdmat.a \
+@LIBARM64_TRUE@	libarm64/libuniplat.a libarm64/libupnp.a \
+@LIBARM64_TRUE@	libarm64/liburl.a libarm64/libuser32.a \
+@LIBARM64_TRUE@	libarm64/libusp10.a libarm64/libutildll.a \
+@LIBARM64_TRUE@	libarm64/libvirtdisk.a libarm64/libw32time.a \
+@LIBARM64_TRUE@	libarm64/libw32topl.a libarm64/libwdigest.a \
+@LIBARM64_TRUE@	libarm64/libwebclnt.a libarm64/libwecapi.a \
+@LIBARM64_TRUE@	libarm64/libwevtapi.a libarm64/libwiashext.a \
+@LIBARM64_TRUE@	libarm64/libwinhttp.a libarm64/libwininet.a \
+@LIBARM64_TRUE@	libarm64/libwinmm.a libarm64/libwinrnr.a \
+@LIBARM64_TRUE@	libarm64/libwinspool.a libarm64/libwinsrv.a \
+@LIBARM64_TRUE@	libarm64/libwinusb.a libarm64/libwkscli.a \
+@LIBARM64_TRUE@	libarm64/libwkssvc.a libarm64/libwlanapi.a \
+@LIBARM64_TRUE@	libarm64/libwlanui.a libarm64/libwlanutil.a \
+@LIBARM64_TRUE@	libarm64/libwldap32.a libarm64/libwmi.a \
+@LIBARM64_TRUE@	libarm64/libwmiprop.a libarm64/libwpd_ci.a \
+@LIBARM64_TRUE@	libarm64/libws2help.a libarm64/libwscsvc.a \
+@LIBARM64_TRUE@	libarm64/libwshbth.a libarm64/libwsock32.a \
+@LIBARM64_TRUE@	libarm64/libwtsapi32.a libarm64/libxaudio2_8.a \
+@LIBARM64_TRUE@	libarm64/libxinput1_4.a
 
 # Don't compile these, but install as is:
 #
diff --git a/mingw-w64-crt/lib64/oleaut32.def b/mingw-w64-crt/lib-common/oleaut32.def.in
similarity index 93%
rename from mingw-w64-crt/lib64/oleaut32.def
rename to mingw-w64-crt/lib-common/oleaut32.def.in
index e7a1c29..55618a8 100644
--- a/mingw-w64-crt/lib64/oleaut32.def
+++ b/mingw-w64-crt/lib-common/oleaut32.def.in
@@ -1,8 +1,5 @@
-;
-; Definition file of OLEAUT32.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008
-;
+#include "func.def.in"
+
 LIBRARY "OLEAUT32.dll"
 EXPORTS
 SysAllocString
@@ -147,14 +144,14 @@
 VarAdd
 VarAnd
 VarDiv
-BSTR_UserFree64
-BSTR_UserMarshal64
+F_64(BSTR_UserFree64)
+F_64(BSTR_UserMarshal64)
 DispCallFunc
 VariantChangeTypeEx
 SafeArrayPtrOfIndex
 SysStringByteLen
 SysAllocStringByteLen
-BSTR_UserSize64
+F_64(BSTR_UserSize64)
 VarEqv
 VarIdiv
 VarImp
@@ -303,9 +300,10 @@
 LPSAFEARRAY_Unmarshal
 VarDecCmpR8
 VarCyAdd
-BSTR_UserUnmarshal64
+F_64(BSTR_UserUnmarshal64)
 DllCanUnloadNow
 DllGetClassObject
+OACreateTypeLib2
 VarCyMul
 VarCyMulI4
 VarCySub
@@ -327,11 +325,11 @@
 DllUnregisterServer
 GetRecordInfoFromGuids
 GetRecordInfoFromTypeInfo
-LPSAFEARRAY_UserFree64
+F_64(LPSAFEARRAY_UserFree64)
 SetVarConversionLocaleSetting
 GetVarConversionLocaleSetting
 SetOaNoCache
-LPSAFEARRAY_UserMarshal64
+F_64(LPSAFEARRAY_UserMarshal64)
 VarCyMulI8
 VarDateFromUdate
 VarUdateFromDate
@@ -353,13 +351,13 @@
 VarI2FromUI8
 VarI4FromI8
 VarI4FromUI8
-LPSAFEARRAY_UserSize64
-LPSAFEARRAY_UserUnmarshal64
+F_64(LPSAFEARRAY_UserSize64)
+F_64(LPSAFEARRAY_UserUnmarshal64)
 OACreateTypeLib2
-VARIANT_UserFree64
-VARIANT_UserMarshal64
-VARIANT_UserSize64
-VARIANT_UserUnmarshal64
+F_64(VARIANT_UserFree64)
+F_64(VARIANT_UserMarshal64)
+F_64(VARIANT_UserSize64)
+F_64(VARIANT_UserUnmarshal64)
 VarR4FromI8
 VarR4FromUI8
 VarR8FromI8
diff --git a/mingw-w64-crt/libarm32/oleaut32.def b/mingw-w64-crt/libarm32/oleaut32.def
deleted file mode 100644
index f3a8478..0000000
--- a/mingw-w64-crt/libarm32/oleaut32.def
+++ /dev/null
@@ -1,407 +0,0 @@
-;
-; Definition file of OLEAUT32.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
-LIBRARY "OLEAUT32.dll"
-EXPORTS
-SysAllocString
-SysReAllocString
-SysAllocStringLen
-SysReAllocStringLen
-SysFreeString
-SysStringLen
-VariantInit
-VariantClear
-VariantCopy
-VariantCopyInd
-VariantChangeType
-VariantTimeToDosDateTime
-DosDateTimeToVariantTime
-SafeArrayCreate
-SafeArrayDestroy
-SafeArrayGetDim
-SafeArrayGetElemsize
-SafeArrayGetUBound
-SafeArrayGetLBound
-SafeArrayLock
-SafeArrayUnlock
-SafeArrayAccessData
-SafeArrayUnaccessData
-SafeArrayGetElement
-SafeArrayPutElement
-SafeArrayCopy
-DispGetParam
-DispGetIDsOfNames
-DispInvoke
-CreateDispTypeInfo
-CreateStdDispatch
-RegisterActiveObject
-RevokeActiveObject
-GetActiveObject
-SafeArrayAllocDescriptor
-SafeArrayAllocData
-SafeArrayDestroyDescriptor
-SafeArrayDestroyData
-SafeArrayRedim
-SafeArrayAllocDescriptorEx
-SafeArrayCreateEx
-SafeArrayCreateVectorEx
-SafeArraySetRecordInfo
-SafeArrayGetRecordInfo
-VarParseNumFromStr
-VarNumFromParseNum
-VarI2FromUI1
-VarI2FromI4
-VarI2FromR4
-VarI2FromR8
-VarI2FromCy
-VarI2FromDate
-VarI2FromStr
-VarI2FromDisp
-VarI2FromBool
-SafeArraySetIID
-VarI4FromUI1
-VarI4FromI2
-VarI4FromR4
-VarI4FromR8
-VarI4FromCy
-VarI4FromDate
-VarI4FromStr
-VarI4FromDisp
-VarI4FromBool
-SafeArrayGetIID
-VarR4FromUI1
-VarR4FromI2
-VarR4FromI4
-VarR4FromR8
-VarR4FromCy
-VarR4FromDate
-VarR4FromStr
-VarR4FromDisp
-VarR4FromBool
-SafeArrayGetVartype
-VarR8FromUI1
-VarR8FromI2
-VarR8FromI4
-VarR8FromR4
-VarR8FromCy
-VarR8FromDate
-VarR8FromStr
-VarR8FromDisp
-VarR8FromBool
-VarFormat
-VarDateFromUI1
-VarDateFromI2
-VarDateFromI4
-VarDateFromR4
-VarDateFromR8
-VarDateFromCy
-VarDateFromStr
-VarDateFromDisp
-VarDateFromBool
-VarFormatDateTime
-VarCyFromUI1
-VarCyFromI2
-VarCyFromI4
-VarCyFromR4
-VarCyFromR8
-VarCyFromDate
-VarCyFromStr
-VarCyFromDisp
-VarCyFromBool
-VarFormatNumber
-VarBstrFromUI1
-VarBstrFromI2
-VarBstrFromI4
-VarBstrFromR4
-VarBstrFromR8
-VarBstrFromCy
-VarBstrFromDate
-VarBstrFromDisp
-VarBstrFromBool
-VarFormatPercent
-VarBoolFromUI1
-VarBoolFromI2
-VarBoolFromI4
-VarBoolFromR4
-VarBoolFromR8
-VarBoolFromDate
-VarBoolFromCy
-VarBoolFromStr
-VarBoolFromDisp
-VarFormatCurrency
-VarWeekdayName
-VarMonthName
-VarUI1FromI2
-VarUI1FromI4
-VarUI1FromR4
-VarUI1FromR8
-VarUI1FromCy
-VarUI1FromDate
-VarUI1FromStr
-VarUI1FromDisp
-VarUI1FromBool
-VarFormatFromTokens
-VarTokenizeFormatString
-VarAdd
-VarAnd
-VarDiv
-DispCallFunc
-VariantChangeTypeEx
-SafeArrayPtrOfIndex
-SysStringByteLen
-SysAllocStringByteLen
-VarEqv
-VarIdiv
-VarImp
-VarMod
-VarMul
-VarOr
-VarPow
-VarSub
-CreateTypeLib
-LoadTypeLib
-LoadRegTypeLib
-RegisterTypeLib
-QueryPathOfRegTypeLib
-LHashValOfNameSys
-LHashValOfNameSysA
-VarXor
-VarAbs
-VarFix
-OaBuildVersion
-ClearCustData
-VarInt
-VarNeg
-VarNot
-VarRound
-VarCmp
-VarDecAdd
-VarDecDiv
-VarDecMul
-CreateTypeLib2
-VarDecSub
-VarDecAbs
-LoadTypeLibEx
-SystemTimeToVariantTime
-VariantTimeToSystemTime
-UnRegisterTypeLib
-VarDecFix
-VarDecInt
-VarDecNeg
-VarDecFromUI1
-VarDecFromI2
-VarDecFromI4
-VarDecFromR4
-VarDecFromR8
-VarDecFromDate
-VarDecFromCy
-VarDecFromStr
-VarDecFromDisp
-VarDecFromBool
-GetErrorInfo
-SetErrorInfo
-CreateErrorInfo
-VarDecRound
-VarDecCmp
-VarI2FromI1
-VarI2FromUI2
-VarI2FromUI4
-VarI2FromDec
-VarI4FromI1
-VarI4FromUI2
-VarI4FromUI4
-VarI4FromDec
-VarR4FromI1
-VarR4FromUI2
-VarR4FromUI4
-VarR4FromDec
-VarR8FromI1
-VarR8FromUI2
-VarR8FromUI4
-VarR8FromDec
-VarDateFromI1
-VarDateFromUI2
-VarDateFromUI4
-VarDateFromDec
-VarCyFromI1
-VarCyFromUI2
-VarCyFromUI4
-VarCyFromDec
-VarBstrFromI1
-VarBstrFromUI2
-VarBstrFromUI4
-VarBstrFromDec
-VarBoolFromI1
-VarBoolFromUI2
-VarBoolFromUI4
-VarBoolFromDec
-VarUI1FromI1
-VarUI1FromUI2
-VarUI1FromUI4
-VarUI1FromDec
-VarDecFromI1
-VarDecFromUI2
-VarDecFromUI4
-VarI1FromUI1
-VarI1FromI2
-VarI1FromI4
-VarI1FromR4
-VarI1FromR8
-VarI1FromDate
-VarI1FromCy
-VarI1FromStr
-VarI1FromDisp
-VarI1FromBool
-VarI1FromUI2
-VarI1FromUI4
-VarI1FromDec
-VarUI2FromUI1
-VarUI2FromI2
-VarUI2FromI4
-VarUI2FromR4
-VarUI2FromR8
-VarUI2FromDate
-VarUI2FromCy
-VarUI2FromStr
-VarUI2FromDisp
-VarUI2FromBool
-VarUI2FromI1
-VarUI2FromUI4
-VarUI2FromDec
-VarUI4FromUI1
-VarUI4FromI2
-VarUI4FromI4
-VarUI4FromR4
-VarUI4FromR8
-VarUI4FromDate
-VarUI4FromCy
-VarUI4FromStr
-VarUI4FromDisp
-VarUI4FromBool
-VarUI4FromI1
-VarUI4FromUI2
-VarUI4FromDec
-BSTR_UserSize
-BSTR_UserMarshal
-BSTR_UserUnmarshal
-BSTR_UserFree
-VARIANT_UserSize
-VARIANT_UserMarshal
-VARIANT_UserUnmarshal
-VARIANT_UserFree
-LPSAFEARRAY_UserSize
-LPSAFEARRAY_UserMarshal
-LPSAFEARRAY_UserUnmarshal
-LPSAFEARRAY_UserFree
-LPSAFEARRAY_Size
-LPSAFEARRAY_Marshal
-LPSAFEARRAY_Unmarshal
-VarDecCmpR8
-VarCyAdd
-OACreateTypeLib2
-VarCyMul
-VarCyMulI4
-VarCySub
-VarCyAbs
-VarCyFix
-VarCyInt
-VarCyNeg
-VarCyRound
-VarCyCmp
-VarCyCmpR8
-VarBstrCat
-VarBstrCmp
-VarR8Pow
-VarR4CmpR8
-VarR8Round
-VarCat
-VarDateFromUdateEx
-GetRecordInfoFromGuids
-GetRecordInfoFromTypeInfo
-SetVarConversionLocaleSetting
-GetVarConversionLocaleSetting
-SetOaNoCache
-VarCyMulI8
-VarDateFromUdate
-VarUdateFromDate
-GetAltMonthNames
-VarI8FromUI1
-VarI8FromI2
-VarI8FromR4
-VarI8FromR8
-VarI8FromCy
-VarI8FromDate
-VarI8FromStr
-VarI8FromDisp
-VarI8FromBool
-VarI8FromI1
-VarI8FromUI2
-VarI8FromUI4
-VarI8FromDec
-VarI2FromI8
-VarI2FromUI8
-VarI4FromI8
-VarI4FromUI8
-VarR4FromI8
-VarR4FromUI8
-VarR8FromI8
-VarR8FromUI8
-VarDateFromI8
-VarDateFromUI8
-VarCyFromI8
-VarCyFromUI8
-VarBstrFromI8
-VarBstrFromUI8
-VarBoolFromI8
-VarBoolFromUI8
-VarUI1FromI8
-VarUI1FromUI8
-VarDecFromI8
-VarDecFromUI8
-VarI1FromI8
-VarI1FromUI8
-VarUI2FromI8
-VarUI2FromUI8
-OleLoadPictureEx
-OleLoadPictureFileEx
-SafeArrayCreateVector
-SafeArrayCopyData
-VectorFromBstr
-BstrFromVector
-OleIconToCursor
-OleCreatePropertyFrameIndirect
-OleCreatePropertyFrame
-OleLoadPicture
-OleCreatePictureIndirect
-OleCreateFontIndirect
-OleTranslateColor
-OleLoadPictureFile
-OleSavePictureFile
-OleLoadPicturePath
-VarUI4FromI8
-VarUI4FromUI8
-VarI8FromUI8
-VarUI8FromI8
-VarUI8FromUI1
-VarUI8FromI2
-VarUI8FromR4
-VarUI8FromR8
-VarUI8FromCy
-VarUI8FromDate
-VarUI8FromStr
-VarUI8FromDisp
-VarUI8FromBool
-VarUI8FromI1
-VarUI8FromUI2
-VarUI8FromUI4
-VarUI8FromDec
-RegisterTypeLibForUser
-UnRegisterTypeLibForUser
-OaEnablePerUserTLibRegistration
-HWND_UserFree
-HWND_UserMarshal
-HWND_UserSize
-HWND_UserUnmarshal
-OACleanup
diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am
index 9c79671..a1759a8 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -175,6 +175,7 @@
 libarm64_DATA += %reldir%/libodbccp32.a
 libarm64_DATA += %reldir%/libole32.a
 libarm64_DATA += %reldir%/liboleacc.a
+libarm64_DATA += %reldir%/liboleaut32.a
 libarm64_DATA += %reldir%/liboledlg.a
 libarm64_DATA += %reldir%/libosuninst.a
 libarm64_DATA += %reldir%/libp2p.a