crt: Move pdh to lib-common Required for python-psutil Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com> Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/mingw-w64-crt/libarm32/pdh.def b/mingw-w64-crt/lib-common/pdh.def similarity index 91% rename from mingw-w64-crt/libarm32/pdh.def rename to mingw-w64-crt/lib-common/pdh.def index 8bb340c..5434425 100644 --- a/mingw-w64-crt/libarm32/pdh.def +++ b/mingw-w64-crt/lib-common/pdh.def
@@ -1,19 +1,15 @@ ; ; Definition file of pdh.dll ; Automatic generated by gendef -; written by Kai Tietz 2008-2014 +; written by Kai Tietz 2008 ; LIBRARY "pdh.dll" EXPORTS -PdhAdd009CounterA -PdhAdd009CounterW PdhAddCounterA PdhAddCounterW PdhAddEnglishCounterA PdhAddEnglishCounterW PdhAddRelogCounter -PdhAddV1Counter -PdhAddV2Counter PdhBindInputDataSourceA PdhBindInputDataSourceW PdhBrowseCountersA @@ -72,15 +68,12 @@ PdhGetFormattedCounterArrayW PdhGetFormattedCounterValue PdhGetLogFileSize -PdhGetLogFileTypeA PdhGetLogFileTypeW PdhGetLogSetGUID PdhGetRawCounterArrayA PdhGetRawCounterArrayW PdhGetRawCounterValue PdhIsRealTimeQuery -PdhListLogFileHeaderA -PdhListLogFileHeaderW PdhLookupPerfIndexByNameA PdhLookupPerfIndexByNameW PdhLookupPerfNameByIndexA @@ -98,7 +91,6 @@ PdhParseInstanceNameA PdhParseInstanceNameW PdhReadRawLogRecord -PdhRelogA PdhRelogW PdhRemoveCounter PdhResetRelogCounterValues @@ -109,9 +101,7 @@ PdhSetDefaultRealTimeDataSource PdhSetLogSetRunID PdhSetQueryTimeRange -PdhTranslate009CounterA PdhTranslate009CounterW -PdhTranslateLocaleCounterA PdhTranslateLocaleCounterW PdhUpdateLogA PdhUpdateLogFileCatalog
diff --git a/mingw-w64-crt/lib64/pdh.def b/mingw-w64-crt/lib64/pdh.def deleted file mode 100644 index 0c81e55..0000000 --- a/mingw-w64-crt/lib64/pdh.def +++ /dev/null
@@ -1,173 +0,0 @@ -; -; Definition file of pdh.dll -; Automatic generated by gendef -; written by Kai Tietz 2008 -; -LIBRARY "pdh.dll" -EXPORTS -PdhPlaGetLogFileNameA -DllInstall -PdhAdd009CounterA -PdhAdd009CounterW -PdhAddCounterA -PdhAddCounterW -PdhAddEnglishCounterA -PdhAddEnglishCounterW -PdhBindInputDataSourceA -PdhBindInputDataSourceW -PdhBrowseCountersA -PdhBrowseCountersHA -PdhBrowseCountersHW -PdhBrowseCountersW -PdhCalculateCounterFromRawValue -PdhCloseLog -PdhCloseQuery -PdhCollectQueryData -PdhCollectQueryDataEx -PdhCollectQueryDataWithTime -PdhComputeCounterStatistics -PdhConnectMachineA -PdhConnectMachineW -PdhCreateSQLTablesA -PdhCreateSQLTablesW -PdhEnumLogSetNamesA -PdhEnumLogSetNamesW -PdhEnumMachinesA -PdhEnumMachinesHA -PdhEnumMachinesHW -PdhEnumMachinesW -PdhEnumObjectItemsA -PdhEnumObjectItemsHA -PdhEnumObjectItemsHW -PdhEnumObjectItemsW -PdhEnumObjectsA -PdhEnumObjectsHA -PdhEnumObjectsHW -PdhEnumObjectsW -PdhExpandCounterPathA -PdhExpandCounterPathW -PdhExpandWildCardPathA -PdhExpandWildCardPathHA -PdhExpandWildCardPathHW -PdhExpandWildCardPathW -PdhFormatFromRawValue -PdhGetCounterInfoA -PdhGetCounterInfoW -PdhGetCounterTimeBase -PdhGetDataSourceTimeRangeA -PdhGetDataSourceTimeRangeH -PdhGetDataSourceTimeRangeW -PdhGetDefaultPerfCounterA -PdhGetDefaultPerfCounterHA -PdhGetDefaultPerfCounterHW -PdhGetDefaultPerfCounterW -PdhGetDefaultPerfObjectA -PdhGetDefaultPerfObjectHA -PdhGetDefaultPerfObjectHW -PdhGetDefaultPerfObjectW -PdhGetDllVersion -PdhGetExplainText -PdhGetFormattedCounterArrayA -PdhGetFormattedCounterArrayW -PdhGetFormattedCounterValue -PdhGetLogFileSize -PdhGetLogFileTypeA -PdhGetLogFileTypeW -PdhGetLogSetGUID -PdhGetRawCounterArrayA -PdhGetRawCounterArrayW -PdhGetRawCounterValue -PdhIsRealTimeQuery -PdhListLogFileHeaderA -PdhListLogFileHeaderW -PdhLookupPerfIndexByNameA -PdhLookupPerfIndexByNameW -PdhLookupPerfNameByIndexA -PdhLookupPerfNameByIndexW -PdhMakeCounterPathA -PdhMakeCounterPathW -PdhOpenLogA -PdhOpenLogW -PdhOpenQuery -PdhOpenQueryA -PdhOpenQueryH -PdhOpenQueryW -PdhParseCounterPathA -PdhParseCounterPathW -PdhParseInstanceNameA -PdhParseInstanceNameW -PdhPlaAddItemA -PdhPlaAddItemW -PdhPlaCreateA -PdhPlaCreateW -PdhPlaDeleteA -PdhPlaDeleteW -PdhPlaDowngradeW -PdhPlaEnumCollectionsA -PdhPlaEnumCollectionsW -PdhPlaGetInfoA -PdhPlaGetInfoW -PdhPlaGetLogFileNameW -PdhPlaGetScheduleA -PdhPlaGetScheduleW -PdhPlaRemoveAllItemsA -PdhPlaRemoveAllItemsW -PdhPlaScheduleA -PdhPlaScheduleW -PdhPlaSetInfoA -PdhPlaSetInfoW -PdhPlaSetItemListA -PdhPlaSetItemListW -PdhPlaSetRunAsA -PdhPlaSetRunAsW -PdhPlaStartA -PdhPlaStartW -PdhPlaStopA -PdhPlaStopW -PdhPlaUpgradeW -PdhPlaValidateInfoA -PdhPlaValidateInfoW -PdhReadRawLogRecord -PdhRelogA -PdhRelogW -PdhRemoveCounter -PdhSelectDataSourceA -PdhSelectDataSourceW -PdhSetCounterScaleFactor -PdhSetDefaultRealTimeDataSource -PdhSetLogSetRunID -PdhSetQueryTimeRange -PdhTranslate009CounterA -PdhTranslate009CounterW -PdhTranslateLocaleCounterA -PdhTranslateLocaleCounterW -PdhUpdateLogA -PdhUpdateLogFileCatalog -PdhUpdateLogW -PdhValidatePathA -PdhValidatePathExA -PdhValidatePathExW -PdhValidatePathW -PdhVbAddCounter -PdhVbCreateCounterPathList -PdhVbGetCounterPathElements -PdhVbGetCounterPathFromList -PdhVbGetDoubleCounterValue -PdhVbGetLogFileSize -PdhVbGetOneCounterPath -PdhVbIsGoodStatus -PdhVbOpenLog -PdhVbOpenQuery -PdhVbUpdateLog -PdhVerifySQLDBA -PdhVerifySQLDBW -PdhiPla2003SP1Installed -PdhiPlaDowngrade -PdhiPlaFormatBlanksA -PdhiPlaFormatBlanksW -PdhiPlaGetVersion -PdhiPlaRunAs -PdhiPlaSetRunAs -PdhiPlaUpgrade -PlaTimeInfoToMilliSeconds -PdhpGetLoggerName
diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am index 07a8968..6b91cc1 100644 --- a/mingw-w64-crt/libarm64/Makefile.am +++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -223,6 +223,7 @@ libarm64_DATA += %reldir%/libp2pgraph.a libarm64_DATA += %reldir%/libpathcch.a libarm64_DATA += %reldir%/libpcwum.a +libarm64_DATA += %reldir%/libpdh.a libarm64_DATA += %reldir%/libperfctrs.a libarm64_DATA += %reldir%/libperfdisk.a libarm64_DATA += %reldir%/libperfnet.a