From 0ef5e70f77641fb8723eace7aa3aa9e8fc87cfeb Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbap...@gmail.com>
Date: Thu, 6 Jun 2024 14:22:30 +0000
Subject: [PATCH] crt: Unify winhvplatform.def for lib64 and libarm64
Signed-off-by: Biswapriyo Nath <nathbap...@gmail.com>
---
mingw-w64-crt/Makefile.am | 4 ++--
.../winhvplatform.def.in} | 18 ++++++++++--------
mingw-w64-crt/libarm64/Makefile.am | 1 +
3 files changed, 13 insertions(+), 10 deletions(-)
rename mingw-w64-crt/{lib64/winhvplatform.def =>
lib-common/winhvplatform.def.in} (78%)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 0c702b6..b95f1df 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1513,7 +1513,7 @@ processed_defs += lib64/msvcrt.def lib64/msvcr80.def
lib64/msvcr80d.def lib64/ms
lib64/msvcr100.def lib64/msvcr110.def
lib64/msvcr120.def lib64/msvcr120d.def \
lib64/msvcr120_app.def lib64/msvcp120_app.def
lib64/ucrtbase.def \
lib64/advapi32.def lib64/clbcatq.def
lib64/kernel32.def lib64/ole32.def \
- lib64/oleaut32.def lib64/user32.def
lib64/ws2_32.def \
+ lib64/oleaut32.def lib64/user32.def
lib64/winhvplatform.def lib64/ws2_32.def \
lib64/api-ms-win-crt-math-l1-1-0.def
lib64/api-ms-win-crt-private-l1-1-0.def lib64/api-ms-win-crt-runtime-l1-1-0.def
\
lib64/api-ms-win-crt-filesystem-l1-1-0.def
lib64/api-ms-win-crt-time-l1-1-0.def \
lib64/vcruntime140_app.def
@@ -2155,7 +2155,7 @@ libarm64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM64)
$(sysincludes)
processed_defs += libarm64/msvcrt.def libarm64/ucrtbase.def \
libarm64/advapi32.def libarm64/clbcatq.def
libarm64/kernel32.def libarm64/ole32.def libarm64/oleaut32.def \
- libarm64/user32.def libarm64/ws2_32.def \
+ libarm64/user32.def
libarm64/winhvplatform.def libarm64/ws2_32.def \
libarm64/api-ms-win-crt-math-l1-1-0.def
libarm64/api-ms-win-crt-private-l1-1-0.def
libarm64/api-ms-win-crt-runtime-l1-1-0.def \
libarm64/api-ms-win-crt-filesystem-l1-1-0.def
libarm64/api-ms-win-crt-time-l1-1-0.def \
libarm64/vcruntime140_app.def
diff --git a/mingw-w64-crt/lib64/winhvplatform.def
b/mingw-w64-crt/lib-common/winhvplatform.def.in
similarity index 78%
rename from mingw-w64-crt/lib64/winhvplatform.def
rename to mingw-w64-crt/lib-common/winhvplatform.def.in
index 4be84a5..4afc0ce 100644
--- a/mingw-w64-crt/lib64/winhvplatform.def
+++ b/mingw-w64-crt/lib-common/winhvplatform.def.in
@@ -1,3 +1,5 @@
+#include "func.def.in"
+
LIBRARY "winhvplatform.dll"
EXPORTS
WHvAcceptPartitionMigration
@@ -18,16 +20,16 @@ WHvDeleteTrigger
WHvDeleteVirtualProcessor
WHvDeleteVpciDevice
WHvGetCapability
-WHvGetInterruptTargetVpSet
+F_X64(WHvGetInterruptTargetVpSet)
WHvGetPartitionCounters
WHvGetPartitionProperty
WHvGetVirtualProcessorCounters
-WHvGetVirtualProcessorCpuidOutput
-WHvGetVirtualProcessorInterruptControllerState
-WHvGetVirtualProcessorInterruptControllerState2
+F_X64(WHvGetVirtualProcessorCpuidOutput)
+F_X64(WHvGetVirtualProcessorInterruptControllerState)
+F_X64(WHvGetVirtualProcessorInterruptControllerState2)
WHvGetVirtualProcessorRegisters
WHvGetVirtualProcessorState
-WHvGetVirtualProcessorXsaveState
+F_X64(WHvGetVirtualProcessorXsaveState)
WHvGetVpciDeviceInterruptTarget
WHvGetVpciDeviceNotification
WHvGetVpciDeviceProperty
@@ -48,11 +50,11 @@ WHvRetargetVpciDeviceInterrupt
WHvRunVirtualProcessor
WHvSetNotificationPortProperty
WHvSetPartitionProperty
-WHvSetVirtualProcessorInterruptControllerState
-WHvSetVirtualProcessorInterruptControllerState2
+F_X64(WHvSetVirtualProcessorInterruptControllerState)
+F_X64(WHvSetVirtualProcessorInterruptControllerState2)
WHvSetVirtualProcessorRegisters
WHvSetVirtualProcessorState
-WHvSetVirtualProcessorXsaveState
+F_X64(WHvSetVirtualProcessorXsaveState)
WHvSetVpciDevicePowerState
WHvSetupPartition
WHvSignalVirtualProcessorSynicEvent
diff --git a/mingw-w64-crt/libarm64/Makefile.am
b/mingw-w64-crt/libarm64/Makefile.am
index 96a3416..4f3803f 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -353,6 +353,7 @@ libarm64_DATA += %reldir%/libwindows.networking.a
libarm64_DATA += %reldir%/libwindowsapp.a
libarm64_DATA += %reldir%/libwindowscoreheadless_apiset.a
libarm64_DATA += %reldir%/libwinhttp.a
+libarm64_DATA += %reldir%/libwinhvplatform.a
libarm64_DATA += %reldir%/libwininet.a
libarm64_DATA += %reldir%/libwinmm.a
libarm64_DATA += %reldir%/libwinrnr.a
--
2.45.2
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
