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

9 files changed, 36 insertions, 36 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[] = {