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/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"

-  };

+};