EmulatorPkg: Add StackCheckLibNull

Remove the old stack check lib now that MdeLibs.inc includes
the new one.

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index 1c356bc8c73273f9d8f4a1c4410c5381eb0e4dc2..e4bf3ce4165e0f653b1df2129eed4f2dc94c7c7e 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -151,6 +151,8 @@
   PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf\r
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
   TimerLib|EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf\r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
 \r
 [LibraryClasses.common.USER_DEFINED, LibraryClasses.common.BASE]\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
@@ -319,13 +321,25 @@
     #  Emulator, OS WIN application\r
     #  CLANGPDB is cross OS tool chain. It depends on WIN_HOST_BUILD flag\r
     #  to build WinHost application.\r
+    #\r
+    # USER_DEFINED components skip normal NULL lib linking, so we have to link this\r
+    # specially here for the libs that have stack guard enabled\r
     ##\r
-    EmulatorPkg/Win/Host/WinHost.inf\r
+    EmulatorPkg/Win/Host/WinHost.inf {\r
+      <LibraryClasses>\r
+        NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+    }\r
   !else\r
     ##\r
     #  Emulator, OS POSIX application\r
+    #\r
+    # USER_DEFINED components skip normal NULL lib linking, so we have to link this\r
+    # specially here for the libs that have stack guard enabled\r
     ##\r
-    EmulatorPkg/Unix/Host/Host.inf\r
+    EmulatorPkg/Unix/Host/Host.inf {\r
+      <LibraryClasses>\r
+        NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+    }\r
   !endif\r
 !endif\r
 \r