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

7 files changed, 28 insertions, 28 deletions

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[] = {