Clean ECP for build failure.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
index c302cf56f0dc02e765d48d61894e24a03d2602a5..0078082b7d09fd42e973220c201ebf01e436b898 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
@@ -20,13 +20,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // This structure is only intended to be used in this file.\r
 //\r
-#pragma pack(push, 1)\r
+#pragma pack(1)\r
 typedef struct {\r
   EFI_HII_PACK_HEADER            PackageHeader;\r
   FRAMEWORK_EFI_IFR_FORM_SET     FormSet;\r
   FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet;\r
 } FW_HII_FORMSET_TEMPLATE;\r
-#pragma pack(pop)\r
+#pragma pack()\r
 \r
 FW_HII_FORMSET_TEMPLATE FormSetTemplate = {\r
   {\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
index d9b6577adf047077cdc8cede546f32157e42e606..6b7810eb9236ef16517f17fa5c480b886ec0795c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
@@ -64,12 +64,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define FRAMEWORK_RESERVED_VARSTORE_ID 0x0001\r
 \r
 \r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 typedef struct {\r
   EFI_HII_PACK_HEADER     FrameworkPackageHeader;\r
   EFI_HII_PACKAGE_HEADER  PackageHeader;\r
 } TIANO_AUTOGEN_PACKAGES_HEADER;\r
-#pragma pack (pop)\r
+#pragma pack ()\r
 \r
 #define HII_THUNK_PRIVATE_DATA_FROM_THIS(Record)  CR(Record, HII_THUNK_PRIVATE_DATA, Hii, HII_THUNK_PRIVATE_DATA_SIGNATURE)\r
 #define HII_THUNK_PRIVATE_DATA_SIGNATURE            EFI_SIGNATURE_32 ('H', 'i', 'I', 'T')\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
index 494a31dc539477b9533a50d89a01695e27838bba..3187a941601a826e4d0ffcc5d93fdec422a74100 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
@@ -22,6 +22,9 @@ BOOLEAN mInFrameworkHiiRemovePack = FALSE;
 BOOLEAN mInFrameworkUpdatePakcage = FALSE;\r
 UINT64  mGuidCount = 0;\r
 \r
+EFI_GUID mGuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};\r
+\r
+\r
 \r
 /**\r
   Get the number of package IFR and STRING packages in the package list passed in.\r
@@ -357,9 +360,7 @@ GenerateRandomGuid (
   OUT           EFI_GUID * Guid\r
   )\r
 {\r
-  EFI_GUID        GuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};\r
-\r
-  CopyGuid (Guid, &GuidBase);\r
+  CopyGuid (Guid, &mGuidBase);\r
 \r
   mGuidCount++;  \r
   *((UINT64 *) Guid) = *((UINT64 *) Guid) + mGuidCount;\r

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h
index 4e2f661c5120c512183a2b945ffd654e9780ee2a..da96b1df72e960ca9410c4dcc07181514dc3e3e6 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h
@@ -35,7 +35,7 @@ Abstract:
     0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \\r
   }\r
 \r
-#pragma pack(push, 1)\r
+#pragma pack(1)\r
 \r
 typedef struct {\r
   UINT8 Type;\r
@@ -43,7 +43,7 @@ typedef struct {
   UINT8 Length[2];\r
 } EFI_DEVICE_PATH_PROTOCOL;\r
 \r
-#pragma pack(pop)\r
+#pragma pack()\r
 \r
 #define EFI_END_ENTIRE_DEVICE_PATH            0xff\r
 #define EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE    0xff\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
index 32014095e7a70bddfd4a5477febf650180cb8214..c475cef82e2b2bb06956bdeda0c8714aaecf5e08 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
@@ -27,7 +27,7 @@ Revision History
 //#include "pci23.h"\r
 //#include "pci30.h"\r
 \r
-#pragma pack(push, 1)\r
+#pragma pack(1)\r
 \r
 typedef struct {\r
   UINT8 Register;\r
@@ -59,6 +59,6 @@ typedef union {
   EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt;\r
 } EFI_PCI_ROM_HEADER;\r
 \r
-#pragma pack(pop)\r
+#pragma pack()\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
index ea89f5658b4312ad75b28c81ba57d26bdbe5b3ae..212d1e002dabd94d362b3485dacfd7f460a10cd3 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
@@ -57,7 +57,7 @@ Abstract:
 //\r
 // Set structure alignment to 1-byte\r
 //\r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 \r
 typedef UINT32                     TCG_EVENTTYPE;\r
 \r
@@ -139,6 +139,6 @@ typedef struct tdEFI_VARIABLE_DATA {
 //\r
 // Restore original structure alignment\r
 //\r
-#pragma pack (pop)\r
+#pragma pack ()\r
 \r
 #endif  // _EFI_TPM_H_\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
index bf484a75418d1f6b9194c31213388cd011d9f648..ecaece1d1cd388b9c54ea7748c40a1265332dd4b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
@@ -28,7 +28,7 @@ Abstract:
 //\r
 // Define MP table structures. All are packed.\r
 //\r
-#pragma pack(push, 1)\r
+#pragma pack(1)\r
 \r
 #define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE  EFI_SIGNATURE_32 ('_', 'M', 'P', '_')\r
 typedef struct {\r
@@ -278,6 +278,6 @@ typedef struct {
   UINT32  PredefinedRangeList;\r
 } EFI_LEGACY_MP_TABLE_ENTRY_EXT_COMPAT_BUS_ADDR_SPACE_MODIFIER;\r
 \r
-#pragma pack(pop)\r
+#pragma pack()\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
index 77aebb69e66d0a165e9667411922c34e154e753b..f047e629bc2a377db4129b07f6e62912859dfebd 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
@@ -35,7 +35,7 @@ Revision History
 //\r
 #define PCI_VGA_PALETTE_SNOOP_DISABLED  0x20\r
 \r
-#pragma pack(push, 1)\r
+#pragma pack(1)\r
 typedef struct {\r
   UINT16  VendorId;\r
   UINT16  DeviceId;\r
@@ -544,7 +544,7 @@ typedef struct {
 #define PCI_BAR_IDX5        0x05\r
 #define PCI_BAR_ALL         0xFF\r
 \r
-#pragma pack(pop)\r
+#pragma pack()\r
 \r
 //\r
 // NOTE: The following header files are included here for\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h
index 1a9219b3777e345be3fd5231f0afbc282145f473..446cea4f699f454596790cd3848b7241bfaa7550 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h
@@ -28,7 +28,7 @@ Revision History
 #define PCI_CLASS_MASS_STORAGE_SATADPA   0x06\r
 #define PCI_CLASS_MASS_STORAGE_AHCI      PCI_CLASS_MASS_STORAGE_SATADPA\r
 \r
-#pragma pack(push, 1)\r
+#pragma pack(1)\r
 \r
 typedef struct {\r
   UINT32  Signature;    // "PCIR"\r
@@ -47,6 +47,6 @@ typedef struct {
   UINT16  DMTFCLPEntryPointOffset;\r
 } PCI_3_0_DATA_STRUCTURE;\r
 \r
-#pragma pack(pop)\r
+#pragma pack()\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
index 75ccf10511e97bb87397403dd7f4732e3c7ca021..c0180e72b2f343ad4cf198fc2d217d3392af1bbf 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
@@ -189,7 +189,11 @@ typedef int64_t   intn_t;
 // Inject a break point in the code to assist debugging.\r
 //\r
 #define EFI_DEADLOOP()    { volatile int __iii; __iii = 1; while (__iii); }\r
-#define EFI_BREAKPOINT()  __debugbreak()\r
+#if _MSC_EXTENSIONS \r
+  #define EFI_BREAKPOINT()  __debugbreak()\r
+#elif __GNUC__\r
+  #define EFI_BREAKPOINT() asm("   int $3");\r
+#endif\r
 \r
 //\r
 // Memory Fence forces serialization, and is needed to support out of order\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
index 80247ec6d5375b660d38183f662e5977f14bb919..2e0ea5ee5a6a03afbb0c6c9aa7504f9ce75bb047 100644 (file)
--- 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 \r
 \r
 [Sources.IPF]\r
-  SynchronizationMsc.c\r
-  Math64.c\r
   Ipf/asm.h\r
   Ipf/ia_64gen.h\r
   Ipf/PalCallStatic.s\r
@@ -570,7 +568,6 @@ COMPONENT_TYPE  = LIBRARY
   Ipf/longjmp.s\r
   Ipf/SwitchStack.s\r
   Ipf/Unaligned.c\r
-  Ipf/CpuBreakpoint.c\r
   Ipf/InterlockedCompareExchange32.s\r
   Ipf/InterlockedCompareExchange64.s\r
   Ipf/Synchronization.c\r
@@ -589,7 +586,13 @@ COMPONENT_TYPE  = LIBRARY
   Ipf/ExecFc.s\r
   Ipf/ReadCpuid.s\r
   Ipf/AccessGp.s\r
-  \r
+  Math64.c\r
+  Ipf/CpuBreakpoint.c   | INTEL\r
+  Ipf/CpuBreakpoint.c   | MSFT\r
+  Synchronization.c     | INTEL \r
+  SynchronizationMsc.c  | MSFT \r
+  SynchronizationGcc.c  | GCC \r
+\r
 [sources.ebc]\r
   Math64.c\r
   Unaligned.c\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s
index 4606437117f31d3b3963e499186e0c00081a7a58..6aa0640f21ba88ca8d4d04924ca9b8bcd72fd29a 100644 (file)
--- 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)
   //\r
   // check if RNAT is saved between saved BSP and curr BSPSTORE\r
   //\r
-  dep    r18 = 1,r16,3,6   // get RNAT address\r
+  dep    r18 = -1,r16,3,6   // get RNAT address\r
   ;;\r
   cmp.ltu  p8,p9 = r18, r17  // RNAT saved on RSE\r
   ;;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
index 9bd77e24cabb666dd86b39c04aaf7af1e98f3efa..df247522f61ab92c4d9e85809838fb1b12ea8a0f 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
@@ -23,7 +23,7 @@ Abstract:
 #include "Thunk16Lib.h"\r
 #include "EfiCommonLib.h"\r
 \r
-#define IA32API __cdecl\r
+#define IA32API EFIAPI\r
 \r
 extern CONST UINTN                  mCode16Size;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
index de064649f85c95464f373ff63fee2d4dd808bc3c..aa104a79bf22d98a48737373930b095626c9f1ef 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
+++ b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
@@ -50,7 +50,7 @@ EFI_FORWARD_DECLARATION (EFI_TCG_PROTOCOL);
 //\r
 // Set structure alignment to 1-byte\r
 //\r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 \r
 typedef struct {\r
   UINT8  Major;\r
@@ -74,7 +74,7 @@ typedef UINT32   TCG_ALGORITHM_ID;
 //\r
 // Restore original structure alignment\r
 //\r
-#pragma pack (pop)\r
+#pragma pack ()\r
 \r
 typedef\r
 EFI_STATUS\r