Add compiler hint of "GLOBAL_REMOVE_IF_UNREFERENCED" to prevent static unicode string table linked into final image if both PcdComponentNameDisabled and PcdComponentName2Disabled are set to TRUE.

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

18 files changed, 22 insertions, 23 deletions

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
index 6010f22..075b695 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
@@ -43,7 +43,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConPlatformComponent
 };

 

 

-STATIC EFI_UNICODE_STRING_TABLE mConPlatformDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mConPlatformDriverNameTable[] = {

   {

     "eng;en",

     L"Platform Console Management Driver"

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
index 6a45843..35c1273 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
@@ -95,7 +95,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrCom
 };

 

 

-static EFI_UNICODE_STRING_TABLE mConSplitterDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mConSplitterDriverNameTable[] = {

   {

     "eng;en",

     (CHAR16 *) L"Console Splitter Driver"

@@ -106,7 +106,7 @@ static EFI_UNICODE_STRING_TABLE mConSplitterDriverNameTable[] = {
   }

 };

 

-static EFI_UNICODE_STRING_TABLE mConSplitterConInControllerNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mConSplitterConInControllerNameTable[] = {

   {

     "eng;en",

     (CHAR16 *) L"Primary Console Input Device"

@@ -117,7 +117,7 @@ static EFI_UNICODE_STRING_TABLE mConSplitterConInControllerNameTable[] = {
   }

 };

 

-static EFI_UNICODE_STRING_TABLE mConSplitterSimplePointerControllerNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mConSplitterSimplePointerControllerNameTable[] = {

   {

     "eng;en",

     (CHAR16 *) L"Primary Simple Pointer Device"

@@ -128,7 +128,7 @@ static EFI_UNICODE_STRING_TABLE mConSplitterSimplePointerControllerNameTable[] =
   }

 };

 

-static EFI_UNICODE_STRING_TABLE mConSplitterConOutControllerNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mConSplitterConOutControllerNameTable[] = {

   {

     "eng;en",

     (CHAR16 *) L"Primary Console Output Device"

@@ -139,7 +139,7 @@ static EFI_UNICODE_STRING_TABLE mConSplitterConOutControllerNameTable[] = {
   }

 };

 

-static EFI_UNICODE_STRING_TABLE mConSplitterStdErrControllerNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mConSplitterStdErrControllerNameTable[] = {

   {

     "eng;en",

     (CHAR16 *) L"Primary Standard Error Device"

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
index 7c458ba..5b4dd01 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
@@ -38,7 +38,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gGraphicsConsoleCompo
 };

 

 

-STATIC EFI_UNICODE_STRING_TABLE mGraphicsConsoleDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mGraphicsConsoleDriverNameTable[] = {

   {

     "eng;en",

     (CHAR16 *)L"UGA Console Driver"

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
index 5bcc85b..11ee906 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
@@ -38,7 +38,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gTerminalComponentNam
 };

 

 

-static EFI_UNICODE_STRING_TABLE mTerminalDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mTerminalDriverNameTable[] = {

   {

     "eng;en",

    (CHAR16 *) L"Serial Terminal Driver"

diff --git a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c b/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
index e6a5248..321f57b 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
@@ -38,7 +38,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDebugPortComponentNa
 };

 

 

-static EFI_UNICODE_STRING_TABLE mDebugPortDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mDebugPortDriverNameTable[] = {

   {

     "eng;en",

     (CHAR16 *) L"DebugPort Driver"

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
index e957212..0de2f26 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
@@ -33,7 +33,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2
 };

 

 

-static EFI_UNICODE_STRING_TABLE mDiskIoDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mDiskIoDriverNameTable[] = {

   {

     "eng;en",

     (CHAR16 *)L"Generic Disk I/O Driver"

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
index c339c9e..acb1035 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
@@ -33,7 +33,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPartitionComponentNa
 };

 

 

-static EFI_UNICODE_STRING_TABLE mPartitionDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mPartitionDriverNameTable[] = {

   {

     "eng;en",

     (CHAR16 *)L"Partition Driver(MBR/GPT/El Torito)"

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
index a05a3a7..f263f61 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
@@ -169,7 +169,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gArpComponentName2 =
 };

 

 

-STATIC EFI_UNICODE_STRING_TABLE mArpDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mArpDriverNameTable[] = {

   { "eng;en", L"ARP Network Service Driver" },

   { NULL, NULL }

 };

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
index 5e3b096..ed258d2 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
@@ -170,7 +170,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gDhcp4ComponentName2
 };

 

 

-static EFI_UNICODE_STRING_TABLE mDhcpDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mDhcpDriverNameTable[] = {

   {

     "eng;en",

     L"DHCP Protocol Driver"

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
index f3f8e5a..8e26bf5 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/ComponentName.c
@@ -170,8 +170,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIp4ConfigComponentNa
 };

 

 

-STATIC

-EFI_UNICODE_STRING_TABLE mIp4ConfigDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIp4ConfigDriverNameTable[] = {

   {"eng;en", L"IP4 CONFIG Network Service Driver"},

   {NULL, NULL}

 };

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
index 6d5f7c1..a3966a9 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
@@ -170,7 +170,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIp4ComponentName2 =
 };

 

 

-static EFI_UNICODE_STRING_TABLE mIp4DriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIp4DriverNameTable[] = {

   {

     "eng;en",

     L"IP4 Network Service Driver"

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
index 9589c1a..4091dee 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
@@ -170,7 +170,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2 =
 };

 

 

-STATIC EFI_UNICODE_STRING_TABLE mMnpDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mMnpDriverNameTable[] = {

   {

     "eng;en",

     L"MNP Network Service Driver"

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
index 60cf826..256d86a 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
@@ -169,7 +169,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gMtftp4ComponentName2
 };

 

 

-static EFI_UNICODE_STRING_TABLE mMtftp4DriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mMtftp4DriverNameTable[] = {

   {

     "eng;en",

     L"MTFTP4 Network Service"

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c b/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
index c6853c4..9a09828 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/ComponentName.c
@@ -168,7 +168,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2
 };

 

 

-static EFI_UNICODE_STRING_TABLE mPxeBcDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mPxeBcDriverNameTable[] = {

   {

     "eng;en",

     L"PXE Base Code Driver"

diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
index b174fe2..1897347 100644
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/ComponentName.c
@@ -173,7 +173,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPxeDhcp4ComponentNam
 };

 

 

-static EFI_UNICODE_STRING_TABLE mPxeDhcp4DriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mPxeDhcp4DriverNameTable[] = {

   {

     "eng;en",

     L"PXE DHCPv4 Driver"

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
index 6cd331b..e8da930 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
@@ -171,7 +171,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSimpleNetworkCompone
 };

 

 

-static EFI_UNICODE_STRING_TABLE mSimpleNetworkDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSimpleNetworkDriverNameTable[] = {

   {

     "eng;en",

     L"Simple Network Protocol Driver"

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
index c5a4b99..2e318b7 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
@@ -169,7 +169,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gTcp4ComponentName2 =
 };

 

 

-static EFI_UNICODE_STRING_TABLE mTcpDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mTcpDriverNameTable[] = {

   {

     "eng;en",

     L"Tcp Network Service Driver"

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
index f7e2ac2..b517655 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
@@ -170,7 +170,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUdp4ComponentName2 =
 };

 

 

-static EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = {

   {

     "eng;en",

     L"UDP Network Service Driver"