crt: Unify advpack.def for lib64 and libarm32

Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/libarm32/advpack.def b/mingw-w64-crt/lib-common/advpack.def
similarity index 93%
rename from mingw-w64-crt/libarm32/advpack.def
rename to mingw-w64-crt/lib-common/advpack.def
index 14b5335..2c9de94 100644
--- a/mingw-w64-crt/libarm32/advpack.def
+++ b/mingw-w64-crt/lib-common/advpack.def
@@ -1,8 +1,3 @@
-;
-; Definition file of ADVPACK.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
 LIBRARY "ADVPACK.dll"
 EXPORTS
 DelNodeRunDLL32
@@ -26,8 +21,10 @@
 CloseINFEngine
 DelNode
 DelNodeA
+DelNodeRunDLL32
 DelNodeRunDLL32W
 DelNodeW
+DoInfInstall
 ExecuteCab
 ExecuteCabA
 ExecuteCabW
@@ -37,6 +34,7 @@
 FileSaveMarkNotExist
 FileSaveMarkNotExistA
 FileSaveMarkNotExistW
+FileSaveRestore
 FileSaveRestoreOnINF
 FileSaveRestoreOnINFA
 FileSaveRestoreOnINFW
@@ -49,6 +47,7 @@
 GetVersionFromFileW
 IsNTAdmin
 LaunchINFSection
+LaunchINFSectionEx
 LaunchINFSectionExW
 LaunchINFSectionW
 NeedReboot
@@ -71,6 +70,7 @@
 RegSaveRestoreOnINFA
 RegSaveRestoreOnINFW
 RegSaveRestoreW
+RegisterOCX
 RunSetupCommand
 RunSetupCommandA
 RunSetupCommandW
diff --git a/mingw-w64-crt/lib64/advpack.def b/mingw-w64-crt/lib64/advpack.def
deleted file mode 100644
index 6e9bf14..0000000
--- a/mingw-w64-crt/lib64/advpack.def
+++ /dev/null
@@ -1,40 +0,0 @@
-; 
-; Exports of file ADVPACK.dll
-;
-; Autogenerated by gen_exportdef
-; Written by Kai Tietz, 2007
-;
-LIBRARY ADVPACK.dll
-EXPORTS
-AddDelBackupEntry
-AdvInstallFile
-CloseINFEngine
-DelNode
-DelNodeRunDLL32
-DllMain
-DoInfInstall
-ExecuteCab
-ExtractFiles
-FileSaveMarkNotExist
-FileSaveRestore
-FileSaveRestoreOnINF
-GetVersionFromFile
-GetVersionFromFileEx
-IsNTAdmin
-LaunchINFSection
-LaunchINFSectionEx
-NeedReboot
-NeedRebootInit
-OpenINFEngine
-RebootCheckOnInstall
-RegInstall
-RegRestoreAll
-RegSaveRestore
-RegSaveRestoreOnINF
-RegisterOCX
-RunSetupCommand
-SetPerUserSecValues
-TranslateInfString
-TranslateInfStringEx
-UserInstStubWrapper
-UserUnInstStubWrapper