3 files changed, 11 insertions, 4 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
index a968f407b7..bcfdf7ee8e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
@@ -77,7 +77,14 @@ Returns:
   //
   // Put break point in module that contained the error.
   //
+#ifndef __GNUC__
   EFI_BREAKPOINT ();
+#else
+  //
+  // Bugbug: Need to fix a GNC style cpu break point
+  // 
+  EFI_DEADLOOP ();
+#endif
 }
 
 VOID
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
index 3d44562ecf..c9fb788807 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
@@ -140,7 +140,7 @@ GetImageEx (
     Status = gBS->HandleProtocol (
                ImageHandle,
                &gEfiLoadedImageProtocolGuid,
-               &LoadedImage
+               (VOID **) &LoadedImage
                );
     if (EFI_ERROR (Status)) {
       return Status;
@@ -152,7 +152,7 @@ GetImageEx (
                   #else
                     &gEfiFirmwareVolume2ProtocolGuid,
                   #endif
-                    &ImageFv
+                    (VOID **) &ImageFv
                     );
     if (!EFI_ERROR (Status)) {
       Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
index 55d1a1d14e..3ac8052a6c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
@@ -98,7 +98,7 @@ Returns:
   UINTN EndIndex;
 
   if (PdbFileName == NULL) {
-    EfiAsciiStrCpy (GaugeString, " ");
+    EfiAsciiStrCpy (GaugeString, (CHAR8 *)" ");
   } else {
     StartIndex = 0;
     for (EndIndex = 0; PdbFileName[EndIndex] != 0; EndIndex++)
@@ -229,7 +229,7 @@ GetNameFromHandle (
   CHAR8                       *PdbFileName;
   EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
 
-  EfiAsciiStrCpy (GaugeString, " ");
+  EfiAsciiStrCpy (GaugeString, (CHAR8 *)" ");
 
   //
   // Get handle name from image protocol