ECP MpServicesOnFrameworkMpServicesThunk: Fix build with GCC

Add definitions for IdtrProfile (IA32) and IdtrLocation (X64) into
GCC assembly code files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10586 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S
index 4da7fd5011925c84b247486fb41a3859b37cf98b..1c52ed3bdca5b9ed3f631d1fcd632a2dc1cbc34e 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S
+++ b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S
@@ -16,11 +16,12 @@
 .equ                   NotVacantFlag,    0xff\r
 \r
 .equ                   LockLocation,     RendezvousFunnelProcEnd - RendezvousFunnelProcStart\r
 .equ                   NotVacantFlag,    0xff\r
 \r
 .equ                   LockLocation,     RendezvousFunnelProcEnd - RendezvousFunnelProcStart\r

-.equ                   StackStart,       LockLocation + 0x04\r
-.equ                   StackSize,        LockLocation + 0x08\r
-.equ                   RendezvousProc,   LockLocation + 0x0C\r
-.equ                   GdtrProfile,      LockLocation + 0x10\r
-.equ                   BufferStart,      LockLocation + 0x18\r
+.equ                   StackStart,       RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x04\r
+.equ                   StackSize,        RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x08\r
+.equ                   RendezvousProc,   RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x0C\r
+.equ                   GdtrProfile,      RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x10\r
+.equ                   IdtrProfile,      RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x16\r
+.equ                   BufferStart,      RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x1C\r

 \r
 #-------------------------------------------------------------------------------------\r
 #RendezvousFunnelProc  procedure follows. All APs execute their procedure. This\r
 \r
 #-------------------------------------------------------------------------------------\r
 #RendezvousFunnelProc  procedure follows. All APs execute their procedure. This\r

diff --git a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S
index 2c9feb07b05df4b0459fa398e0303d8c8a2743ec..8efd2d183ed73fd0a76828ed466f8201fe569849 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S
+++ b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S
@@ -21,8 +21,9 @@
 .equ                   StackSizeLocation,         RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x10\r
 .equ                   CProcedureLocation,        RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x18\r
 .equ                   GdtrLocation,              RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x20\r
 .equ                   StackSizeLocation,         RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x10\r
 .equ                   CProcedureLocation,        RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x18\r
 .equ                   GdtrLocation,              RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x20\r

-.equ                   BufferStartLocation,       RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x2C\r
-.equ                   Cr3OffsetLocation,         RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x30\r
+.equ                   IdtrLocation,              RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x2A\r
+.equ                   BufferStartLocation,       RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x34\r
+.equ                   Cr3OffsetLocation,         RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x38\r

 \r
 #-------------------------------------------------------------------------------------\r
 \r
 \r
 #-------------------------------------------------------------------------------------\r
 \r