EdkCompatibilityPkg: Fix EFIAPI usage inconsistencies

These inconsistencies cause a build error for GCC 4.4 X64.

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

diff --git a/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c b/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c
index 5b5416dc2a244c42eba5c9a98a3ee417c7e056d9..699b120759d25da4460c3048a5bbe1f1cb865029 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c
@@ -213,6 +213,7 @@ ReportDispatcher (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SmmStatusCodeHandler (\r
   IN EFI_STATUS_CODE_TYPE     CodeType,\r
   IN EFI_STATUS_CODE_VALUE    Value,\r

diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
index fd4e8f60842841b40c3fafa538800d1f71dddbea..f1c3c38bd4b857cd807fe60858ceb3ae9702e9f0 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
@@ -21,6 +21,7 @@ Abstract:
 #include "CpuIA32.h"\r
 \r
 VOID\r
+EFIAPI\r
 EfiCpuVersion (\r
   IN  OUT UINT16  *FamilyId,    OPTIONAL\r
   IN  OUT UINT8   *Model,       OPTIONAL\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h b/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
index 8dd5f5deb5cc1616ac1b9c4b0740b1037674dee8..cdc10b027bcc690e0676655178c7b74577503de6 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
@@ -25,6 +25,7 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (Performance)\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 InitializePerformanceInfrastructure (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable,\r
@@ -50,6 +51,7 @@ Returns:
 ;\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EndMeasure (\r
   IN EFI_HANDLE       Handle,\r
   IN UINT16           *Token,\r
@@ -77,6 +79,7 @@ Returns:
 ;\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 StartMeasure (\r
   IN EFI_HANDLE       Handle,\r
   IN UINT16           *Token,\r
@@ -104,6 +107,7 @@ Returns:
 ;\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 UpdateMeasure (\r
   IN EFI_HANDLE      Handle,\r
   IN UINT16          *Token,\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
index 96f11bb44d76e32280610a7ac5ca11298fc48f5c..b8809d18b6dfd783fe1f8612ff0b11bdf0ada22d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
@@ -590,6 +590,7 @@ Returns:
 // Driver entry point\r
 //\r
 EFI_STATUS\r
+EFIAPI\r
 InitializePerformanceInfrastructure (\r
   IN EFI_HANDLE           ImageHandle,\r
   IN EFI_SYSTEM_TABLE     *SystemTable,\r
@@ -649,6 +650,7 @@ Returns:
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 StartMeasure (\r
   EFI_HANDLE          Handle,\r
   IN UINT16           *Token,\r
@@ -688,6 +690,7 @@ Returns:
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EndMeasure (\r
   EFI_HANDLE          Handle,\r
   IN UINT16           *Token,\r
@@ -726,6 +729,7 @@ Returns:
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 UpdateMeasure (\r
   EFI_HANDLE         Handle,\r
   IN UINT16          *Token,\r