From 124969632baca7860874beab946d30431c062f58 Mon Sep 17 00:00:00 2001
From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 15 Jun 2010 02:46:49 +0000
Subject: [PATCH] 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
---
 .../PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c            | 1 +
 .../Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c         | 1 +
 EdkCompatibilityPkg/Foundation/Include/EfiPerf.h              | 4 ++++
 .../Foundation/Library/Dxe/EfiDriverLib/Perf.c                | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c b/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c
index 5b5416dc2a..699b120759 100644
--- a/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk/PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk.c
@@ -213,6 +213,7 @@ ReportDispatcher (
 
 **/
 EFI_STATUS
+EFIAPI
 SmmStatusCodeHandler (
   IN EFI_STATUS_CODE_TYPE     CodeType,
   IN EFI_STATUS_CODE_VALUE    Value,
diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
index fd4e8f6084..f1c3c38bd4 100644
--- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
@@ -21,6 +21,7 @@ Abstract:
 #include "CpuIA32.h"
 
 VOID
+EFIAPI
 EfiCpuVersion (
   IN  OUT UINT16  *FamilyId,    OPTIONAL
   IN  OUT UINT8   *Model,       OPTIONAL
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h b/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
index 8dd5f5deb5..cdc10b027b 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiPerf.h
@@ -25,6 +25,7 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (Performance)
 
 EFI_STATUS
+EFIAPI
 InitializePerformanceInfrastructure (
   IN EFI_HANDLE         ImageHandle,
   IN EFI_SYSTEM_TABLE   *SystemTable,
@@ -50,6 +51,7 @@ Returns:
 ;
 
 EFI_STATUS
+EFIAPI
 EndMeasure (
   IN EFI_HANDLE       Handle,
   IN UINT16           *Token,
@@ -77,6 +79,7 @@ Returns:
 ;
 
 EFI_STATUS
+EFIAPI
 StartMeasure (
   IN EFI_HANDLE       Handle,
   IN UINT16           *Token,
@@ -104,6 +107,7 @@ Returns:
 ;
 
 EFI_STATUS
+EFIAPI
 UpdateMeasure (
   IN EFI_HANDLE      Handle,
   IN UINT16          *Token,
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
index 96f11bb44d..b8809d18b6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
@@ -590,6 +590,7 @@ Returns:
 // Driver entry point
 //
 EFI_STATUS
+EFIAPI
 InitializePerformanceInfrastructure (
   IN EFI_HANDLE           ImageHandle,
   IN EFI_SYSTEM_TABLE     *SystemTable,
@@ -649,6 +650,7 @@ Returns:
 
 
 EFI_STATUS
+EFIAPI
 StartMeasure (
   EFI_HANDLE          Handle,
   IN UINT16           *Token,
@@ -688,6 +690,7 @@ Returns:
 
 
 EFI_STATUS
+EFIAPI
 EndMeasure (
   EFI_HANDLE          Handle,
   IN UINT16           *Token,
@@ -726,6 +729,7 @@ Returns:
 
 
 EFI_STATUS
+EFIAPI
 UpdateMeasure (
   EFI_HANDLE         Handle,
   IN UINT16          *Token,
-- 
2.39.5