3 files changed, 4 insertions, 23 deletions
diff --git a/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.S b/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.S
deleted file mode 100644
index 5306448..0000000
--- a/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.S
+++ /dev/null
@@ -1,15 +0,0 @@
-# UINT16
-# EFIAPI
-# InternalSyncCompareExchange16 (
-#   IN      volatile UINT16           *Value,
-#   IN      UINT16                    CompareValue,
-#   IN      UINT16                    ExchangeValue
-#   );
-ASM_GLOBAL ASM_PFX(InternalSyncCompareExchange16)
-ASM_PFX(InternalSyncCompareExchange16):
-  mov 4(%esp), %ecx
-  mov 8(%esp), %eax
-  mov 12(%esp), %edx
-  lock
-  cmpxchgw %dx, (%ecx)
-  ret
diff --git a/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.asm b/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.nasm
index adcfbd0..d45582d 100644
--- a/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.asm
+++ b/OvmfPkg/XenBusDxe/Ia32/InterlockedCompareExchange16.nasm
@@ -21,9 +21,7 @@
 ;
 ;------------------------------------------------------------------------------
 
-    .486
-    .model  flat,C
-    .code
+    SECTION .text
 
 ;------------------------------------------------------------------------------
 ; UINT32
@@ -34,12 +32,11 @@
 ;   IN      UINT16                    ExchangeValue
 ;   );
 ;------------------------------------------------------------------------------
-InternalSyncCompareExchange16   PROC
+global ASM_PFX(InternalSyncCompareExchange16)
+ASM_PFX(InternalSyncCompareExchange16):
     mov     ecx, [esp + 4]
     mov     eax, [esp + 8]
     mov     edx, [esp + 12]
     lock    cmpxchg [ecx], dx
     ret
-InternalSyncCompareExchange16   ENDP
 
-    END
diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.inf b/OvmfPkg/XenBusDxe/XenBusDxe.inf
index 2478e35..292e488 100644
--- a/OvmfPkg/XenBusDxe/XenBusDxe.inf
+++ b/OvmfPkg/XenBusDxe/XenBusDxe.inf
@@ -50,8 +50,7 @@
 
 [Sources.IA32]
   Ia32/hypercall.nasm
-  Ia32/InterlockedCompareExchange16.S
-  Ia32/InterlockedCompareExchange16.asm
+  Ia32/InterlockedCompareExchange16.nasm
   Ia32/TestAndClearBit.S
   Ia32/TestAndClearBit.asm