X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=StdLib%2FStdLib.inc;h=1b7fcf0bae31acf3f8a550f4e1fa17de53469b4d;hb=01a9598e31b0ac27476daa7a114fd3b3e2c14751;hp=3dc7e9e38f4a467df86232fc73bdb0f71e3fad83;hpb=a7a8363d86ec8ad445fb73619b1ca5cac4e56a86;p=mirror_edk2.git

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 3dc7e9e38f..1b7fcf0bae 100644
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -5,7 +5,7 @@
 # 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>
+#  Copyright (c) 2011 - 2014, 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
@@ -26,9 +26,8 @@
 
 [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
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
 
   #
@@ -50,19 +49,31 @@
   LibNetUtil|StdLib/LibC/NetUtil/NetUtil.inf
 
 # Additional libraries for POSIX functionality.
+  LibPosix|StdLib/PosixLib/PosixLib.inf   # Combines LibErr, LibGen, LibGlob, LibStringlist, GetPass into one library
+
   LibErr|StdLib/PosixLib/Err/LibErr.inf
   LibGen|StdLib/PosixLib/Gen/LibGen.inf
   LibGlob|StdLib/PosixLib/Glob/LibGlob.inf
   LibStringlist|StdLib/PosixLib/Stringlist/LibStringlist.inf
+  LibIIO|StdLib/LibC/Uefi/InteractiveIO/IIO.inf
+
+# Additional, non-standard, libraries
+  LibContainer|StdLib/LibC/Containers/ContainerLib.inf
 
 # Libraries for device abstractions within the Standard C Library
 # Applications should not directly access any functions defined in these libraries.
   LibGdtoa|StdLib/LibC/gdtoa/gdtoa.inf
   DevConsole|StdLib/LibC/Uefi/Devices/daConsole.inf
-  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf
+  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf       # DEPRECATED!  Please use DevMedia for new code.
+  DevMedia|StdLib/LibC/Uefi/Devices/daShell.inf
   DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf
 
-[LibraryClasses.ARM.UEFI_APPLICATION]
+  LuaLib|AppPkg/Applications/Lua/LuaLib.inf           # Lua language library
+
+[LibraryClasses.ARM]
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+
+[LibraryClasses.AArch64]
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
 
 [Components]
@@ -93,22 +104,24 @@
 #
 
 [BuildOptions]
-!ifndef $(EMULATE)
-  # These Build Options are used when building the Standard Libraries to be run
-  # on real hardware.
-  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
+!ifdef $(EMULATE)
   # The Build Options, below, are only used when building the Standard Libraries
-  # to be run under an emulation environment.
+  # to be run under an emulation environment; such as NT32Pkg.
   # 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
+  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
+   XCODE:*_*_*_CC_FLAGS     = -O0 -DUEFI_C_SOURCE -Wno-unused-const-variable -Wno-string-compare -Wno-sometimes-uninitialized
+
+!else
+  # These Build Options are used when building the Standard Libraries to be run
+  # on real hardware.
+   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
+   XCODE:*_*_*_CC_FLAGS     = -nostdinc -nostdlib -DUEFI_C_SOURCE -Wno-unused-const-variable -Wno-string-compare -Wno-sometimes-uninitialized
 !endif