Clean ECP for build failure.

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

6 files changed, 15 insertions, 11 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
index 32014095e7..c475cef82e 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h
@@ -27,7 +27,7 @@ Revision History
 //#include "pci23.h"

 //#include "pci30.h"

 

-#pragma pack(push, 1)

+#pragma pack(1)

 

 typedef struct {

   UINT8 Register;

@@ -59,6 +59,6 @@ typedef union {
   EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt;

 } EFI_PCI_ROM_HEADER;

 

-#pragma pack(pop)

+#pragma pack()

 

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
index ea89f5658b..212d1e002d 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h
@@ -57,7 +57,7 @@ Abstract:
 //

 // Set structure alignment to 1-byte

 //

-#pragma pack (push, 1)

+#pragma pack (1)

 

 typedef UINT32                     TCG_EVENTTYPE;

 

@@ -139,6 +139,6 @@ typedef struct tdEFI_VARIABLE_DATA {
 //

 // Restore original structure alignment

 //

-#pragma pack (pop)

+#pragma pack ()

 

 #endif  // _EFI_TPM_H_

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
index bf484a7541..ecaece1d1c 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h
@@ -28,7 +28,7 @@ Abstract:
 //

 // Define MP table structures. All are packed.

 //

-#pragma pack(push, 1)

+#pragma pack(1)

 

 #define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE  EFI_SIGNATURE_32 ('_', 'M', 'P', '_')

 typedef struct {

@@ -278,6 +278,6 @@ typedef struct {
   UINT32  PredefinedRangeList;

 } EFI_LEGACY_MP_TABLE_ENTRY_EXT_COMPAT_BUS_ADDR_SPACE_MODIFIER;

 

-#pragma pack(pop)

+#pragma pack()

 

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
index 77aebb69e6..f047e629bc 100644
--- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
+++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h
@@ -35,7 +35,7 @@ Revision History
 //

 #define PCI_VGA_PALETTE_SNOOP_DISABLED  0x20

 

-#pragma pack(push, 1)

+#pragma pack(1)

 typedef struct {

   UINT16  VendorId;

   UINT16  DeviceId;

@@ -544,7 +544,7 @@ typedef struct {
 #define PCI_BAR_IDX5        0x05

 #define PCI_BAR_ALL         0xFF

 

-#pragma pack(pop)

+#pragma pack()

 

 //

 // NOTE: The following header files are included here for

diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h
index 1a9219b377..446cea4f69 100644
--- 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

 #define PCI_CLASS_MASS_STORAGE_AHCI      PCI_CLASS_MASS_STORAGE_SATADPA

 

-#pragma pack(push, 1)

+#pragma pack(1)

 

 typedef struct {

   UINT32  Signature;    // "PCIR"

@@ -47,6 +47,6 @@ typedef struct {
   UINT16  DMTFCLPEntryPointOffset;

 } PCI_3_0_DATA_STRUCTURE;

 

-#pragma pack(pop)

+#pragma pack()

 

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
index 75ccf10511..c0180e72b2 100644
--- 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.

 //

 #define EFI_DEADLOOP()    { volatile int __iii; __iii = 1; while (__iii); }

-#define EFI_BREAKPOINT()  __debugbreak()

+#if _MSC_EXTENSIONS 

+  #define EFI_BREAKPOINT()  __debugbreak()

+#elif __GNUC__

+  #define EFI_BREAKPOINT() asm("   int $3");

+#endif

 

 //

 // Memory Fence forces serialization, and is needed to support out of order