REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1740

The DebugLib instances of DebugPortProtocol use a global
variable "mExitBootServicesEvent" which is in conflict with
the same variable in StatusCodeHandlerRuntimeDxe.inf.
That would cause a build error through GCC5. So change the
name to the "mDebugLibExitBootServicesEvent".

Cc: Michael D Kinney <michael.d.kin...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Cc: Dandan Bi <dandan...@intel.com>
Signed-off-by: Zhichao Gao <zhichao....@intel.com>
---
 .../UefiDebugLibDebugPortProtocol/DebugLibConstructor.c       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLibConstructor.c 
b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLibConstructor.c
index ed2cb70c21..f4c4a7d1e7 100644
--- a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLibConstructor.c
+++ b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLibConstructor.c
@@ -17,7 +17,7 @@
 //
 BOOLEAN     mPostEBS = FALSE;
 
-EFI_EVENT   mExitBootServicesEvent;
+EFI_EVENT   mDebugLibExitBootServicesEvent;
 
 //
 // Pointer to SystemTable
@@ -70,7 +70,7 @@ DxeDebugLibConstructor(
               ExitBootServicesCallback,
               NULL,
               &gEfiEventExitBootServicesGuid,
-              &mExitBootServicesEvent
+              &mDebugLibExitBootServicesEvent
               );
 
   return EFI_SUCCESS;
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#39387): https://edk2.groups.io/g/devel/message/39387
Mute This Topic: https://groups.io/mt/31305237/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to