MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol

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

Rename the global variable mAcpiS3Enable to mS3BootScriptAcpiS3Enable
to avoid duplicate symbol errors from CLANGPDB tool change when
PiDxeS3BootScriptLib from the MdeModulePkg is linked with PiSmmCpuDxeSmm
from the UefiCpuPkg.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
index 9315fc9f0188680b716956e3ced097a7a7bb61b9..9cdf47552162aa66b39cff0cbb2c51f25d0f93cc 100644 (file)
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
@@ -1,7 +1,7 @@
 /** @file\r
   Save the S3 data to S3 boot script.\r
 \r
-  Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -124,7 +124,7 @@ VOID                             *mRegistrationSmmReadyToLock = NULL;
 BOOLEAN                          mS3BootScriptTableAllocated = FALSE;\r
 BOOLEAN                          mS3BootScriptTableSmmAllocated = FALSE;\r
 EFI_SMM_SYSTEM_TABLE2            *mBootScriptSmst = NULL;\r
-BOOLEAN                          mAcpiS3Enable = TRUE;\r
+BOOLEAN                          mS3BootScriptAcpiS3Enable = TRUE;\r
 \r
 /**\r
   This is an internal function to add a terminate node the entry, recalculate the table\r
@@ -438,7 +438,7 @@ S3BootScriptLibInitialize (
   EFI_PHYSICAL_ADDRESS           Buffer;\r
 \r
   if (!PcdGetBool (PcdAcpiS3Enable)) {\r
-    mAcpiS3Enable = FALSE;\r
+    mS3BootScriptAcpiS3Enable = FALSE;\r
     DEBUG ((DEBUG_INFO, "%a: Skip S3BootScript because ACPI S3 disabled.\n", gEfiCallerBaseName));\r
     return RETURN_SUCCESS;\r
   }\r
@@ -569,7 +569,7 @@ S3BootScriptLibDeinitialize (
 {\r
   EFI_STATUS                Status;\r
 \r
-  if (!mAcpiS3Enable) {\r
+  if (!mS3BootScriptAcpiS3Enable) {\r
     return RETURN_SUCCESS;\r
   }\r
 \r
@@ -821,7 +821,7 @@ S3BootScriptGetEntryAddAddress (
 {\r
   UINT8*                         NewEntryPtr;\r
 \r
-  if (!mAcpiS3Enable) {\r
+  if (!mS3BootScriptAcpiS3Enable) {\r
     return NULL;\r
   }\r
 \r
@@ -2410,4 +2410,3 @@ S3BootScriptCompare (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r