From 19e2bfe8f001d8dd093c5e87016decdc39d7eaa3 Mon Sep 17 00:00:00 2001 From: jljusten Date: Tue, 15 Jun 2010 02:46:22 +0000 Subject: [PATCH] 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 --- .../IA32/MpFuncs.S | 11 ++++++----- .../X64/MpFuncs.S | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S index 4da7fd5011..1c52ed3bdc 100644 --- a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S +++ b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/IA32/MpFuncs.S @@ -16,11 +16,12 @@ .equ NotVacantFlag, 0xff .equ LockLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart -.equ StackStart, LockLocation + 0x04 -.equ StackSize, LockLocation + 0x08 -.equ RendezvousProc, LockLocation + 0x0C -.equ GdtrProfile, LockLocation + 0x10 -.equ BufferStart, LockLocation + 0x18 +.equ StackStart, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x04 +.equ StackSize, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x08 +.equ RendezvousProc, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x0C +.equ GdtrProfile, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x10 +.equ IdtrProfile, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x16 +.equ BufferStart, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x1C #------------------------------------------------------------------------------------- #RendezvousFunnelProc procedure follows. All APs execute their procedure. This diff --git a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S index 2c9feb07b0..8efd2d183e 100644 --- a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S +++ b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/X64/MpFuncs.S @@ -21,8 +21,9 @@ .equ StackSizeLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x10 .equ CProcedureLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x18 .equ GdtrLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x20 -.equ BufferStartLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x2C -.equ Cr3OffsetLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x30 +.equ IdtrLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x2A +.equ BufferStartLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x34 +.equ Cr3OffsetLocation, RendezvousFunnelProcEnd - RendezvousFunnelProcStart + 0x38 #------------------------------------------------------------------------------------- -- 2.39.2