StdLib: Eliminate TimerLib dependencies.

[mirror_edk2.git] / StdLib / StdLib.inc

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 4e9ca1d2e76f19069e355c5442ae50d65e462438..fa1865659ba80d36fa80c98cdc5a820c48873d29 100644 (file)
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -56,38 +56,9 @@
   DevShell|StdLib/LibC/Uefi/Devices/daShell.inf\r
   DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf\r
 \r
-###\r
-# Select the correct TimerLib instance depending upon whether running under\r
-# an emulation environment, or not.\r
-!ifndef $(EMULATE)\r
-  # Not running in an Emulation Environment\r
-[LibraryClasses.IA32.UEFI_APPLICATION]\r
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-#  TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf\r
-\r
-[LibraryClasses.X64.UEFI_APPLICATION]\r
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-#  TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf\r
-\r
-[LibraryClasses.IPF.UEFI_APPLICATION]\r
-  PalLib|MdePkg/Library/UefiPalLib/UefiPalLib.inf\r
-  TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
-\r
-[LibraryClasses.ARM.UEFI_APPLICATION]\r
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-\r
-\r
-!else\r
-  # Use this instance if Running in an Emulation Environment.\r
-[LibraryClasses.Common.UEFI_APPLICATION]\r
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-\r
 [LibraryClasses.ARM.UEFI_APPLICATION]\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r
-!endif\r
-\r
 [Components]\r
 # BaseLib and BaseMemoryLib need to be built with the /GL- switch when using the Microsoft\r
 # tool chain.  This is required so that the library functions can be resolved during\r
@@ -120,17 +91,18 @@
   # These Build Options are used when building the Standard Libraries to be run\r
   # on real hardware.\r
   INTEL:*_*_*_CC_FLAGS      = /Qfreestanding\r
-   MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t /D NT32dvm\r
+   MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t\r
     GCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib\r
-    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm -DNT32dvm\r
-  ARMGCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length -DNT32dvm\r
+    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm\r
+  ARMGCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\r
 \r
 !else\r
   # The Build Options, below, are only used when building the Standard Libraries\r
-  # to be run under an emulation environment.  They disable the clock() system call\r
-  # which is currently incompatible with the most emulation environments.\r
-  # Select the correct TimerLib instance, above.\r
-  INTEL:*_*_IA32_CC_FLAGS     = /Od /D NT32dvm\r
-   MSFT:*_*_IA32_CC_FLAGS     = /Od /D NT32dvm\r
-    GCC:*_*_IA32_CC_FLAGS     = -O0 -DNT32dvm\r
+  # to be run under an emulation environment.\r
+  # They disable optimization which facillitates debugging under the Emulation environment.\r
+  INTEL:*_*_IA32_CC_FLAGS     = /Od\r
+   MSFT:*_*_IA32_CC_FLAGS     = /Od\r
+    GCC:*_*_IA32_CC_FLAGS     = -O0\r
+    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm\r
+  ARMGCC:*_*_*_CC_FLAGS      = -O0 -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\r
 !endif\r