Forcing functions with variable argument lists to use the same calling convention...

This fixes boot issues when using GCC 4.4 in X64 modules.

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

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
index 627d8762a147831a821ee23fea6f4540e48cfdff..e8ee5c55464fa7ae8039d668ce2bb08d4be9753b 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
@@ -29,6 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 CHAR16 *\r
+EFIAPI\r
 CatPrint (\r
   IN OUT POOL_PRINT   *Str,\r
   IN CHAR16           *Fmt,\r

diff --git a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c
index cdaae8785bae9ec412615911c28b0ae12fb03dd0..cf21cc7a21eca64b392638da2668256c4bb84d20 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c
+++ b/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c
@@ -80,6 +80,7 @@ PushU64 (
 \r
 **/\r
 UINT64\r
+EFIAPI\r
 EbcInterpret (\r
   UINT64      Arg1,\r
   ...\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Print.c b/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
index 1f97ed43b67cc8e13b868785a3fc7f9d10cb896c..941d0958f99e062c0461b1a5c7bfd38ea4e1ff8d 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
@@ -145,6 +145,7 @@ PrintInternal (
 \r
 **/\r
 UINTN\r
+EFIAPI\r
 ConsolePrint (\r
   IN CHAR16   *Fmt,\r
   ...\r
@@ -206,6 +207,7 @@ PrintChar (
 \r
 **/\r
 UINTN\r
+EFIAPI\r
 PrintAt (\r
   IN UINTN     Column,\r
   IN UINTN     Row,\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 51d6b882b75902aef89837243e7758bda8396735..5239b44caa4a6987b46c2a643f475a8c04af1e12 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -633,6 +633,7 @@ PrintChar (
 \r
 **/\r
 UINTN\r
+EFIAPI\r
 PrintAt (\r
   IN UINTN     Column,\r
   IN UINTN     Row,\r
@@ -800,6 +801,7 @@ CreateSharedPopUp (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateDialog (\r
   IN  UINTN                       NumberOfLines,\r
   IN  BOOLEAN                     HotKey,\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index fecb0248bd15f4e973422b88d6bcdfdb9b34aed4..0d3c1ebce8f3e7c88339e268ee6397c928b40645 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -678,6 +678,7 @@ UiAddMenuOption (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateDialog (\r
   IN  UINTN                       NumberOfLines,\r
   IN  BOOLEAN                     HotKey,\r
@@ -978,6 +979,7 @@ CreateSharedPopUp (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 CreateMultiStringPopUp (\r
   IN  UINTN                       RequestedWidth,\r
   IN  UINTN                       NumberOfLines,\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
index cdd661ca9913c0a25690d31fe99c0414d341f9a4..362f8e7d6001e4c19c63988ea4bf031a54a238f0 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -389,6 +389,7 @@ UiWaitForSingleEvent (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 CreateMultiStringPopUp (\r
   IN  UINTN                       ScreenWidth,\r
   IN  UINTN                       NumberOfLines,\r