X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=StdLib%2FStdLib.inc;h=4b7e37eb65e95800480cae2939bf9f1344b0c67a;hb=6b8ebcb8de52ae5cab543181712e53eeb94340a7;hp=5446ecd35f45d67583c73c50655308d9c8e5a08b;hpb=c614ca505dd2947acbd111e2764056aeac2012ad;p=mirror_edk2.git

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 5446ecd35f..4b7e37eb65 100644
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -4,6 +4,15 @@
 #
 # The including DSC file must DEFINE the EMULATE macro if
 # the application is to be run in an emulation environment.
+#
+#  Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution. The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.
+#
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ################################################################
 
 ##########
@@ -16,6 +25,12 @@
   UseSocketDxe|StdLib/UseSocketDxe/UseSocketDxe.inf
 
 [LibraryClasses.Common.UEFI_APPLICATION]
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf
+  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+
   #
   # C Standard Libraries
   #
@@ -47,36 +62,9 @@
   DevShell|StdLib/LibC/Uefi/Devices/daShell.inf
   DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf
 
-###
-# Select the correct TimerLib instance depending upon whether running under
-# an emulation environment, or not.
-!ifndef $(EMULATE)
-  # Not running in an Emulation Environment
-[LibraryClasses.IA32.UEFI_APPLICATION]
-  TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
-
-[LibraryClasses.X64.UEFI_APPLICATION]
-  TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
-
-[LibraryClasses.IPF.UEFI_APPLICATION]
-  PalLib|MdePkg/Library/UefiPalLib/UefiPalLib.inf
-  TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
-
-[LibraryClasses.ARM.UEFI_APPLICATION]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
-
-
-!else
-  # Use this instance if Running in an Emulation Environment.
-[LibraryClasses.Common.UEFI_APPLICATION]
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
-
-[LibraryClasses.ARM.UEFI_APPLICATION]
+[LibraryClasses.ARM]
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
 
-!endif
-
 [Components]
 # BaseLib and BaseMemoryLib need to be built with the /GL- switch when using the Microsoft
 # tool chain.  This is required so that the library functions can be resolved during
@@ -108,20 +96,19 @@
 !ifndef $(EMULATE)
   # These Build Options are used when building the Standard Libraries to be run
   # on real hardware.
-   INTEL:*_*_*_CC_FLAGS      = /Qfreestanding
-    MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t
-     GCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib
-    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm -DNT32dvm
-  ARMGCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length -DNT32dvm
+  INTEL:*_*_*_CC_FLAGS      = /Qfreestanding /D UEFI_C_SOURCE
+   MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t /D UEFI_C_SOURCE
+    GCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib -DUEFI_C_SOURCE
+    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -DUEFI_C_SOURCE -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm
+  ARMGCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib -DUEFI_C_SOURCE -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length
 
 !else
   # The Build Options, below, are only used when building the Standard Libraries
-  # to be run under an emulation environment.  They disable the clock() system call
-  # which is currently incompatible with the most emulation environments.
-  # Select the correct TimerLib instance, above.
-  INTEL:*_*_IA32_CC_FLAGS     = /Od /D NT32dvm
-   MSFT:*_*_IA32_CC_FLAGS     = /Od /D NT32dvm
-    GCC:*_*_IA32_CC_FLAGS     = -O0 -DNT32dvm
+  # to be run under an emulation environment.
+  # They disable optimization which facillitates debugging under the Emulation environment.
+  INTEL:*_*_IA32_CC_FLAGS     = /Od /D UEFI_C_SOURCE
+   MSFT:*_*_IA32_CC_FLAGS     = /Od /D UEFI_C_SOURCE
+    GCC:*_*_IA32_CC_FLAGS     = -O0 -DUEFI_C_SOURCE
+    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -DUEFI_C_SOURCE -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm
+  ARMGCC:*_*_*_CC_FLAGS      = -O0 -DUEFI_C_SOURCE -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length
 !endif
-
-