From 88b6bcec9df37bff0ef2a7ef62b28cf80c39b219 Mon Sep 17 00:00:00 2001
From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 27 Nov 2008 07:58:15 +0000
Subject: Clean ECP for build failure.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6760 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf          | 11 +++++++----
 .../Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s                |  2 +-
 EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c     |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'EdkCompatibilityPkg/Foundation/Library')

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
index 80247ec6d5..2e0ea5ee5a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
@@ -561,8 +561,6 @@ COMPONENT_TYPE  = LIBRARY
   ChkStkGcc.c  | GCC 
 
 [Sources.IPF]
-  SynchronizationMsc.c
-  Math64.c
   Ipf/asm.h
   Ipf/ia_64gen.h
   Ipf/PalCallStatic.s
@@ -570,7 +568,6 @@ COMPONENT_TYPE  = LIBRARY
   Ipf/longjmp.s
   Ipf/SwitchStack.s
   Ipf/Unaligned.c
-  Ipf/CpuBreakpoint.c
   Ipf/InterlockedCompareExchange32.s
   Ipf/InterlockedCompareExchange64.s
   Ipf/Synchronization.c
@@ -589,7 +586,13 @@ COMPONENT_TYPE  = LIBRARY
   Ipf/ExecFc.s
   Ipf/ReadCpuid.s
   Ipf/AccessGp.s
-  
+  Math64.c
+  Ipf/CpuBreakpoint.c   | INTEL
+  Ipf/CpuBreakpoint.c   | MSFT
+  Synchronization.c     | INTEL 
+  SynchronizationMsc.c  | MSFT 
+  SynchronizationGcc.c  | GCC 
+
 [sources.ebc]
   Math64.c
   Unaligned.c
diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s
index 4606437117..6aa0640f21 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s
@@ -229,7 +229,7 @@ PROCEDURE_ENTRY(LongJump)
   //
   // check if RNAT is saved between saved BSP and curr BSPSTORE
   //
-  dep    r18 = 1,r16,3,6   // get RNAT address
+  dep    r18 = -1,r16,3,6   // get RNAT address
   ;;
   cmp.ltu  p8,p9 = r18, r17  // RNAT saved on RSE
   ;;
diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
index 9bd77e24ca..df247522f6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
@@ -23,7 +23,7 @@ Abstract:
 #include "Thunk16Lib.h"
 #include "EfiCommonLib.h"
 
-#define IA32API __cdecl
+#define IA32API EFIAPI
 
 extern CONST UINTN                  mCode16Size;
 
-- 
cgit v1.2.3