Add compiler hint of "GLOBAL_REMOVE_IF_UNREFERENCED" to prevent component name structures linked into final image if PcdComponentNameDisabled or PcdComponentName2Disabled is set to TRUE.

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

43 files changed, 182 insertions, 182 deletions

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
index f4d5562a99..f93a23a88e 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
@@ -16,20 +16,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gIsaBusComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIsaBusComponentName = {

   IsaBusComponentNameGetDriverName,

   IsaBusComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gIsaBusComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIsaBusComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) IsaBusComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) IsaBusComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mIsaBusDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c
index 961c764d72..f0df4f0494 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/ComponentName.c
@@ -17,20 +17,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gIsaFloppyComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIsaFloppyComponentName = {

   IsaFloppyComponentNameGetDriverName,

   IsaFloppyComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gIsaFloppyComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIsaFloppyComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) IsaFloppyComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) IsaFloppyComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mIsaFloppyDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c
index 4534b53729..b070d8c086 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c
@@ -17,20 +17,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gIsaSerialComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIsaSerialComponentName = {

   IsaSerialComponentNameGetDriverName,

   IsaSerialComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gIsaSerialComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIsaSerialComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) IsaSerialComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) IsaSerialComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mIsaSerialDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
index 8168665321..183d09ed55 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
@@ -146,20 +146,20 @@ Ps2KeyboardComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gPs2KeyboardComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPs2KeyboardComponentName = {

   Ps2KeyboardComponentNameGetDriverName,

   Ps2KeyboardComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gPs2KeyboardComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPs2KeyboardComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ps2KeyboardComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ps2KeyboardComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mPs2KeyboardDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
index 57d8fe23f8..ea416dcbf1 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
@@ -16,20 +16,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gPs2MouseComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPs2MouseComponentName = {

   Ps2MouseComponentNameGetDriverName,

   Ps2MouseComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ps2MouseComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ps2MouseComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mPs2MouseDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c
index 611eb3d6ee..45622a4d46 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.c
@@ -15,20 +15,20 @@
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gIDEBusComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIDEBusComponentName = {

   IDEBusComponentNameGetDriverName,

   IDEBusComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gIDEBusComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIDEBusComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) IDEBusComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) IDEBusComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mIDEBusDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.c
index 9320909654..00943d9f27 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/ComponentName.c
@@ -16,20 +16,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gPciBusComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPciBusComponentName = {

   PciBusComponentNameGetDriverName,

   PciBusComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PciBusComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PciBusComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mPciBusDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c
index 3fc158611a..6878827691 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/ComponentName.c
@@ -146,20 +146,20 @@ PciVgaMiniPortComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gPciVgaMiniPortComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPciVgaMiniPortComponentName = {

   PciVgaMiniPortComponentNameGetDriverName,

   PciVgaMiniPortComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gPciVgaMiniPortComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPciVgaMiniPortComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PciVgaMiniPortComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PciVgaMiniPortComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mPciVgaMiniPortDriverNameTable[] = {

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c
index d8bde9132c..6b23763c2d 100644
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/ComponentName.c
@@ -16,20 +16,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gVgaClassComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gVgaClassComponentName = {

   VgaClassComponentNameGetDriverName,

   VgaClassComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gVgaClassComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gVgaClassComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) VgaClassComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) VgaClassComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mVgaClassDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/ComponentName.c b/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/ComponentName.c
index 940b037bf2..32daf0c4ac 100644
--- a/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/ComponentName.c
@@ -16,20 +16,20 @@
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gAtapiScsiPassThruComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gAtapiScsiPassThruComponentName = {

   AtapiScsiPassThruComponentNameGetDriverName,

   AtapiScsiPassThruComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gAtapiScsiPassThruComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gAtapiScsiPassThruComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) AtapiScsiPassThruComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) AtapiScsiPassThruComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mAtapiScsiPassThruDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c b/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
index 8d533bbf91..d55606a716 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
@@ -155,20 +155,20 @@ EhciComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gEhciComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gEhciComponentName = {

   EhciComponentNameGetDriverName,

   EhciComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gEhciComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEhciComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EhciComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EhciComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mEhciDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c b/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c
index bd2c3465f8..353b657ed4 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c
@@ -153,20 +153,20 @@ UhciComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gUhciComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gUhciComponentName = {

   UhciComponentNameGetDriverName,

   UhciComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gUhciComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUhciComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UhciComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UhciComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mUhciDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
index c66f9b6b7b..8b318410fc 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
@@ -42,20 +42,20 @@ Abstract:
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gScsiBusComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gScsiBusComponentName = {

   ScsiBusComponentNameGetDriverName,

   ScsiBusComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gScsiBusComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gScsiBusComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ScsiBusComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ScsiBusComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mScsiBusDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
index 48411e0914..3816abfa2e 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
@@ -38,20 +38,20 @@ Abstract:
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gScsiDiskComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gScsiDiskComponentName = {

   ScsiDiskComponentNameGetDriverName,

   ScsiDiskComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gScsiDiskComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gScsiDiskComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ScsiDiskComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ScsiDiskComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mScsiDiskDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
index ed9e405157..cb200aa032 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
@@ -158,20 +158,20 @@ UsbBusComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  mUsbBusComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  mUsbBusComponentName = {

   UsbBusComponentNameGetDriverName,

   UsbBusComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL mUsbBusComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL mUsbBusComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UsbBusComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UsbBusComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mUsbBusDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c
index 2701194793..0be3f729c4 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c
@@ -154,20 +154,20 @@ UsbKeyboardComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gUsbKeyboardComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gUsbKeyboardComponentName = {

   UsbKeyboardComponentNameGetDriverName,

   UsbKeyboardComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gUsbKeyboardComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUsbKeyboardComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UsbKeyboardComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UsbKeyboardComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mUsbKeyboardDriverNameTable[] = {

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
index be890c5b52..66874e8dca 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
@@ -156,20 +156,20 @@ UsbMassStorageGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gUsbMassStorageComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gUsbMassStorageComponentName = {

   UsbMassStorageGetDriverName,

   UsbMassStorageGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gUsbMassStorageComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUsbMassStorageComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UsbMassStorageGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UsbMassStorageGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c
index 892b0dab6f..ecfe64d551 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c
@@ -154,20 +154,20 @@ UsbMouseComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gUsbMouseComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gUsbMouseComponentName = {

   UsbMouseComponentNameGetDriverName,

   UsbMouseComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gUsbMouseComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUsbMouseComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UsbMouseComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UsbMouseComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
index 9a34e418e2..6010f22bd5 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
@@ -27,20 +27,20 @@ Abstract:
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gConPlatformComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gConPlatformComponentName = {

   ConPlatformComponentNameGetDriverName,

   ConPlatformComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gConPlatformComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConPlatformComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConPlatformComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConPlatformComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mConPlatformDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
index 20dba84ef2..6a458436e4 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
@@ -22,77 +22,77 @@ Abstract:
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gConSplitterConInComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gConSplitterConInComponentName = {

   ConSplitterComponentNameGetDriverName,

   ConSplitterConInComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConInComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConInComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterConInComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gConSplitterSimplePointerComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gConSplitterSimplePointerComponentName = {

   ConSplitterComponentNameGetDriverName,

   ConSplitterSimplePointerComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterSimplePointerComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterSimplePointerComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterSimplePointerComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gConSplitterConOutComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gConSplitterConOutComponentName = {

   ConSplitterComponentNameGetDriverName,

   ConSplitterConOutComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConOutComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterConOutComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterConOutComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gConSplitterStdErrComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gConSplitterStdErrComponentName = {

   ConSplitterComponentNameGetDriverName,

   ConSplitterStdErrComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ConSplitterComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ConSplitterStdErrComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mConSplitterDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
index 465acab052..7c458baa2c 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
@@ -22,20 +22,20 @@ Abstract:
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gGraphicsConsoleComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gGraphicsConsoleComponentName = {

   GraphicsConsoleComponentNameGetDriverName,

   GraphicsConsoleComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gGraphicsConsoleComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gGraphicsConsoleComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) GraphicsConsoleComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) GraphicsConsoleComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mGraphicsConsoleDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
index 7e99b0188a..5bcc85b5b7 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
@@ -22,20 +22,20 @@ Abstract:
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gTerminalComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gTerminalComponentName = {

   TerminalComponentNameGetDriverName,

   TerminalComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gTerminalComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gTerminalComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) TerminalComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) TerminalComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mTerminalDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c b/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
index 775961412c..e6a5248b18 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
@@ -22,7 +22,7 @@ Abstract:
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gDebugPortComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gDebugPortComponentName = {

   DebugPortComponentNameGetDriverName,

   DebugPortComponentNameGetControllerName,

   "eng"

@@ -31,7 +31,7 @@ EFI_COMPONENT_NAME_PROTOCOL  gDebugPortComponentName = {
 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gDebugPortComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDebugPortComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DebugPortComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DebugPortComponentNameGetControllerName,

   "en"

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
index 96fee5cb5f..e957212f27 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
@@ -17,20 +17,20 @@
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gDiskIoComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gDiskIoComponentName = {

   DiskIoComponentNameGetDriverName,

   DiskIoComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DiskIoComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DiskIoComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mDiskIoDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
index 6daf8d8abb..c339c9e2bf 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
@@ -17,20 +17,20 @@
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gPartitionComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPartitionComponentName = {

   PartitionComponentNameGetDriverName,

   PartitionComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gPartitionComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPartitionComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PartitionComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PartitionComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mPartitionDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
index 47d7bd70ae..a05a3a7a8b 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
@@ -153,20 +153,20 @@ ArpComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gArpComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gArpComponentName = {

   ArpComponentNameGetDriverName,

   ArpComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gArpComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gArpComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) ArpComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) ArpComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mArpDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
index 8402ae5cfa..5e3b0966d5 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
@@ -154,20 +154,20 @@ DhcpComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gDhcp4ComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gDhcp4ComponentName = {

   DhcpComponentNameGetDriverName,

   DhcpComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gDhcp4ComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDhcp4ComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DhcpComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DhcpComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mDhcpDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
index 1fbee2a097..f3f8e5a7dd 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
@@ -154,20 +154,20 @@ Ip4ConfigComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gIp4ConfigComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIp4ConfigComponentName = {

   Ip4ConfigComponentNameGetDriverName,

   Ip4ConfigComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gIp4ConfigComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIp4ConfigComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ip4ConfigComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ip4ConfigComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
index 01642c2383..6d5f7c126e 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
@@ -154,20 +154,20 @@ Ip4ComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gIp4ComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gIp4ComponentName = {

   Ip4ComponentNameGetDriverName,

   Ip4ComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gIp4ComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIp4ComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Ip4ComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Ip4ComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mIp4DriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
index b2af53cea7..9589c1a143 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
@@ -154,20 +154,20 @@ MnpComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gMnpComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gMnpComponentName = {

   MnpComponentNameGetDriverName,

   MnpComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) MnpComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) MnpComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 STATIC EFI_UNICODE_STRING_TABLE mMnpDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
index 626995b687..60cf82634e 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
@@ -153,20 +153,20 @@ Mtftp4ComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gMtftp4ComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gMtftp4ComponentName = {

   Mtftp4ComponentNameGetDriverName,

   Mtftp4ComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gMtftp4ComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gMtftp4ComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) Mtftp4ComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) Mtftp4ComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mMtftp4DriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c b/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
index 7aea928fed..c6853c4503 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
@@ -152,20 +152,20 @@ PxeBcComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gPxeBcComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPxeBcComponentName = {

   PxeBcComponentNameGetDriverName,

   PxeBcComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PxeBcComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PxeBcComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mPxeBcDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
index 6eae594c4d..b174fe2315 100644
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
@@ -157,20 +157,20 @@ PxeDhcp4ComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gPxeDhcp4ComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gPxeDhcp4ComponentName = {

   PxeDhcp4ComponentNameGetDriverName,

   PxeDhcp4ComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gPxeDhcp4ComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPxeDhcp4ComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PxeDhcp4ComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PxeDhcp4ComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mPxeDhcp4DriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
index a2dc8e75af..6cd331b613 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
@@ -155,20 +155,20 @@ SimpleNetworkComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gSimpleNetworkComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gSimpleNetworkComponentName = {

   SimpleNetworkComponentNameGetDriverName,

   SimpleNetworkComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gSimpleNetworkComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSimpleNetworkComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) SimpleNetworkComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) SimpleNetworkComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mSimpleNetworkDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
index fae269fa16..c5a4b99d7e 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
@@ -153,20 +153,20 @@ TcpComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gTcp4ComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gTcp4ComponentName = {

   TcpComponentNameGetDriverName,

   TcpComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gTcp4ComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gTcp4ComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) TcpComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) TcpComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mTcpDriverNameTable[] = {

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
index 7fb1ce9bd7..f7e2ac2ae9 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
@@ -154,20 +154,20 @@ UdpComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gUdp4ComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gUdp4ComponentName = {

   UdpComponentNameGetDriverName,

   UdpComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gUdp4ComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUdp4ComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) UdpComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) UdpComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = {

diff --git a/Nt32Pkg/SnpNt32Dxe/ComponentName.c b/Nt32Pkg/SnpNt32Dxe/ComponentName.c
index dcb3a5ac40..b9de2efc60 100644
--- a/Nt32Pkg/SnpNt32Dxe/ComponentName.c
+++ b/Nt32Pkg/SnpNt32Dxe/ComponentName.c
@@ -153,20 +153,20 @@ SnpNt32DriverComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gSnpNt32DriverComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gSnpNt32DriverComponentName = {

   SnpNt32DriverComponentNameGetDriverName,

   SnpNt32DriverComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gSnpNt32DriverComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSnpNt32DriverComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) SnpNt32DriverComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) SnpNt32DriverComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mSnpNt32DriverNameTable[] = {

diff --git a/Nt32Pkg/WinNtBlockIoDxe/ComponentName.c b/Nt32Pkg/WinNtBlockIoDxe/ComponentName.c
index cad3d47029..fd4caf3ba8 100644
--- a/Nt32Pkg/WinNtBlockIoDxe/ComponentName.c
+++ b/Nt32Pkg/WinNtBlockIoDxe/ComponentName.c
@@ -156,20 +156,20 @@ WinNtBlockIoComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gWinNtBlockIoComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gWinNtBlockIoComponentName = {

   WinNtBlockIoComponentNameGetDriverName,

   WinNtBlockIoComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gWinNtBlockIoComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gWinNtBlockIoComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) WinNtBlockIoComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) WinNtBlockIoComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mWinNtBlockIoDriverNameTable[] = {

diff --git a/Nt32Pkg/WinNtBusDriverDxe/ComponentName.c b/Nt32Pkg/WinNtBusDriverDxe/ComponentName.c
index b9efc82584..e7d2487bf1 100644
--- a/Nt32Pkg/WinNtBusDriverDxe/ComponentName.c
+++ b/Nt32Pkg/WinNtBusDriverDxe/ComponentName.c
@@ -167,20 +167,20 @@ WinNtBusDriverComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gWinNtBusDriverComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gWinNtBusDriverComponentName = {

   WinNtBusDriverComponentNameGetDriverName,

   WinNtBusDriverComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gWinNtBusDriverComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gWinNtBusDriverComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) WinNtBusDriverComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) WinNtBusDriverComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mWinNtBusDriverNameTable[] = {

diff --git a/Nt32Pkg/WinNtConsoleDxe/ComponentName.c b/Nt32Pkg/WinNtConsoleDxe/ComponentName.c
index 4fa470ab13..b9770887c8 100644
--- a/Nt32Pkg/WinNtConsoleDxe/ComponentName.c
+++ b/Nt32Pkg/WinNtConsoleDxe/ComponentName.c
@@ -175,20 +175,20 @@ WinNtConsoleComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gWinNtConsoleComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gWinNtConsoleComponentName = {

   WinNtConsoleComponentNameGetDriverName,

   WinNtConsoleComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gWinNtConsoleComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gWinNtConsoleComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) WinNtConsoleComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) WinNtConsoleComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mWinNtConsoleDriverNameTable[] = {

diff --git a/Nt32Pkg/WinNtGopDxe/ComponentName.c b/Nt32Pkg/WinNtGopDxe/ComponentName.c
index a8a1f95a89..a9b281816e 100644
--- a/Nt32Pkg/WinNtGopDxe/ComponentName.c
+++ b/Nt32Pkg/WinNtGopDxe/ComponentName.c
@@ -178,20 +178,20 @@ WinNtGopComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gWinNtGopComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gWinNtGopComponentName = {

   WinNtGopComponentNameGetDriverName,

   WinNtGopComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gWinNtGopComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gWinNtGopComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) WinNtGopComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) WinNtGopComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mWinNtGopDriverNameTable[] = {

diff --git a/Nt32Pkg/WinNtSerialIoDxe/ComponentName.c b/Nt32Pkg/WinNtSerialIoDxe/ComponentName.c
index 2b4b31a25a..cab4dd8b0c 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/ComponentName.c
+++ b/Nt32Pkg/WinNtSerialIoDxe/ComponentName.c
@@ -152,20 +152,20 @@ WinNtSerialIoComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gWinNtSerialIoComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gWinNtSerialIoComponentName = {

   WinNtSerialIoComponentNameGetDriverName,

   WinNtSerialIoComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gWinNtSerialIoComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gWinNtSerialIoComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) WinNtSerialIoComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) WinNtSerialIoComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mWinNtSerialIoDriverNameTable[] = {

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/ComponentName.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/ComponentName.c
index 2757535a3b..2fc4be22f7 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/ComponentName.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/ComponentName.c
@@ -177,20 +177,20 @@ WinNtSimpleFileSystemComponentNameGetControllerName (
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL  gWinNtSimpleFileSystemComponentName = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gWinNtSimpleFileSystemComponentName = {

   WinNtSimpleFileSystemComponentNameGetDriverName,

   WinNtSimpleFileSystemComponentNameGetControllerName,

   "eng"

-  };

+};

 

 //

 // EFI Component Name 2 Protocol

 //

-EFI_COMPONENT_NAME2_PROTOCOL gWinNtSimpleFileSystemComponentName2 = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gWinNtSimpleFileSystemComponentName2 = {

   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) WinNtSimpleFileSystemComponentNameGetDriverName,

   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) WinNtSimpleFileSystemComponentNameGetControllerName,

   "en"

-  };

+};

 

 

 static EFI_UNICODE_STRING_TABLE mWinNtSimpleFileSystemDriverNameTable[] = {